From patchwork Thu Feb 16 17:10:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 654058 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp86065wrc; Thu, 16 Feb 2023 09:14:43 -0800 (PST) X-Google-Smtp-Source: AK7set+4/B3iMvUMQP/QUj+KlZCYejH8z7REBCpcrhcE9EG1i5WHCAqoO6O/wpg77LjmOQDNHoen X-Received: by 2002:ac8:7d10:0:b0:3b9:b817:e9ae with SMTP id g16-20020ac87d10000000b003b9b817e9aemr11763280qtb.5.1676567683660; Thu, 16 Feb 2023 09:14:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676567683; cv=none; d=google.com; s=arc-20160816; b=OAAjAkXnpXTtH0vtGp3KpT5YcV0/1YMnf2iYNyBjnUHCSyWNwhMnbBx1hZStPwprjh tyhSLhYhit9O3CmJew/UyJWVY2vPItvaAkGAwzbGFamI66e707cy13AZaNmj77a7zFNB 2QKh8TtmEKjGtSl4VdfcVvj1gTEklN+BXAapJUCfJQ/jgfQrRaWbtVYD+DWmWtfQZH7O F2WYCqsrV6NmniCkvMlkPTJYFZh+fAI3VWNco5tgFvpiypysNFOW/D0apMyhQDpEn70t 5MH9O/qmYXm3iVYkoW8rOxXdxEgTUVrERc0qW9nNXmcUE1JoiaeA2iUIPV17Hv/hwrGn Aipw== 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=0mZsyYHXMMzgbZQYO+cjM5qTlEPxz+umbuwXPDLbPoQ=; b=rnwVlSJs8zUjeLe0KzzmaF0fESJiR6cynrCpClDTj/GgmbygDs+zWO+gIKz4agLdL9 h4vHwIDVgrHLumRPqBku87mHjWmxyFsPt9rGfnj23gMxtyCqKC3sog+/Y7M+ZyjmWvgZ Kgd4q7r6a8aDsxQ97vQ445xbm1/qytp8qimMLEoo7j8XRo4woFAgSD+96faKU5t6lkK/ /rOcpuScmpXI5eHCEO2uY3m9rhK5Yc2b/G9K/2LFKw/kxDnPPQm9JuBe5cfoo6AGpACL ykNv8ecw8RJu+/Vz5gJPAmkoGvVxSE+s+bNRP1pwALKrZsMwCMdwAkMZZj0DV3x3CJTC fnpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ia6tSNF2; 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 22-20020ac85916000000b003ba3c95d80dsi1822625qty.318.2023.02.16.09.14.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Feb 2023 09:14:43 -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=ia6tSNF2; 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-0007wA-0C; 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 1pShnA-0007u3-Q8 for qemu-devel@nongnu.org; Thu, 16 Feb 2023 12:11:32 -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 1pShn9-0007p5-1f for qemu-devel@nongnu.org; Thu, 16 Feb 2023 12:11:32 -0500 Received: by mail-wr1-x42a.google.com with SMTP id y1so2553307wru.2 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=0mZsyYHXMMzgbZQYO+cjM5qTlEPxz+umbuwXPDLbPoQ=; b=ia6tSNF2LvlntfU+73d+SEfS9437xg7ZH9LySRGEwq2vkjY4TPkjjdAadMxtYWwsBQ FzT+FS+Ymvwn7opZIKhvL50yoWKZhul+M+dyygWZfeZouZJomO0woSJVbMmHItoGDE0k bWDgHPJya0clPFhtAVBecARGFEsCQ16Onyz+8Snr2oP81jHXGQwO1nMFqWbmAzfEIQfP u2l4EXa7noBZ25pIn13SaTuRsfG6pDAob5xRX6njPPinoSPS8mb1j6KtsG0Plrx0pq3o RPRTnmrqfQQHrn0JGtXDyf2kciEDYFClaUG6GrQktlIcgmhixrKuUvmmAqo6jvpXueS2 dSeQ== 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=0mZsyYHXMMzgbZQYO+cjM5qTlEPxz+umbuwXPDLbPoQ=; b=Nzg1lVoHeksViZ5DZefbw0vu2hfd29DJ6EvCwpmaCYrmw0UHZiZqbCkA0hsoXqZ3cP 2KdXrG3SYocYnOeSsTZVoaGDOnk74tTUwxwlyY7Dn+kOARFn5hQ4S9pKHhJ0vFN2JZzK A/JtYJw0ZCFz7Kbc1LypCZss9Ylsn1iHduVHvhbam3NcrEmz61PguIXoZaaEI/xwGPMa rzaafUOIcVZGE2laVuPH4kaQqVr8Je9gVgZRj5+a4/1l3AD0qRWTEI+H5yv8lKJvsj9+ +jK46Cb/Jpxa0bjLb6mYlYwGu7ZYnWJCsZo7fvBpSOfKoY+DeebF11QWNFyeFrBA99MH qxQg== X-Gm-Message-State: AO0yUKX21XX+NamZZthGADm1RYvdUASXSw61SfdKW8WbJF3MlJvzNby+ QqB+Zl7vd5rlnSD3zYY8Nx6S0F7Ym9VzwbQi X-Received: by 2002:a5d:53c2:0:b0:2bf:e5cc:91c1 with SMTP id a2-20020a5d53c2000000b002bfe5cc91c1mr5564241wrw.52.1676567489750; Thu, 16 Feb 2023 09:11:29 -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:29 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/30] target/arm: Convert CPUARMState::eabi to boolean Date: Thu, 16 Feb 2023 17:10:58 +0000 Message-Id: <20230216171123.2518285-6-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::42a; envelope-from=peter.maydell@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=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é Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20230206223502.25122-6-philmd@linaro.org Signed-off-by: Peter Maydell --- linux-user/user-internals.h | 2 +- target/arm/cpu.h | 2 +- linux-user/arm/cpu_loop.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-user/user-internals.h b/linux-user/user-internals.h index 0280e76addd..3576da413f4 100644 --- a/linux-user/user-internals.h +++ b/linux-user/user-internals.h @@ -135,7 +135,7 @@ void print_termios(void *arg); #ifdef TARGET_ARM static inline int regpairs_aligned(CPUArchState *cpu_env, int num) { - return cpu_env->eabi == 1; + return cpu_env->eabi; } #elif defined(TARGET_MIPS) && defined(TARGET_ABI_MIPSO32) static inline int regpairs_aligned(CPUArchState *cpu_env, int num) { return 1; } diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 7bc97fece97..05b9012cee9 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -723,7 +723,7 @@ typedef struct CPUArchState { #if defined(CONFIG_USER_ONLY) /* For usermode syscall translation. */ - int eabi; + bool eabi; #endif struct CPUBreakpoint *cpu_breakpoint[16]; diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c index c0790f3246b..a9924232578 100644 --- a/linux-user/arm/cpu_loop.c +++ b/linux-user/arm/cpu_loop.c @@ -356,7 +356,7 @@ void cpu_loop(CPUARMState *env) break; case EXCP_SWI: { - env->eabi = 1; + env->eabi = true; /* system call */ if (env->thumb) { /* Thumb is always EABI style with syscall number in r7 */ @@ -382,7 +382,7 @@ void cpu_loop(CPUARMState *env) * > 0xfffff and are handled below as out-of-range. */ n ^= ARM_SYSCALL_BASE; - env->eabi = 0; + env->eabi = false; } }