From patchwork Fri Apr 22 10:04:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 564828 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp375416map; Fri, 22 Apr 2022 04:23:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3V8fBxiND+4RAocjPj69SddEndbUGjpGfEXtm9qX5woluNHZZ6la59deMYriPBDWrJFxk X-Received: by 2002:ac8:4e81:0:b0:2f3:4a7b:2282 with SMTP id 1-20020ac84e81000000b002f34a7b2282mr2699217qtp.474.1650626604372; Fri, 22 Apr 2022 04:23:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650626604; cv=none; d=google.com; s=arc-20160816; b=jyyFdaNvFv+LlKyK9P3dGzphVqzBXUQGWwba/MRJXG4Ccnk9q1VQZ9NFDWoF4dj+Z7 8LyyyrXaAaOHMwuc65MXfBciY6rDeKUyTUU4oqqrIu5L47tCSCNJZxDknfJnOvnyGCNV kskT7b5UUk0cmvKBXVAPDS3n8aUiOlZLkofp4SIvTALMTi6Q1vdttRRzZ3NuTm1/CdJ2 bTKsDji+DqYMRTM4G8jTuT497mnVzenRdivgbysuqv1cXM2MtGD5bGH/C/RmCylhyvuJ PUhxhq2NxFNW1dCapCOWtjDA1lhlOoGZ1N6DHo5pXuKLZ45ZDxUzslT09sm5R5Ki5TgE LzOg== 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=eHw+HjmQRq2oIAbizpb+nwuiBNkSn27k7ONTIxuJM9E=; b=UDcxkocm2v22YiqS6EDsv7UU76PNXQHnrt31EFDg1EHP35qP/f258uD1z3BiAUvmkH y0zGBOXa0vCbGd42DwIhjrcT4lh1SqkGLPi+uwKMRWdSs11LOaoOe/kMEox4l2JQHpLJ 5KpXzgKgOhPZvbwPQ8mIMNqYE0T8XVjvxpLdU4+XeUH/SSlLvDpClBvRWRLOypW9mQQ7 CARhrcLHXo8RFxngYK0+TgQuSa5O/LOfMuZXKA92UeFTeg7TI/ddxZF1GE06qhmKCDKN rhmlX2B2BS+IU7pff11TlxcwebxSXyF0HrVqs4qehyFzuV2RMeZDsPw9ZLMd8O8deZ9E cvVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=icGpDVA7; 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 i10-20020a05620a248a00b0069ed8327ee8si2215902qkn.176.2022.04.22.04.23.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Apr 2022 04:23:24 -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=icGpDVA7; 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]:46694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhrNj-0005Su-UC for patch@linaro.org; Fri, 22 Apr 2022 07:23:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhqAD-0005It-AZ for qemu-devel@nongnu.org; Fri, 22 Apr 2022 06:05:21 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:44587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhqAB-0002tb-LA for qemu-devel@nongnu.org; Fri, 22 Apr 2022 06:05:21 -0400 Received: by mail-wm1-x329.google.com with SMTP id r4-20020a05600c35c400b0039295dc1fc3so5088113wmq.3 for ; Fri, 22 Apr 2022 03:05:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=eHw+HjmQRq2oIAbizpb+nwuiBNkSn27k7ONTIxuJM9E=; b=icGpDVA7TDqsxOI5X+kKz7V2Fnzqt4YUlpYJ08PebBwJ7Fem/u/gDP4KQNDhHTi9BD +DmPO25KMktbctQR+cfCZQ+jBCHtrm8IMKO1DAUYCEZq9zO0RZaPfXiUJuGiKQvbIV/S qd8TtAgIaUcYwsE2dpQlGP82hm/Ub++u3mgaw9MQJQlHTfE692UZ+4D91nhrCAezUkFk BCaXch2ZkcDF5ILDvyACQN6toxRzHqPxFPLlt0QxwHmXVQn6W8iTPmLM0fWMCqfLG0FU FtpC+kq4dsvEcEpmz4S7QcnQZ1ze4ndacw09MmCf5e4B+kO3vASM8CnwTrSV/MxVZLcr HcNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eHw+HjmQRq2oIAbizpb+nwuiBNkSn27k7ONTIxuJM9E=; b=mD6O4V0gMrZif+14J1DdBZK6o7ebRdgCNM0OHyh7u6x0SHykK5lO/uVq0hPar6G1VR L4ERSNpLHU4FrgQ/YTcSQmTuMR/oIhU/7+7jaUOB4utDjqGXQcz9G/Wowe7QeTOXeJ2m 9Eo58P2EFlqdEj5MMhgs3Cs0jan5/7CF/TnTufwSm2Scw/XvUA8tvKAyu3Wa1/EKHQ3i Lu44I+fM+5PI+gGC+9zJqPCShfH1ZZHLat9yHvtiq4cHOgZVaeXw/3Uw4G9f7MWRimL9 qvopo0sAzzo73IdEPj+DCyD/UwdkyiTbzJtXkEunyEoiqss9PIT36FjMtqRkGt5r2PhH BUsQ== X-Gm-Message-State: AOAM533gWYlyhxkjSJ2oFXN+PqwberRpd+3ud71KOQSGHWqvN/M8QanF W2JKE8LO+wa61AznD6+ScicLNG7ey91eiQ== X-Received: by 2002:a05:600c:4313:b0:38e:b150:2f8e with SMTP id p19-20020a05600c431300b0038eb1502f8emr12585999wme.198.1650621917031; Fri, 22 Apr 2022 03:05:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id e16-20020a05600c2dd000b0038ed449cbdbsm4312148wmh.3.2022.04.22.03.05.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 03:05:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 45/61] target/arm: Change DisasContext.aarch64 to bool Date: Fri, 22 Apr 2022 11:04:16 +0100 Message-Id: <20220422100432.2288247-46-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220422100432.2288247-1-peter.maydell@linaro.org> References: <20220422100432.2288247-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Richard Henderson Bool is a more appropriate type for this value. Move the member down in the struct to keep the bool type members together and remove a hole. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Signed-off-by: Peter Maydell --- target/arm/translate.h | 2 +- target/arm/translate-a64.c | 2 +- target/arm/translate.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/arm/translate.h b/target/arm/translate.h index 3a0db801d3b..8b7dd1a4c05 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -59,12 +59,12 @@ typedef struct DisasContext { * so that top level loop can generate correct syndrome information. */ uint32_t svc_imm; - int aarch64; int current_el; /* Debug target exception level for single-step exceptions */ int debug_target_el; GHashTable *cp_regs; uint64_t features; /* CPU features bits */ + bool aarch64; /* Because unallocated encodings generate different exception syndrome * information from traps due to FP being disabled, we can't do a single * "is fp access disabled" check at a high level in the decode tree. diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 19c09c3b535..f6303848918 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -14664,7 +14664,7 @@ static void aarch64_tr_init_disas_context(DisasContextBase *dcbase, dc->isar = &arm_cpu->isar; dc->condjmp = 0; - dc->aarch64 = 1; + dc->aarch64 = true; /* If we are coming from secure EL0 in a system with a 32-bit EL3, then * there is no secure EL1, so we route exceptions to EL3. */ diff --git a/target/arm/translate.c b/target/arm/translate.c index 38e7a38f280..6018fee2ef1 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9334,7 +9334,7 @@ static void arm_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) dc->isar = &cpu->isar; dc->condjmp = 0; - dc->aarch64 = 0; + dc->aarch64 = false; /* If we are coming from secure EL0 in a system with a 32-bit EL3, then * there is no secure EL1, so we route exceptions to EL3. */