From patchwork Mon Feb 24 17:14:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 867934 Delivered-To: patch@linaro.org Received: by 2002:a5d:47cf:0:b0:38f:210b:807b with SMTP id o15csp1661457wrc; Mon, 24 Feb 2025 09:21:08 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV8jpito2R6LI5A/QUN2oDKZtVdXvGSJz+uJx+As+5nBs3gkqiwhsf8a2EBYrF8keAKv5lo2A==@linaro.org X-Google-Smtp-Source: AGHT+IFQ4USNxQNgk88ZHvbwmsbV5v+nzNRpHIZuM3d6P4eVLwYITXSqhIopZAQYBNIe9biGyPYm X-Received: by 2002:a05:620a:3728:b0:7c0:6ac4:3cba with SMTP id af79cd13be357-7c0ceefd321mr1813857185a.19.1740417667980; Mon, 24 Feb 2025 09:21:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740417667; cv=none; d=google.com; s=arc-20240605; b=fOQSYB4sL0KWpoGt6lFZ6uatMR/10PtOvs4XKDVP6pyUSvzkFxaN1aNDLvgkk+mnmS gXJPtAPGMXP+otVGijOKFboiJxz5IA6MYNaoGLyx0CYobvg84f9Qf3y7z5eXhjS5KxTn cDhMSk+OydkyzVao0fB6haOVvPOpc/YSyFKeQzTct6x0HRfFUry3UdtS7dkfwhpBnkff MkHAk/poT1W8TLwd6tNmOkDYUFVz0XMspQsyS8ECgUiy6NoiDGT7Yt7ur2k545c8nvVZ W4jM27MNuXyILzeea9/Pt2euE9Ka3rJhsS0Ttaj+M1ucBAcuQwJDmSPUEwdHxfgBWXaf Ia9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=ngwhZ4ZO5ttPMu5HQXT+xXOjxE3LnmKT5P7jc6ZD90o=; fh=2uesxoqJjyRqtkk3yTfcnBSFtAUtxw8KzQZeBUAogpM=; b=I9b30i7FD+yYCnaRncMgPUKgEdQkbRAN13IEUvSdjHE6klOrlGu88O3hn+cPNeDvGa Y3ijbFQ+kAPgeXciBBbDFPSiqi8dEqRNP4sNtpCsTkUIF4AAl1j1S+1JRmpMmrRToHKr rAalr0dUUmdfovrq5uUoKg5JNk/zNszdKvBMz7qZWTRKxQawzbCx6Gg+jLP2jlKy61vr skGqSTw6mUBz4xDOZPP29pCBQZ9WnTnmTFWO2qZiDgEmCOC7RdOTsg9N9PtPudVyHoK9 mb2vrT6Lj/kWQUTwRAikf9DD/XAsfKy/AeqreBuhmY//eiCE47JMWEFGsX1UfoIP89Hf jSqw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="H/FsWbrq"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c0b13ee63csi1158476585a.8.2025.02.24.09.21.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Feb 2025 09:21:07 -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="H/FsWbrq"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmc2n-0006vH-50; Mon, 24 Feb 2025 12:15:01 -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 1tmc2h-0006tn-Lh for qemu-devel@nongnu.org; Mon, 24 Feb 2025 12:14:55 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmc2f-0005Xq-MH for qemu-devel@nongnu.org; Mon, 24 Feb 2025 12:14:55 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2210d92292eso140925105ad.1 for ; Mon, 24 Feb 2025 09:14:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740417292; x=1741022092; 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=ngwhZ4ZO5ttPMu5HQXT+xXOjxE3LnmKT5P7jc6ZD90o=; b=H/FsWbrqO3cnDUqhk69qbGCSvoP6FwY88HTaY5D3858bVeuKRC1XoCiJ4JqTrC9HPQ UlH7zDsrDXmnP+jVNy+X7Zldjv2aPeGm655SVZuqd5I5SV4JIQ72mMgEG+reWft2fpHg C1VGU9aD594kgf18ncIFXCvCC4hrp8x/moxMIENZ3jmut5NcDorJ1uhK39KD6wXItBKp orHxannYnGgDlSlJBwPKZ/9+Zqi8KhCcDcTyFK/AZMMbUCfDI7De3W2GTIvJnGWtm3Kl WX2qg6WqsaB7AOvcWDsMtx5GX1N861ok11qSWGD5TGY0eXYfbUBTSOFjYEUWebnf1n4j ypUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740417292; x=1741022092; 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=ngwhZ4ZO5ttPMu5HQXT+xXOjxE3LnmKT5P7jc6ZD90o=; b=jg13hBNaqCDe78QaWIcm1/QN4Un/mWwyA23kO77HR1SJFxn5wHHdIhdU88rh58Qjaw NDe8EJVK30Z4JprxSGF1qsT2swo8SfjiPuoEsqVQ3RiZXSHrLiY/ZkY3mJ3fWj2YXPrc 9SSCN4lGAbkNOwXuLB52jkdfOulQrpQQITjz+B4x6vTq6UJh3zPNIXF1CXGXbnVdVOp9 xbYKX4Me+fetCZECWJQwi+Ksy669EpTilJKE+20CjHZejnDw7VALHVZgH5UVfTc1B8lg Ms4j5tmlAgIyZout23/KIBoAwc/oegsu42skKp4yIiyJq9ogv4YT8nK71uRVKd1KtdrF A4xQ== X-Gm-Message-State: AOJu0Yxi8JPTvSpjfTgxVk0F/L1iVJX+1DEQR4RavUk6BMi4SYjsKRmN heEpFDXGcy0SEJOJ3AJ7rd4ApdxoqpWzzJkwwa+7V0Th0K5vrP3RDbjW89cksGwr0xp/lFtyBnN 3 X-Gm-Gg: ASbGncsm9iyedaNr4Wenl6QCvkqEw0YdMEM4XYVd5Kx72HGV2iZn2o35TPBUsCIdlak mwngOzkKv2bzUD9H1ACAu/P8KhP5UeyxYrbSE8RqjK0ekvhd7TaI37LFZB59++nS8v325C5AuPd IekkLNz02qxjpXyVaTGxAudxr8OhI05+rqXS4jktDSZPLRoxiZRVtZmlUAeAQIOKyBVq6cfVMKE iyhQV5Ye1rHBnc0Yb0YRCTL5VkKGK1HgQxe/DIDQTvQT9/AAWWAKIlVZec3ZcyeMoi3JZnUJTsx L95MLaDvE/qXGhvL4XQ5qinzDsV4SeiIPeU= X-Received: by 2002:a05:6a00:2d07:b0:728:e906:e446 with SMTP id d2e1a72fcca58-73426daad0cmr21602675b3a.24.1740417291989; Mon, 24 Feb 2025 09:14:51 -0800 (PST) Received: from stoup.. ([2607:fb90:c9e2:d7e3:c85c:d4f0:c8b8:8fa7]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-732425466besm20580780b3a.9.2025.02.24.09.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 09:14:51 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu Subject: [PATCH v4 03/24] target/m68k: Keep FPSR up-to-date Date: Mon, 24 Feb 2025 09:14:23 -0800 Message-ID: <20250224171444.440135-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250224171444.440135-1-richard.henderson@linaro.org> References: <20250224171444.440135-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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 Proper support for m68k exceptions will require testing the FPCR vs the FPSR for every instruction. As a step, do not keep FPSR bits in fp_status, but copy them back to the FPSR in every instruction. Since most of the FPSR must be updated on every insn, handle this from the existing helper_ftst and helper_fcmp functions. Signed-off-by: Richard Henderson --- target/m68k/cpu.h | 2 - target/m68k/helper.h | 2 - target/m68k/cpu.c | 10 ----- target/m68k/fpu_helper.c | 94 +++++++++++----------------------------- target/m68k/helper.c | 4 +- target/m68k/translate.c | 4 +- 6 files changed, 30 insertions(+), 86 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index e26d416bf4..7b90e1e58f 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -201,8 +201,6 @@ void cpu_m68k_set_ccr(CPUM68KState *env, uint32_t); void cpu_m68k_set_sr(CPUM68KState *env, uint32_t); void cpu_m68k_restore_fp_status(CPUM68KState *env); void cpu_m68k_set_fpcr(CPUM68KState *env, uint32_t val); -uint32_t cpu_m68k_get_fpsr(CPUM68KState *env); -void cpu_m68k_set_fpsr(CPUM68KState *env, uint32_t val); /* * Instead of computing the condition codes after each m68k instruction, diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 95aa5e53bb..2bbe0dc032 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -54,8 +54,6 @@ DEF_HELPER_4(fsdiv, void, env, fp, fp, fp) DEF_HELPER_4(fddiv, void, env, fp, fp, fp) DEF_HELPER_4(fsgldiv, void, env, fp, fp, fp) DEF_HELPER_FLAGS_3(fcmp, TCG_CALL_NO_RWG, void, env, fp, fp) -DEF_HELPER_2(set_fpsr, void, env, i32) -DEF_HELPER_1(get_fpsr, i32, env) DEF_HELPER_FLAGS_2(set_fpcr, TCG_CALL_NO_RWG, void, env, i32) DEF_HELPER_FLAGS_2(ftst, TCG_CALL_NO_RWG, void, env, fp) DEF_HELPER_3(fconst, void, env, fp, i32) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 76f8dfca2b..5dbad8bb43 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -410,20 +410,11 @@ static const VMStateDescription vmstate_freg = { } }; -static int fpu_pre_save(void *opaque) -{ - M68kCPU *s = opaque; - - s->env.fpsr = cpu_m68k_get_fpsr(&s->env); - return 0; -} - static int fpu_post_load(void *opaque, int version) { M68kCPU *s = opaque; cpu_m68k_set_fpcr(&s->env, s->env.fpcr); - cpu_m68k_set_fpsr(&s->env, s->env.fpsr); return 0; } @@ -432,7 +423,6 @@ const VMStateDescription vmmstate_fpu = { .version_id = 1, .minimum_version_id = 1, .needed = fpu_needed, - .pre_save = fpu_pre_save, .post_load = fpu_post_load, .fields = (const VMStateField[]) { VMSTATE_UINT32(env.fpcr, M68kCPU), diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index a6d93ff325..d5551bee41 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -164,76 +164,34 @@ void HELPER(set_fpcr)(CPUM68KState *env, uint32_t val) cpu_m68k_set_fpcr(env, val); } -/* Convert host exception flags to cpu_m68k form. */ -static int cpu_m68k_exceptbits_from_host(int host_bits) +static void update_fpsr(CPUM68KState *env, int cc) { - int target_bits = 0; + uint32_t fpsr = env->fpsr; + int flags = get_float_exception_flags(&env->fp_status); - if (host_bits & float_flag_invalid) { - target_bits |= FPSR_AEXP_IOP; - } - if (host_bits & float_flag_overflow) { - target_bits |= FPSR_AEXP_OVFL; - } - if (host_bits & (float_flag_underflow | float_flag_output_denormal_flushed)) { - target_bits |= FPSR_AEXP_UNFL; - } - if (host_bits & float_flag_divbyzero) { - target_bits |= FPSR_AEXP_DZ; - } - if (host_bits & float_flag_inexact) { - target_bits |= FPSR_AEXC_INEX; - } - return target_bits; -} + fpsr &= ~FPSR_CC_MASK; + fpsr |= cc; -/* Convert cpu_m68k exception flags to target form. */ -static int cpu_m68k_exceptbits_to_host(int target_bits) -{ - int host_bits = 0; + if (flags) { + set_float_exception_flags(0, &env->fp_status); - if (target_bits & FPSR_AEXP_IOP) { - host_bits |= float_flag_invalid; + if (flags & float_flag_invalid) { + fpsr |= FPSR_AEXP_IOP; + } + if (flags & float_flag_overflow) { + fpsr |= FPSR_AEXP_OVFL; + } + if (flags & (float_flag_underflow | float_flag_output_denormal_flushed)) { + fpsr |= FPSR_AEXP_UNFL; + } + if (flags & float_flag_divbyzero) { + fpsr |= FPSR_AEXP_DZ; + } + if (flags & float_flag_inexact) { + fpsr |= FPSR_AEXC_INEX; + } } - if (target_bits & FPSR_AEXP_OVFL) { - host_bits |= float_flag_overflow; - } - if (target_bits & FPSR_AEXP_UNFL) { - host_bits |= float_flag_underflow; - } - if (target_bits & FPSR_AEXP_DZ) { - host_bits |= float_flag_divbyzero; - } - if (target_bits & FPSR_AEXC_INEX) { - host_bits |= float_flag_inexact; - } - return host_bits; -} - -uint32_t cpu_m68k_get_fpsr(CPUM68KState *env) -{ - int host_flags = get_float_exception_flags(&env->fp_status); - int target_flags = cpu_m68k_exceptbits_from_host(host_flags); - int except = (env->fpsr & ~FPSR_AEXC_MASK) | target_flags; - return except; -} - -uint32_t HELPER(get_fpsr)(CPUM68KState *env) -{ - return cpu_m68k_get_fpsr(env); -} - -void cpu_m68k_set_fpsr(CPUM68KState *env, uint32_t val) -{ - env->fpsr = val; - - int host_flags = cpu_m68k_exceptbits_to_host((int) env->fpsr); - set_float_exception_flags(host_flags, &env->fp_status); -} - -void HELPER(set_fpsr)(CPUM68KState *env, uint32_t val) -{ - cpu_m68k_set_fpsr(env, val); + env->fpsr = fpsr; } #define PREC_BEGIN(prec) \ @@ -442,12 +400,12 @@ void HELPER(fcmp)(CPUM68KState *env, FPReg *val0, FPReg *val1) FloatRelation float_compare; float_compare = floatx80_compare(val1->d, val0->d, &env->fp_status); - env->fpsr = (env->fpsr & ~FPSR_CC_MASK) | float_comp_to_cc(float_compare); + update_fpsr(env, float_comp_to_cc(float_compare)); } void HELPER(ftst)(CPUM68KState *env, FPReg *val) { - uint32_t cc = 0; + int cc = 0; if (floatx80_is_neg(val->d)) { cc |= FPSR_CC_N; @@ -460,7 +418,7 @@ void HELPER(ftst)(CPUM68KState *env, FPReg *val) } else if (floatx80_is_zero(val->d)) { cc |= FPSR_CC_Z; } - env->fpsr = (env->fpsr & ~FPSR_CC_MASK) | cc; + update_fpsr(env, cc); } void HELPER(fconst)(CPUM68KState *env, FPReg *val, uint32_t offset) diff --git a/target/m68k/helper.c b/target/m68k/helper.c index beefeb7069..6e3bb96762 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -90,7 +90,7 @@ static int m68k_fpu_gdb_get_reg(CPUState *cs, GByteArray *mem_buf, int n) case 8: /* fpcontrol */ return gdb_get_reg32(mem_buf, env->fpcr); case 9: /* fpstatus */ - return gdb_get_reg32(mem_buf, cpu_m68k_get_fpsr(env)); + return gdb_get_reg32(mem_buf, env->fpsr); case 10: /* fpiar, not implemented */ return gdb_get_reg32(mem_buf, 0); } @@ -112,7 +112,7 @@ static int m68k_fpu_gdb_set_reg(CPUState *cs, uint8_t *mem_buf, int n) cpu_m68k_set_fpcr(env, ldl_be_p(mem_buf)); return 4; case 9: /* fpstatus */ - cpu_m68k_set_fpsr(env, ldl_be_p(mem_buf)); + env->fpsr = ldl_be_p(mem_buf); return 4; case 10: /* fpiar, not implemented */ return 4; diff --git a/target/m68k/translate.c b/target/m68k/translate.c index dec2967fce..d3cfad315c 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4733,7 +4733,7 @@ static void gen_load_fcr(DisasContext *s, TCGv res, int reg) tcg_gen_movi_i32(res, 0); break; case M68K_FPSR: - gen_helper_get_fpsr(res, tcg_env); + tcg_gen_ld_i32(res, tcg_env, offsetof(CPUM68KState, fpsr)); break; case M68K_FPCR: tcg_gen_ld_i32(res, tcg_env, offsetof(CPUM68KState, fpcr)); @@ -4747,7 +4747,7 @@ static void gen_store_fcr(DisasContext *s, TCGv val, int reg) case M68K_FPIAR: break; case M68K_FPSR: - gen_helper_set_fpsr(tcg_env, val); + tcg_gen_st_i32(val, tcg_env, offsetof(CPUM68KState, fpsr)); break; case M68K_FPCR: gen_helper_set_fpcr(tcg_env, val);