From patchwork Wed Aug 18 19:18:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 498924 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp967157jab; Wed, 18 Aug 2021 12:25:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3Bv+ThABJwlqjG8KQqLdwL9dlW8Tf78LN0X1+Ot4I1oUsLMpYUD87sogbtjBa8lwEmUdq X-Received: by 2002:a05:6638:1905:: with SMTP id p5mr9405445jal.25.1629314734814; Wed, 18 Aug 2021 12:25:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629314734; cv=none; d=google.com; s=arc-20160816; b=E2HuP4ij2dra7ZJ12jwxLxhcaZu/8MqIzdkByycwXZEKwN+1pieVLg41u2+KYcXJDR GDxpD31yr7zXGkDhcyREumQqR4EdCibUU4fyw0lnsU1BT+3oY7bXk4wGC8b1vv9ilWBz wikltX1oqdy3cBkrs6LTeYlidglT6+7ZAVgzg7zJJETrNHyBv6oMuELDodVde4NjP+y2 zkX9i3GZNACUigZL70DyFegIa+3k7Vi5RLs3g1QhtmhDdtOXcCc725ZTzsMGKOarwWP0 cTUNbwu76QdCcGALGLG93uectdJG5fV/OQ8Q6MTSkPbGyavY4XIMZ2/QTDXemG9e+Y0z RZpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=GXOlbQT0wGZicRa4Afgu+4pPip7Q2NUMioJcGG1uVyI=; b=rh4fFz/+xPb3trJfRdXQ6xFpO3N6iLoykgutbOkCQzRGxLmNLuVPjicx2SnapZpkJk SWQmNmt9FFzx2+k8u2mb+UcpXLHtu2nsDiyhFdRiS8BquGyaLRq6Wy45UBYlOpYQSGnr fBISxuQT/K6/fImNkXz/fNnO0gFkPvPUsNUQyMAmIplKb4cIh7syQ6wpTCEhSHNwn4IY OOWPKK/Y0DC6wyLi16qO8qWWyIHi1ry4A1VNb9RBOz3L56eGJugUxC8GpJ3TEJI7yGGB 56F1iLis7MmnqQb95LxTUJl/uWSe+f9Xh7JOb1ha1VTMlBoag1kFmV8fL9HuLZpxTheT stkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I8lwAcoX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o3si684067ils.62.2021.08.18.12.25.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Aug 2021 12:25:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I8lwAcoX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGRBu-0003ct-89 for patch@linaro.org; Wed, 18 Aug 2021 15:25:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGR6F-0000Su-So for qemu-devel@nongnu.org; Wed, 18 Aug 2021 15:19:43 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:41518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGR6E-00004x-CQ for qemu-devel@nongnu.org; Wed, 18 Aug 2021 15:19:43 -0400 Received: by mail-pl1-x62c.google.com with SMTP id e15so2427913plh.8 for ; Wed, 18 Aug 2021 12:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GXOlbQT0wGZicRa4Afgu+4pPip7Q2NUMioJcGG1uVyI=; b=I8lwAcoXc7l/5Ytm3zRMIA2zEWDAItlnmy48h+gDvWE3SDXjm4Ni7sulQrJuJOxKkH IMHqUOTwDOhfAS9XzoLei+Nwadf43Nan3PugEJrITVhisWCLcSEQ4AZalQN1lcdHtBSQ fMDYcgK931mf2t9O4zP/3YF/enz0E0qfTeIaEjyF6fmE2RYt8G5MGm+nEr7DP/Bmln+D G9pNV/IurmmZMoFrKX2Uvfy41fdwZH1w+KTPgpQx6GlCWh6B2ZxmWxRlDtHLQ8eOr873 lLSqczYbXy1mQHKbZEt1KPYPe8fjrpqUwJe8YObix3tODesrWd7MzrIHczRxv7ZS3/IZ f7DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GXOlbQT0wGZicRa4Afgu+4pPip7Q2NUMioJcGG1uVyI=; b=fMktimdKGXn3WmG+TUbtY2q61FKpIKw4j8J1vX5N4J/yJOo7XD4d7WuLfB0t6X/j6/ IitFcMI0uoI0CMenb3D58rBg72PJxAIKqBtBmheKkBFVwQ4xeJCcIyUW50CikUC6Pjpj eDI9xTxl8NOHa/9AKqM5qmpmwowXiflKqciLDyvNj6yPy8sMAAAZhCuJd4Dshe3E/qEl my5rvDYMb+sPzr6XnLptfZQ3CjcYF+5vW78mGPjbpRIpHdZyJpQxrijoGNtiNvxdJ+hO 98W0jBZ3ZMKTiTnOps5+6y3kr7HQ7ExoGOkvf0lnBbZgDyDUs+MFUfKvAPa2xRoxv4f5 DqUA== X-Gm-Message-State: AOAM531yJjhTqwBGwste39ZuwUP+9lZ0+C0tYZI2odWCVm51NIFySCNm FF+FZAYK1squDuptqP7tYUtAap4jqROMyg== X-Received: by 2002:a17:90a:f3cc:: with SMTP id ha12mr10875871pjb.195.1629314381187; Wed, 18 Aug 2021 12:19:41 -0700 (PDT) Received: from localhost.localdomain ([173.197.107.15]) by smtp.gmail.com with ESMTPSA id a6sm524108pjs.40.2021.08.18.12.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 12:19:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 15/66] target/sh4: Implement do_unaligned_access for user-only Date: Wed, 18 Aug 2021 09:18:29 -1000 Message-Id: <20210818191920.390759-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210818191920.390759-1-richard.henderson@linaro.org> References: <20210818191920.390759-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yoshinori Sato Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: Yoshinori Sato Signed-off-by: Richard Henderson --- linux-user/sh4/cpu_loop.c | 8 ++++++++ target/sh4/cpu.c | 2 +- target/sh4/op_helper.c | 3 --- 3 files changed, 9 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c index 222ed1c670..21d97250a8 100644 --- a/linux-user/sh4/cpu_loop.c +++ b/linux-user/sh4/cpu_loop.c @@ -71,6 +71,14 @@ void cpu_loop(CPUSH4State *env) info._sifields._sigfault._addr = env->tea; queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); break; + case 0xe0: + case 0x100: + info.si_signo = TARGET_SIGBUS; + info.si_errno = 0; + info.si_code = TARGET_BUS_ADRALN; + info._sifields._sigfault._addr = env->tea; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; case EXCP_ATOMIC: cpu_exec_step_atomic(cs); arch_interrupt = false; diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 8326922942..b60234cd31 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -238,10 +238,10 @@ static const struct TCGCPUOps superh_tcg_ops = { .synchronize_from_tb = superh_cpu_synchronize_from_tb, .cpu_exec_interrupt = superh_cpu_exec_interrupt, .tlb_fill = superh_cpu_tlb_fill, + .do_unaligned_access = superh_cpu_do_unaligned_access, #ifndef CONFIG_USER_ONLY .do_interrupt = superh_cpu_do_interrupt, - .do_unaligned_access = superh_cpu_do_unaligned_access, .io_recompile_replay_branch = superh_io_recompile_replay_branch, #endif /* !CONFIG_USER_ONLY */ }; diff --git a/target/sh4/op_helper.c b/target/sh4/op_helper.c index d6d70c339f..b46fc1bf11 100644 --- a/target/sh4/op_helper.c +++ b/target/sh4/op_helper.c @@ -23,7 +23,6 @@ #include "exec/cpu_ldst.h" #include "fpu/softfloat.h" -#ifndef CONFIG_USER_ONLY void superh_cpu_do_unaligned_access(CPUState *cs, vaddr addr, MMUAccessType access_type, @@ -46,8 +45,6 @@ void superh_cpu_do_unaligned_access(CPUState *cs, vaddr addr, cpu_loop_exit_restore(cs, retaddr); } -#endif - void helper_ldtlb(CPUSH4State *env) { #ifdef CONFIG_USER_ONLY