From patchwork Sun May 11 20:35:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 889170 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1334308wrr; Sun, 11 May 2025 13:37:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUvLYT7/7yHZDGki3QQEjlPBkSEihgftWiz/wWkwpDwuLtJ2dVJSEe00pMqaN0NesFE8iuwmA==@linaro.org X-Google-Smtp-Source: AGHT+IFOaF3WzpgGGRtMNMSeD3IkkFQzyoZ69gUUsRPzhptc9kWiTR90hPYpvLsEnsaBAX1GxOIQ X-Received: by 2002:a05:622a:6110:b0:48d:66ee:662a with SMTP id d75a77b69052e-49452ac5247mr181034041cf.26.1746995873623; Sun, 11 May 2025 13:37:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746995873; cv=none; d=google.com; s=arc-20240605; b=AK7K/RFld8jNUpJvqdteMEK02WuOq3OwuI6iWTqepNmoInmSLHDnIuiB2xwYv7IjZG qUN9erP9jZHZFskzVG8r8sqUYXdvOXSO9Ys32YdJLhTMEEl52y80wv9cFHenyK1lDMCg DF+40oTj6lLhHvBXOhr/guJ+ByV8nEn+a4/6olcGCR8x6Yzf/EKX7fkQ8jzf26S0LjZM UrM7awNVdGi9P6v3Aoxyl1H3kSshXzT1uxyEgIrqGhL6By4V1rnPx6ZrpPehIZJLv916 LkOddIUaKkA2ZYhFZ2/jU+XLlGwxmJ8SKBd/avDTDt9hS++SVGx2F2f0fxZ5/w+NZ58C KxUA== 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=eB0y8IYFZ8K+Qjx0npmrme5ZHhfgZxp81sJx7OrLsFA=; fh=ZKeelGKICHQ9l/9d+e+bGKuo/S/FkjHED8U2Ob+lIbw=; b=g55sw3btVpX9UNAiGZAm7APZzOJfoLUvlW4i4hsHfXaQB8I4GkBVv31XliVM4AcQmr oGk/WQsL3e3S94LHmQdUjJzlemHmRx98Eg0wgkQzIYgFEz7fk2eZBS7itKgER1Z7CRKO DnJhmxsrnhN+uOg/IVgTyr3S47EvYbgtfMtP/1uMG3v3WbMPsUC+6F5oPGUntL07MX6Y CKnamx44gYpZgr5wr/F7Gae8TivIRqhne+IiInAKZai+w7NiO2OCnehVLjI/vUa9WIqN FYWcP5hwZioVk64khINyVUz2RsI0iXmoFCVTU9ogyyam5k7NE0IPmnI0+jJcev8vHLUE LbNA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FAhLoc43; 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 d75a77b69052e-49452459a6dsi72026881cf.135.2025.05.11.13.37.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 May 2025 13:37:53 -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=FAhLoc43; 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 1uEDPG-0003d9-1M; Sun, 11 May 2025 16:36:18 -0400 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 1uEDP8-0003c8-UP for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:11 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEDP6-0006Nb-L1 for qemu-devel@nongnu.org; Sun, 11 May 2025 16:36:10 -0400 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-b24f986674fso1688804a12.0 for ; Sun, 11 May 2025 13:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746995767; x=1747600567; 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=eB0y8IYFZ8K+Qjx0npmrme5ZHhfgZxp81sJx7OrLsFA=; b=FAhLoc43yuZNHeE7skAzN8hibF7GVtWeTZmEGBsv9iNVArlZ5msf/CJMapc6gbrfLs OLIkupA7PctBAgHfBLE5u9+wRO8i+mUFA7uupppjzSpImQ0vO/0K5htTgERTQCZL09LA 72lKIGeNIpGjuwFxkYas9dy3FPFOYDyDSe2WKbIZWTdmuNLM9GusSVEXLU97+sVPYVpF F69XlAdGcj+HFsdKSH0j4Ji4wVNpmt/5L7r+b8EFItHEarhgTYL5sn/kbDv2DLKhYLWL 3RuHzmCumkq40IxdoLGuZbLsRRqxxHfH3lUT6n24GYYzaMkaauV4mzAqMlSE0X1tYrYa ohEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746995767; x=1747600567; 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=eB0y8IYFZ8K+Qjx0npmrme5ZHhfgZxp81sJx7OrLsFA=; b=Z47yB9KEv2Naz0zt935NPehEGHopqKipBALdZvW1MM+wps/wjMlmpLCVpee2H2Qy4+ CU2pNY1YkQj10Wbj4gafxs2/ZlAqAGceU6CcN689G5kPmN5ki8Ccm3BQ+f524S1ptGAz +D7u913JhfUQKR2d0ckgk8TDphQQkA5ZNOGHV2kYuSR9I4zCAZwosyPF757/Grzqn4gw +Vzznw3wTys5dIce/pHc2uMTYk55r1uqWDXvh6fZqqyDqFWl4hHTU93P8ehdkUEkydvW JX+iXXwZQX8E1C1xaJySjcRQdJo7k+tIBMYSZ44k6yUnl4akYMFlljAE6oaLzSKmtVMy Q6rA== X-Gm-Message-State: AOJu0Ywb2Wif8uMJw+oKCrFmWe7jqBsaEQe4iFz5cSitmGsjljn3BeCN rfvjSlDh6U0X3p6haGMO8aVjc0hZSCKLiF+liwUtzSR+tyvstH1QhSkglwcObW/KOaWUiqP4rdu Z X-Gm-Gg: ASbGncs6nwYNwzZvfXYFiDIrjWPcZUDzrVkwRV8a+Im2tvMytvn79rD9ut8Ws6veufw HL3r1S2be841OXqfVGL1WNiSIbpmdnB5SZ8O9XXk4yyjX4rPLdr4xudagj2JbIFj06hnqAylZMe 6D4Oi07gqRz9ECcQVPcGYO8fxMECgcCKIVAT0guy4zPrXcH9RwGtY8rhoK46ZTC4xSl7djxDR+M nyWxJIG9uQYVb5SMBKqLqNTKuCv1P+Vdwuaj1A9AdTdKthjh1EFfn7Tux2f8pQMqwwd6LfbhoTX psK6yFnTIJtHJ5ufdDbSEaQifNsCQfGimwhZbsc0wV+f4Qnp0TOIvIjcyhhvoUydYiGw+jrYsEw cZpxQ6y7yTg== X-Received: by 2002:a17:902:da83:b0:22e:4b74:5f68 with SMTP id d9443c01a7336-22e84790b02mr234446875ad.19.1746995767379; Sun, 11 May 2025 13:36:07 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fc7544d86sm49955095ad.47.2025.05.11.13.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 13:36:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, schwab@linux-m68k.org, =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Subject: [PATCH v6 24/24] target/m68k: Implement FPIAR Date: Sun, 11 May 2025 13:35:46 -0700 Message-ID: <20250511203546.139788-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250511203546.139788-1-richard.henderson@linaro.org> References: <20250511203546.139788-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::530; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x530.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 So far, this is only read-as-written. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2497 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/m68k/cpu.h | 1 + target/m68k/cpu.c | 23 ++++++++++++++++++++++- target/m68k/helper.c | 14 ++++++++------ target/m68k/translate.c | 3 ++- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 77ed496ab4..baa2e035a4 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -110,6 +110,7 @@ typedef struct CPUArchState { uint32_t fpsr; uint32_t fpsr_pdr; /* live only with a packed decimal real operand */ float_status fp_status; + uint32_t fpiar; uint64_t mactmp; /* diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index fe53572542..00cba4d963 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -470,6 +470,23 @@ static const VMStateDescription vmstate_freg = { } }; +static bool fpu_fpiar_needed(void *opaque) +{ + M68kCPU *s = opaque; + return s->env.fpiar != 0; +} + +static const VMStateDescription vmstate_fpiar = { + .name = "cpu/fpu/fpiar", + .version_id = 1, + .minimum_version_id = 1, + .needed = fpu_fpiar_needed, + .fields = (const VMStateField[]) { + VMSTATE_UINT32(env.fpiar, M68kCPU), + VMSTATE_END_OF_LIST() + } +}; + static int fpu_post_load(void *opaque, int version) { M68kCPU *s = opaque; @@ -490,7 +507,11 @@ static const VMStateDescription vmstate_fpu = { VMSTATE_STRUCT_ARRAY(env.fregs, M68kCPU, 8, 0, vmstate_freg, FPReg), VMSTATE_STRUCT(env.fp_result, M68kCPU, 0, vmstate_freg, FPReg), VMSTATE_END_OF_LIST() - } + }, + .subsections = (const VMStateDescription * const []) { + &vmstate_fpiar, + NULL + }, }; static bool cf_spregs_needed(void *opaque) diff --git a/target/m68k/helper.c b/target/m68k/helper.c index b50ef6dec3..818c0dd057 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -47,8 +47,8 @@ static int cf_fpu_gdb_get_reg(CPUState *cs, GByteArray *mem_buf, int n) return gdb_get_reg32(mem_buf, env->fpcr); case 9: /* fpstatus */ return gdb_get_reg32(mem_buf, env->fpsr); - case 10: /* fpiar, not implemented */ - return gdb_get_reg32(mem_buf, 0); + case 10: /* fpiar */ + return gdb_get_reg32(mem_buf, env->fpiar); } return 0; } @@ -71,7 +71,8 @@ static int cf_fpu_gdb_set_reg(CPUState *cs, uint8_t *mem_buf, int n) case 9: /* fpstatus */ env->fpsr = ldl_be_p(mem_buf); return 4; - case 10: /* fpiar, not implemented */ + case 10: /* fpiar */ + env->fpiar = ldl_be_p(mem_buf); return 4; } return 0; @@ -93,8 +94,8 @@ static int m68k_fpu_gdb_get_reg(CPUState *cs, GByteArray *mem_buf, int n) return gdb_get_reg32(mem_buf, env->fpcr); case 9: /* fpstatus */ return gdb_get_reg32(mem_buf, env->fpsr); - case 10: /* fpiar, not implemented */ - return gdb_get_reg32(mem_buf, 0); + case 10: /* fpiar */ + return gdb_get_reg32(mem_buf, env->fpiar); } return 0; } @@ -116,7 +117,8 @@ static int m68k_fpu_gdb_set_reg(CPUState *cs, uint8_t *mem_buf, int n) case 9: /* fpstatus */ env->fpsr = ldl_be_p(mem_buf); return 4; - case 10: /* fpiar, not implemented */ + case 10: /* fpiar */ + env->fpiar = ldl_be_p(mem_buf); return 4; } return 0; diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 49c9d4e870..07d1812deb 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4674,7 +4674,7 @@ static void gen_load_fcr(DisasContext *s, TCGv res, int reg) { switch (reg) { case M68K_FPIAR: - tcg_gen_movi_i32(res, 0); + tcg_gen_ld_i32(res, tcg_env, offsetof(CPUM68KState, fpiar)); break; case M68K_FPSR: tcg_gen_ld_i32(res, tcg_env, offsetof(CPUM68KState, fpsr)); @@ -4689,6 +4689,7 @@ static void gen_store_fcr(DisasContext *s, TCGv val, int reg) { switch (reg) { case M68K_FPIAR: + tcg_gen_st_i32(val, tcg_env, offsetof(CPUM68KState, fpiar)); break; case M68K_FPSR: tcg_gen_st_i32(val, tcg_env, offsetof(CPUM68KState, fpsr));