From patchwork Thu Feb 16 17:10:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 654061 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp86263wrc; Thu, 16 Feb 2023 09:15:06 -0800 (PST) X-Google-Smtp-Source: AK7set/jRiRPRqastA85/hTSf8DiVlhTC3/MLY4YEpOpCvO/8wzZmYwxBx13HbfWVRbJq9SEai0t X-Received: by 2002:a05:622a:2c9:b0:3b8:6b57:499e with SMTP id a9-20020a05622a02c900b003b86b57499emr11876286qtx.36.1676567706524; Thu, 16 Feb 2023 09:15:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676567706; cv=none; d=google.com; s=arc-20160816; b=P2/cVfvwW88PuQH1aLbl4tvWoEEAd6cFGoHDfL6wh45EE9IcxNb1rwLm8qohPprog+ DbGea+78olViy1UNAJ/rMl7aC8m8Wo+3Ot2ofUtuiYZWM0AGc0IizDnEm+ou34NU3I0C OTF0Qib4HRbnkDXb6+LH5xKZAddLM6J2NFPjOr1/RhVGqarcbYgZZUnbvmirY4brg0Pk Hi97TiB2X5xR4+0P7N2J0yvyAEEn88EB4sn1YGuYlYEIe5kit/QR2kPOhHeC/WA+wVQV qPPu5/lh7wmorJgIuUAxIeANn9ALoPLzUHRZWRwzRjsWYaqQUAMWWfkW2k/D8/uIOcyc SN+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=a6imo2uk4gluBMlTk8m75RyQDRZFDd/gMQZ6xj9C6ro=; b=EOd8LFPzOYSwyvw3eXk2472xxvthJyUu1eYk3gp6Jm4Z+1dRI6EgPZLoHkW2OYyYrd OAxsoN0YFK14wBQ+A/cYjq2B2eMZJ8uyBI8Ga/WFP/aXlewG15xyAHOK7OMqb9TwFR28 Xt+hf5Sji2cpE2E6t2IgB8YUCphWkVQPNBnoKntlgMxHGBiR/q5uAtTnD4ptT3Cvoi9n XaN+i3/9sEzt0JoTTFbhU0Jcc9dqNrMP4FaWKBW9azlBfzjxpR9C4+8Oe1+/EgqMz1+z dkOMHXg+z1QkoZFdpyE6pyaDSVfh5QrzHQNpeiFc+7rqo6ELAuaXznT6Kprvgie03W61 a7bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aYk+RePK; 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 74-20020a37064d000000b0071e1107074csi1637882qkg.279.2023.02.16.09.15.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Feb 2023 09:15:06 -0800 (PST) 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=aYk+RePK; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pShnC-0007yZ-Mk; Thu, 16 Feb 2023 12:11:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pShnB-0007ul-8E for qemu-devel@nongnu.org; Thu, 16 Feb 2023 12:11:33 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pShn9-0007o5-AR for qemu-devel@nongnu.org; Thu, 16 Feb 2023 12:11:32 -0500 Received: by mail-wr1-x42d.google.com with SMTP id v30so1349468wrv.3 for ; Thu, 16 Feb 2023 09:11:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=a6imo2uk4gluBMlTk8m75RyQDRZFDd/gMQZ6xj9C6ro=; b=aYk+RePKgdyghgdkT6evJzvW7mRPtwxY7gO9cFCEN3ovEELv8UjbRIDZm2chHCPuPr wUkVm/utMDxJ+rfB/2AcOuxMfJGNU7dBG7M+tD9DJjN5Uy4EeWXkHavcx088JQKIduV1 XcO0HH9Vj5zfYp+B/S8RkSW6aw8npVb6uVtyuN0RBMqhJJ1BWpEEL3HiRqLRJ/9bT8uW KgVf/4c4i8RDFYttzuDT8bT2+VuVePbXT7gvxZArV7HzHaUMDkL7b/8JIKzbgJP0MaSH fBqq8fahjKPrtS2XncFzDTus8A90Te7T5apYCtVbkbFgE2xkh3lisTG78fUrsrLLdLAi ZYwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a6imo2uk4gluBMlTk8m75RyQDRZFDd/gMQZ6xj9C6ro=; b=fZY/5HSTjtZuKQevVAk3KhMhRu45+B4M19+s2g/IQMnHXbjzEwKn5qGgFjNkjoOrgX IPI86aquraagjjjqm/FGNGgtffpRUXtziFqyEfPurXXluWHn4YaTi252zLFOuqNqwxTT ZbAPapytfZVYHs2rJmjHfluLdqrArSC1nCuMHa953f/tV1w+Khmbi0n6Zd11SUns3isn ZUDhLtd4DUavYzDnwOIj5dQTOpFv747MsAUNbGTph40cLiYnAuNNc7ypPHBAQUlCKL0M h0X7HbVmoETrvJZm9Lf5FzQs8VGrdPupf0DKTWEZ3NMHzLU2vVhujqSiTDEt+x+A12KT Lx8g== X-Gm-Message-State: AO0yUKXTsXQM0lmwGOiPfTWHCqEbaOryB/U557T+svG2ocYhUsqmFQNM PY0Fxo+s+Tk5Ufp/jJhNaYlXLmV/WTpCcAsj X-Received: by 2002:adf:de8d:0:b0:2c5:4dd0:5df6 with SMTP id w13-20020adfde8d000000b002c54dd05df6mr5002367wrl.41.1676567490606; Thu, 16 Feb 2023 09:11:30 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002c556a4f1casm2049107wru.42.2023.02.16.09.11.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 09:11:30 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/30] target/arm: Avoid resetting CPUARMState::eabi field Date: Thu, 16 Feb 2023 17:10:59 +0000 Message-Id: <20230216171123.2518285-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230216171123.2518285-1-peter.maydell@linaro.org> References: <20230216171123.2518285-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Although the 'eabi' field is only used in user emulation where CPU reset doesn't occur, it doesn't belong to the area to reset. Move it after the 'end_reset_fields' for consistency. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-id: 20230206223502.25122-7-philmd@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 05b9012cee9..1c1e0334f01 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -721,11 +721,6 @@ typedef struct CPUArchState { ARMVectorReg zarray[ARM_MAX_VQ * 16]; #endif -#if defined(CONFIG_USER_ONLY) - /* For usermode syscall translation. */ - bool eabi; -#endif - struct CPUBreakpoint *cpu_breakpoint[16]; struct CPUWatchpoint *cpu_watchpoint[16]; @@ -776,6 +771,10 @@ typedef struct CPUArchState { const struct arm_boot_info *boot_info; /* Store GICv3CPUState to access from this struct */ void *gicv3state; +#if defined(CONFIG_USER_ONLY) + /* For usermode syscall translation. */ + bool eabi; +#endif /* CONFIG_USER_ONLY */ #ifdef TARGET_TAGGED_ADDRESSES /* Linux syscall tagged address support */