From nobody Wed Jul 3 23:42:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1629315015; cv=none; d=zohomail.com; s=zohoarc; b=If7IB0Tqeqg/YSR7+nF5fbqAkIxYPNQQ488Q9XgV2XUgd2002p4h5QcP2v+gXGjD2i5H0RKSKmtJ9qfgUMCqByiUkXk9GO0GCFuFWR+gwYt3WfNfeqKt3JqDWD011W0lAJaof1wrHc2jC9i5lxeyraTRHxyj3HlU/mkDlKLe3aA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629315015; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8K3PazbekoVtI1IlmCNF1igSO6s4agOQzsTD2i63oms=; b=DLynwvl7Pp/zjgl7eLHomUktNpeR5ycZTgf1+teQhmqoP4qDOgd4qpngjVz2AovkqRJ9QJG87StAvfJTp6gYydQGqLzVh6pMIl8b+IyX7myPihiV+9HY1+bcKaNg3u02xe66QrAaHW2hjvN6P+kfI5j9GUXwOQh6Ye/M8DQUAeQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162931501528296.79415891996632; Wed, 18 Aug 2021 12:30:15 -0700 (PDT) Received: from localhost ([::1]:39500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGRGQ-0005JD-5q for importer@patchew.org; Wed, 18 Aug 2021 15:30:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGR6L-0000jy-1z for qemu-devel@nongnu.org; Wed, 18 Aug 2021 15:19:52 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:44777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGR6J-00008z-Fy for qemu-devel@nongnu.org; Wed, 18 Aug 2021 15:19:48 -0400 Received: by mail-pl1-x631.google.com with SMTP id q2so2408712plr.11 for ; Wed, 18 Aug 2021 12:19:47 -0700 (PDT) Received: from localhost.localdomain ([173.197.107.15]) by smtp.gmail.com with ESMTPSA id a6sm524108pjs.40.2021.08.18.12.19.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 12:19:46 -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=8K3PazbekoVtI1IlmCNF1igSO6s4agOQzsTD2i63oms=; b=xFdgjGSJhptr3CrAe46MUD8r8w0JF6ZXYLxCZtdr2cYj2EWFFOFCDxYRJC3YPE1WXU mGmNp/kXxPN45fRd/FyO+2Pb/lIFpOQa/FiOYNCA41VnSnshO7iDEn6i+7HeoL7bVLDM pMSNyJerSAOfLX2d4YN//v0Rd9uvAWDeeaqMPhwUXBCM8TC3dg9kBovA/GzkhUE1H108 dafejDgz/bkqmi2tQlTDx+TuEbigr8SRZaRWRK+2Fy5Wlyb3kXdohRcf6iwZNVz3Eoou neIFoBoyKwJrKmr39QhqhyMzwBC+rcdGuu8z6KFiSyx48E8gp2duQmJkGMvB4xR17UXA amXA== 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=8K3PazbekoVtI1IlmCNF1igSO6s4agOQzsTD2i63oms=; b=oCm2a0w7sSJdUSdLUxcEHds4zqO8IOYXLBRULL2lSp71VTlPVBPKOjrWPGQ+n3O+jC 3fCOuY37nE4CGJ+7ghtbWK3uwjx/6+zirr7oWPUcgQu0wGWvZ8HUVMcHGDfOdEr4SnLl 2lKd1I2izP7HNuIAMe5g4UotvDJnE5cWN2e4Z68cMg5gLVvow7iwsH2PMP+e9qq76wgH T1i2w2+ZGDHpBO03KdvxSiPaEmJOkcsoPxzaz/UCOvW22QFTaG6wa+S7IMAjZRUZ1ox5 i/xbfcCKjPkuZfcFYDX9+XgtOj995UfBJZHCHAr+QCCxGT+zcN/YkRXCpF6Smz0OozQ/ W36A== X-Gm-Message-State: AOAM530L+fQGncc/koVsMqmiIBoljRJlzXUbs4/+bmD/nPjEk88IvxDZ pX4ZNoHlOezfmDooGnMKanaxRcGw+/TIgw== X-Google-Smtp-Source: ABdhPJy3cyKEwltmQcLoZINTyMie9eX8XqIzGalaRYuBf9jW1/7poHyFqgxAJIKOdVb9m7qUCu1fUg== X-Received: by 2002:a17:902:7444:b029:12d:603b:dd20 with SMTP id e4-20020a1709027444b029012d603bdd20mr8462953plt.38.1629314386226; Wed, 18 Aug 2021 12:19:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 19/66] target/sparc: Implement do_unaligned_access for user-only Date: Wed, 18 Aug 2021 09:18:33 -1000 Message-Id: <20210818191920.390759-20-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 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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: Mark Cave-Ayland Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1629315017396100003 Content-Type: text/plain; charset="utf-8" Acked-by: Mark Cave-Ayland Signed-off-by: Richard Henderson --- linux-user/sparc/cpu_loop.c | 11 +++++++++++ target/sparc/cpu.c | 2 +- target/sparc/mmu_helper.c | 4 +++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c index 02532f198d..612e77807e 100644 --- a/linux-user/sparc/cpu_loop.c +++ b/linux-user/sparc/cpu_loop.c @@ -272,6 +272,17 @@ void cpu_loop (CPUSPARCState *env) queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); } break; + case TT_UNALIGNED: + info.si_signo =3D TARGET_SIGBUS; + info.si_errno =3D 0; + info.si_code =3D TARGET_BUS_ADRALN; +#ifdef TARGET_SPARC64 + info._sifields._sigfault._addr =3D env->dmmu.sfar; +#else + info._sifields._sigfault._addr =3D env->mmuregs[4]; +#endif + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; case EXCP_DEBUG: info.si_signo =3D TARGET_SIGTRAP; info.si_errno =3D 0; diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index da6b30ec74..d33d41e837 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -865,11 +865,11 @@ static const struct TCGCPUOps sparc_tcg_ops =3D { .synchronize_from_tb =3D sparc_cpu_synchronize_from_tb, .cpu_exec_interrupt =3D sparc_cpu_exec_interrupt, .tlb_fill =3D sparc_cpu_tlb_fill, + .do_unaligned_access =3D sparc_cpu_do_unaligned_access, =20 #ifndef CONFIG_USER_ONLY .do_interrupt =3D sparc_cpu_do_interrupt, .do_transaction_failed =3D sparc_cpu_do_transaction_failed, - .do_unaligned_access =3D sparc_cpu_do_unaligned_access, #endif /* !CONFIG_USER_ONLY */ }; #endif /* CONFIG_TCG */ diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c index 2f260b0085..6b4aa32181 100644 --- a/target/sparc/mmu_helper.c +++ b/target/sparc/mmu_helper.c @@ -946,6 +946,7 @@ hwaddr sparc_cpu_get_phys_page_debug(CPUState *cs, vadd= r addr) } return phys_addr; } +#endif /* CONFIG_USER_ONLY */ =20 void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cs, vaddr addr, MMUAccessType access_type, @@ -956,7 +957,9 @@ void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUSta= te *cs, vaddr addr, CPUSPARCState *env =3D &cpu->env; =20 #ifdef TARGET_SPARC64 +#ifndef CONFIG_USER_ONLY env->dmmu.sfsr =3D build_sfsr(env, mmu_idx, access_type); +#endif env->dmmu.sfar =3D addr; #else env->mmuregs[4] =3D addr; @@ -964,4 +967,3 @@ void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUSta= te *cs, vaddr addr, =20 cpu_raise_exception_ra(env, TT_UNALIGNED, retaddr); } -#endif /* CONFIG_USER_ONLY */ --=20 2.25.1