From patchwork Mon Feb 6 12:17:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 650940 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp2238544pva; Mon, 6 Feb 2023 04:19:14 -0800 (PST) X-Google-Smtp-Source: AK7set/mzzPX0300Dyl0dnX/58nEgWJvT0vRK6/v6J2iAM8GHy8WyETUHkq1NyER6eTQjmXvxY2H X-Received: by 2002:a05:622a:348:b0:3b8:68df:fc75 with SMTP id r8-20020a05622a034800b003b868dffc75mr36329568qtw.31.1675685954812; Mon, 06 Feb 2023 04:19:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675685954; cv=none; d=google.com; s=arc-20160816; b=u4J3NqTaJ2SX+neZdFadW9DaXfKE+x/cc7vK+LWY6VHZPcRbZhF6+sSTlScIc5P7pZ NN26NLLpoPMWYcm+QQj9EsKLiZO3I412G1d3ddxRCDkBIQUScHxL3RYflGcV7lblXjGZ MvGpjLuv0NQDklEuSnekhE4uxZ3Jt7Q4R+0lQ54+SGkWl01ebj6+ktEdC+/PXUFIvGWp xz5AJ93ev4f5RjOEc0N+bPeN1hG8ID4+DuavSccusv3TrjVaujlRKk1X0egktpDAZqFZ O2Y0EB/RGP2x6tBcg8McJK10btXKZOnKNb2CAnP9cZPzWpj6+iYt+qlSdith289mqj0T XQdQ== 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:cc:to :from:dkim-signature; bh=oZQQqvS93Cp9O320hulFrJMLKiPY6Is3cKN8j3DtZno=; b=mrmA5orIgLCl8p/4K+b5LOL6CU8jfVDstOySyv8w+5mdubM3tov4OHpgCtje0IbPq+ dBHr692tv6jpTjDFwYohSvPHhtwuXsdjiMY3+KVQtEuMUdgOv0eooE1OXF5NQQW2wpAD xjKJ2PiLB+fvUgZ1MdLrxbd0EdA2X3nREdbdPaD69g24MaQCJ7hUDfEcjNnQ5r73EkJq aRJa7o0btgQq2tkhreKg00FcZWSS+HO+GnSBroS9HZ575SOTttePG6hxETngRh1Y6ExZ JaETA7Z3ow2mIRp30BMDSEwfvTu1vtFlLtc+InCNUPz6l2ITGhwxiLfSZp4FudT4/VIw 5TTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tP9ZTFEZ; 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 y15-20020ac85f4f000000b003ba1a35fbd8si4863666qta.756.2023.02.06.04.19.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Feb 2023 04:19:14 -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=tP9ZTFEZ; 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 1pP0RX-0007x9-1G; Mon, 06 Feb 2023 07:17:55 -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 1pP0RI-0007jl-Cy for qemu-devel@nongnu.org; Mon, 06 Feb 2023 07:17:43 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pP0RC-0005og-Eb for qemu-devel@nongnu.org; Mon, 06 Feb 2023 07:17:38 -0500 Received: by mail-wr1-x42a.google.com with SMTP id h16so10141227wrz.12 for ; Mon, 06 Feb 2023 04:17:33 -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:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oZQQqvS93Cp9O320hulFrJMLKiPY6Is3cKN8j3DtZno=; b=tP9ZTFEZteL6qefhcYSx3zLrP0tSgupipS2jh75FsggQLEUxITcXJ/QSm6QISJrTmC ozFDJ63BFDoqsODbFUm2ctx7XoYhoioi/3H43wr2FOjHOtLYfbM8czYvAeBad/aAGQD8 m1ytOxLcwGeRuVEVpob7blJvMOBMgUe5vPLRDy3kmys7WbLC5MlcRpEBCb/IeFMq5nqD t6cMa8ScZ5LvMseIDHrom/xqZjlSl3qg2R7ARQDcMToZN9a0rTCcuVZ1AstaCbcSvvfx CUs7TOs9Q3NZrdINvy+pW6JE2j1ofQXAV50vE2lYKts4vlbLn2VInKK4BzU+YuTmTt/h uMqA== 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oZQQqvS93Cp9O320hulFrJMLKiPY6Is3cKN8j3DtZno=; b=ZLD7KepdAq6CdgiW3UDhtgDhEFfeFQEwAfsOumFJHNWXsSYHQcduEc4rh4hRKdsbxZ dxe5vtg19n0vp/wOONK+/vpA3XgW84aZxNBCQtUVo3SXmL7hV05+fPZWrFRjipXs1Onp 4Fiy7mhlTe4CeOb8JWWv+bAuU6Xuu3YhGTJ0xowI0UUXal/17c1dNZREzUf/rMJftDMA PNetw3DmWGoQSxLmGmAg1arEwv6vD/s93R6beFoLsD9qKb71GdHIXr5JmlaOb630C9iC d3Xo6Yz83mu9Yxd2v8UrUt7mC3ZffJNLKLRd2+xLreZiiPGy+Odc49LSGjVEPp8Ulu5G hsxw== X-Gm-Message-State: AO0yUKUqZjjtoxFPJf973sh22Pa1aqBPDWKgyeipb4q4KytAQfrgF6an H72g1JBzp7M+ctHcaKF/PR4gvWD68eXNFHX0 X-Received: by 2002:a05:6000:68f:b0:2bd:e87a:7fb7 with SMTP id bo15-20020a056000068f00b002bde87a7fb7mr18421515wrb.26.1675685852075; Mon, 06 Feb 2023 04:17:32 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id i14-20020a0560001ace00b002bfb8f829eesm9171354wry.71.2023.02.06.04.17.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 06 Feb 2023 04:17:31 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/9] target/arm: Avoid resetting CPUARMState::eabi field Date: Mon, 6 Feb 2023 13:17:08 +0100 Message-Id: <20230206121714.85084-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230206121714.85084-1-philmd@linaro.org> References: <20230206121714.85084-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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=unavailable 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 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. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- 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 7bc97fece9..bbbcf2e153 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. */ - int eabi; -#endif - struct CPUBreakpoint *cpu_breakpoint[16]; struct CPUWatchpoint *cpu_watchpoint[16]; @@ -772,6 +767,10 @@ typedef struct CPUArchState { uint32_t ctrl; } sau; +#if defined(CONFIG_USER_ONLY) + /* For usermode syscall translation. */ + int eabi; +#endif void *nvic; const struct arm_boot_info *boot_info; /* Store GICv3CPUState to access from this struct */