From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A1BCFD0E6C6 for ; Tue, 25 Nov 2025 10:57:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNqhZ-00042T-Jy; Tue, 25 Nov 2025 05:55:17 -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 1vNqhS-0003mT-RM for qemu-devel@nongnu.org; Tue, 25 Nov 2025 05:55:12 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNqhQ-0001cw-BC for qemu-devel@nongnu.org; Tue, 25 Nov 2025 05:55:10 -0500 Received: by mail-wm1-x344.google.com with SMTP id 5b1f17b1804b1-4779a637712so32655645e9.1 for ; Tue, 25 Nov 2025 02:55:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764068106; x=1764672906; darn=nongnu.org; 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=27Oww4qQxdixc+Id3IXgq5AJQ19OjMu/GDoS0nr9Vqw=; b=AERx+yVH92H4qj75A6QQ0juHjQ1xLqZtI9Xx7wqmoo5KZAHnmPvVIXQ6TfV5Uqd6bl sxCUfx4DyxZ/UIYuczLZmpIJwBDWFpHwPBuhV6o3+mUrbMzybEvxEnTIYbK6Bmv7JQKM 0BQjXsiTZCG8ZTYMBwVB0pseSr2/HLAds2J0nZWsS5eaCcap1vPibXJ4LkQ2P9mvxje+ gqZvgZZKzhmHGfjAXfojFUkvSpxaIRUQj+IPKByz+wbsphZ0qN+ZHcJV9u/V+mfCOO+x +lADQug97AFGByCfpoalW9RO5X2HfBB2uj00sIwQtDQQ9oRmnocoHZkNpF7E8yKy6/ww ZKxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764068106; x=1764672906; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=27Oww4qQxdixc+Id3IXgq5AJQ19OjMu/GDoS0nr9Vqw=; b=diUsbE6OjpMkk0ia7SbxuRgmXbIiMYvcL3NSFlrn2tkNf0ou3fwPHlEKAMEnQrVZtj emslMXFPp0r75TAN8xFODo6wcdMO6hrUTaAzlPogcsXKKSMRIhP1O5D+ZdK+yo5/35ip auNqTtCFeKMPcUcl4q2fvrW9Tt+uz5jPaBgWpJ1853L6xH6ecGg75RI26sgUoz9+Fexc dymU9+v0a+/8OMJ2QqN27fJJsP/YkwQC+9dYrmThoS2Cfp9K7NsidGjlWpcxMvXm49eW aswoBm1sUqwk6uis5je3dWuxjyherAQAGztzswpkXoqHltRoBDscHf3IQ5iXsEmfvNrR OkxA== X-Gm-Message-State: AOJu0YynJRoDNkEKwmMf15rXLIdvm+j45cv1TZARfZbsUHaTdAllXeSv MCv/YdCRUBMMnOUIudHiquhsdvoxeXgtUyU9nKtVcMS1CHLwSDmYDPuJETl3BFkG2w1JyQmseLd EY53oQsibY77L X-Gm-Gg: ASbGncsnSNLD2wbsutKvMObRrNXo91/zKtHBDUJCzyqnGC9FR77WwX6DcumvK6xw++j iIi28NHtE0WNJPPPrg87FcF9C+1kFQGI0DFAnFAl0bc+RfbBxAr0YcUc+Vp1ksBYpv8qq3QOU6+ 6wzQDsiEdXfcXVsuMcEoaC9k5X+0MQCUTh61IocfWAyZ4nXG9WIABr/EzQFdCoqKmUOylaxjQRc 2UtaRjtIZ92yEKeWURiuUZG4yOxU7oyHOieJGW8/MIVoITg2UrMtoiT2C+bZxTqJtlqd8l7cBr6 i2Zp2WEzNVZM6TOLw1n1mwts1hcHJXcpzJZuwdLS0aggagRt2Cx+4E+JWPKuE6IXzlsK2Vrq3w7 jWpwQlFRMlV2CZZr6vQx20ywSrVayjw3Y2A5ONoovxtF+OUF0t2eFHuv6vHF4XLD5oc60v0yqvV q4TbSbFuy45GqUT0SvaBOEDZE/5XAUlrzZ6I2J08wxyJwSabE/KLWbJ5S12Gz1 X-Google-Smtp-Source: AGHT+IG5wAax9M2wPLydKe/qH81pYYW/FEoJGxK+P8LAWQtVmIFngUJ+IUH7VGp9Anxqxxp5ubmJog== X-Received: by 2002:a05:600c:4f88:b0:477:af07:dd17 with SMTP id 5b1f17b1804b1-477c01c3721mr191342375e9.24.1764068105830; Tue, 25 Nov 2025 02:55:05 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7fba20esm33716389f8f.37.2025.11.25.02.55.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Nov 2025 02:55:05 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, qemu-riscv@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PATCH-for-11.0 04/12] target/m68k: Use little-endian variant of cpu_ld/st_data*() Date: Tue, 25 Nov 2025 11:54:25 +0100 Message-ID: <20251125105434.92355-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251125105434.92355-1-philmd@linaro.org> References: <20251125105434.92355-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=philmd@linaro.org; helo=mail-wm1-x344.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org We only build the M68k target using little endianness order, therefore the cpu_ld/st_data*() definitions expand to the little endian declarations. Use the explicit little-endian variants. Mechanical change running: $ tgt=m68k; \ end=be; \ for op in data mmuidx_ra; do \ for ac in uw sw l q; do \ sed -i -e "s/cpu_ld${ac}_${op}/cpu_ld${ac}_${end}_${op}/" \ $(git grep -l cpu_ target/${tgt}/); \ done; for ac in w l q; do \ sed -i -e "s/cpu_st${ac}_${op}/cpu_st${ac}_${end}_${op}/" \ $(git grep -l cpu_ target/${tgt}/); \ done; done Signed-off-by: Philippe Mathieu-Daudé --- target/m68k/fpu_helper.c | 12 +++--- target/m68k/op_helper.c | 88 ++++++++++++++++++++-------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 56012863c85..f49f841d489 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -510,8 +510,8 @@ static int cpu_ld_floatx80_ra(CPUM68KState *env, uint32_t addr, FPReg *fp, uint32_t high; uint64_t low; - high = cpu_ldl_data_ra(env, addr, ra); - low = cpu_ldq_data_ra(env, addr + 4, ra); + high = cpu_ldl_be_data_ra(env, addr, ra); + low = cpu_ldq_be_data_ra(env, addr + 4, ra); fp->l.upper = high >> 16; fp->l.lower = low; @@ -522,8 +522,8 @@ static int cpu_ld_floatx80_ra(CPUM68KState *env, uint32_t addr, FPReg *fp, static int cpu_st_floatx80_ra(CPUM68KState *env, uint32_t addr, FPReg *fp, uintptr_t ra) { - cpu_stl_data_ra(env, addr, fp->l.upper << 16, ra); - cpu_stq_data_ra(env, addr + 4, fp->l.lower, ra); + cpu_stl_be_data_ra(env, addr, fp->l.upper << 16, ra); + cpu_stq_be_data_ra(env, addr + 4, fp->l.lower, ra); return 12; } @@ -533,7 +533,7 @@ static int cpu_ld_float64_ra(CPUM68KState *env, uint32_t addr, FPReg *fp, { uint64_t val; - val = cpu_ldq_data_ra(env, addr, ra); + val = cpu_ldq_be_data_ra(env, addr, ra); fp->d = float64_to_floatx80(*(float64 *)&val, &env->fp_status); return 8; @@ -545,7 +545,7 @@ static int cpu_st_float64_ra(CPUM68KState *env, uint32_t addr, FPReg *fp, float64 val; val = floatx80_to_float64(fp->d, &env->fp_status); - cpu_stq_data_ra(env, addr, *(uint64_t *)&val, ra); + cpu_stq_be_data_ra(env, addr, *(uint64_t *)&val, ra); return 8; } diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index e9c20a8e032..eac45669ce7 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -32,8 +32,8 @@ static void cf_rte(CPUM68KState *env) uint32_t fmt; sp = env->aregs[7]; - fmt = cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); - env->pc = cpu_ldl_mmuidx_ra(env, sp + 4, MMU_KERNEL_IDX, 0); + fmt = cpu_ldl_be_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); + env->pc = cpu_ldl_be_mmuidx_ra(env, sp + 4, MMU_KERNEL_IDX, 0); sp |= (fmt >> 28) & 3; env->aregs[7] = sp + 8; @@ -48,13 +48,13 @@ static void m68k_rte(CPUM68KState *env) sp = env->aregs[7]; throwaway: - sr = cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); + sr = cpu_lduw_be_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); sp += 2; - env->pc = cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); + env->pc = cpu_ldl_be_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); sp += 4; if (m68k_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC)) { /* all except 68000 */ - fmt = cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); + fmt = cpu_lduw_be_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); sp += 2; switch (fmt >> 12) { case 0: @@ -250,12 +250,12 @@ static void cf_interrupt_all(CPUM68KState *env, int is_hw) /* ??? This could cause MMU faults. */ sp &= ~3; sp -= 4; - cpu_stl_mmuidx_ra(env, sp, retaddr, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, retaddr, MMU_KERNEL_IDX, 0); sp -= 4; - cpu_stl_mmuidx_ra(env, sp, fmt, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, fmt, MMU_KERNEL_IDX, 0); env->aregs[7] = sp; /* Jump to vector. */ - env->pc = cpu_ldl_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, 0); + env->pc = cpu_ldl_be_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, 0); do_plugin_vcpu_interrupt_cb(cs, retaddr); } @@ -270,24 +270,24 @@ static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp, switch (format) { case 4: *sp -= 4; - cpu_stl_mmuidx_ra(env, *sp, env->pc, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, *sp, env->pc, MMU_KERNEL_IDX, 0); *sp -= 4; - cpu_stl_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0); break; case 3: case 2: *sp -= 4; - cpu_stl_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0); break; } *sp -= 2; - cpu_stw_mmuidx_ra(env, *sp, (format << 12) + (cs->exception_index << 2), + cpu_stw_be_mmuidx_ra(env, *sp, (format << 12) + (cs->exception_index << 2), MMU_KERNEL_IDX, 0); } *sp -= 4; - cpu_stl_mmuidx_ra(env, *sp, retaddr, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, *sp, retaddr, MMU_KERNEL_IDX, 0); *sp -= 2; - cpu_stw_mmuidx_ra(env, *sp, sr, MMU_KERNEL_IDX, 0); + cpu_stw_be_mmuidx_ra(env, *sp, sr, MMU_KERNEL_IDX, 0); } static void m68k_interrupt_all(CPUM68KState *env, int is_hw) @@ -346,49 +346,49 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) env->mmu.fault = true; /* push data 3 */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* push data 2 */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* push data 1 */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* write back 1 / push data 0 */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* write back 1 address */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* write back 2 data */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* write back 2 address */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* write back 3 data */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* write back 3 address */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); /* fault address */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); /* write back 1 status */ sp -= 2; - cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stw_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* write back 2 status */ sp -= 2; - cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stw_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* write back 3 status */ sp -= 2; - cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + cpu_stw_be_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); /* special status word */ sp -= 2; - cpu_stw_mmuidx_ra(env, sp, env->mmu.ssw, MMU_KERNEL_IDX, 0); + cpu_stw_be_mmuidx_ra(env, sp, env->mmu.ssw, MMU_KERNEL_IDX, 0); /* effective address */ sp -= 4; - cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); + cpu_stl_be_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); do_stack_frame(env, &sp, 7, oldsr, 0, env->pc); env->mmu.fault = false; @@ -436,7 +436,7 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) env->aregs[7] = sp; /* Jump to vector. */ - env->pc = cpu_ldl_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, 0); + env->pc = cpu_ldl_be_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, 0); do_plugin_vcpu_interrupt_cb(cs, last_pc); } @@ -784,11 +784,11 @@ void HELPER(cas2w)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2) int16_t l1, l2; uintptr_t ra = GETPC(); - l1 = cpu_lduw_data_ra(env, a1, ra); - l2 = cpu_lduw_data_ra(env, a2, ra); + l1 = cpu_lduw_be_data_ra(env, a1, ra); + l2 = cpu_lduw_be_data_ra(env, a2, ra); if (l1 == c1 && l2 == c2) { - cpu_stw_data_ra(env, a1, u1, ra); - cpu_stw_data_ra(env, a2, u2, ra); + cpu_stw_be_data_ra(env, a1, u1, ra); + cpu_stw_be_data_ra(env, a2, u2, ra); } if (c1 != l1) { @@ -845,11 +845,11 @@ static void do_cas2l(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2, } } else { /* We're executing in a serial context -- no need to be atomic. */ - l1 = cpu_ldl_data_ra(env, a1, ra); - l2 = cpu_ldl_data_ra(env, a2, ra); + l1 = cpu_ldl_be_data_ra(env, a1, ra); + l2 = cpu_ldl_be_data_ra(env, a2, ra); if (l1 == c1 && l2 == c2) { - cpu_stl_data_ra(env, a1, u1, ra); - cpu_stl_data_ra(env, a2, u2, ra); + cpu_stl_be_data_ra(env, a1, u1, ra); + cpu_stl_be_data_ra(env, a2, u2, ra); } } @@ -951,12 +951,12 @@ static uint64_t bf_load(CPUM68KState *env, uint32_t addr, int blen, case 0: return cpu_ldub_data_ra(env, addr, ra); case 1: - return cpu_lduw_data_ra(env, addr, ra); + return cpu_lduw_be_data_ra(env, addr, ra); case 2: case 3: - return cpu_ldl_data_ra(env, addr, ra); + return cpu_ldl_be_data_ra(env, addr, ra); case 4: - return cpu_ldq_data_ra(env, addr, ra); + return cpu_ldq_be_data_ra(env, addr, ra); default: g_assert_not_reached(); } @@ -970,14 +970,14 @@ static void bf_store(CPUM68KState *env, uint32_t addr, int blen, cpu_stb_data_ra(env, addr, data, ra); break; case 1: - cpu_stw_data_ra(env, addr, data, ra); + cpu_stw_be_data_ra(env, addr, data, ra); break; case 2: case 3: - cpu_stl_data_ra(env, addr, data, ra); + cpu_stl_be_data_ra(env, addr, data, ra); break; case 4: - cpu_stq_data_ra(env, addr, data, ra); + cpu_stq_be_data_ra(env, addr, data, ra); break; default: g_assert_not_reached(); -- 2.51.0