From nobody Wed Feb 11 05:50:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618786295; cv=none; d=zohomail.com; s=zohoarc; b=B/aVaPrPfS7q3T00r5PnkGZ9FIwNZuWjXynq/wXh6NPEymCFJUs0amlnrx3kS+hFLNtpxI41ZuBuuRcOO6W4pT0cpyGoYxRC7q7XRjZl4TVT13zocIwn+GT9IVEi0AOgMtstXHuxaBGT5SBAsbl6R+ivxfTEUVZXWKhxu/Kxxto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618786295; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fTQ5LbmfBKa+DkChI03N3lX+fZBlTslCfIb2OafYz+c=; b=d4rutoE3tlwkDLfcqtAwnc3PXDJNlsg3Qp5F1HvW0GQ68eS8GwiQ6ZgH6gqsjPvWBMTb2OpO73XF+uLOkPpAA7f/zy/XX5ou6in+hce511J7jSeejWuG1gNc9lxUIKP9KE1/X5+qOloo7Qb7mknqFneMdcgTuitXRvNxPu0hyPw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1618786295987972.3136704925188; Sun, 18 Apr 2021 15:51:35 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id o9-20020a1c41090000b029012c8dac9d47so10098879wma.1 for ; Sun, 18 Apr 2021 15:51:35 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id v4sm17235085wme.14.2021.04.18.15.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 15:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fTQ5LbmfBKa+DkChI03N3lX+fZBlTslCfIb2OafYz+c=; b=lVi3ifnZlBlVA9Tv1suzJAXIDD4rwQKhYoZ1+vj/HtpUnz62dPam8ae+PYQELQnYtC zl0vcqn9S7l8VeAf/Q8ZFv89JKNopf3e/r0WIHJuqVsZgCJKAp9cDoBnbhLB5440rpdO s0jCYQ7FplSaHg0liJj12OidmVRdaVbKO0KQrAp9REPKRcUDRs/ganE/DlSNceKzAeB1 fGhWlZjSfnuMiAmzkg9zQzQboAvE6T2fGS9XL3pnOaRSTadci7FRNscsTPI0cpyfAhPC CxkuZJHsJgfT43Y7iS38PKc21rpARw6H1Q4Ajc/JzrOc2D7eWUQ/XJnu0GpBjAySyBt0 g49A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fTQ5LbmfBKa+DkChI03N3lX+fZBlTslCfIb2OafYz+c=; b=nqeOZLkOonehh60VIsHx/P277QukIAAon9xkSZYIvlWpxZMLTdZZrHRp0s0ZlYZEqd F7IpuUlsx4pmuMmdgP/RtQKPezIqBDhyRM665YpPwrZbSFKfSFEDJi1BE9/KLcoa8FL5 AKpnR6MlYPJhZDDj/mbpaOtyo4wxqvvA+3h2jeVdYu5mnhCesTs+nxDPIXJLU6FdyZuE J7Q1qVlDCWt5FdvhCrP238dCU6QHcK16VugB6uTSv8l38kQT4X/7SYWqKb7kR+waYk9I PV71bpnQJhLHASp046uyMNyEZPOkUwUBaC8wnwK41WaYbabNyJ2Ffw/RwhoWPZlP6e/L DOZA== X-Gm-Message-State: AOAM532iYLTD26JphGzLlBnaygt0ZfjFzpkki++5/fLCnbCEnb/yF4rC XGn2KYElcPhdS2r1msriazY= X-Google-Smtp-Source: ABdhPJy/9KW9kNiXZwJNCB8pRsy2QmigWiBuSPGGqPe1uEtPrGEQFQSHM2AYYljm5FQcWfu9FLcAKw== X-Received: by 2002:a1c:a182:: with SMTP id k124mr18974890wme.132.1618786294123; Sun, 18 Apr 2021 15:51:34 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Aleksandar Rikalo Subject: [PATCH v2 07/29] target/mips: Turn printfpr() macro into a proper function Date: Mon, 19 Apr 2021 00:50:36 +0200 Message-Id: <20210418225058.1257014-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418225058.1257014-1-f4bug@amsat.org> References: <20210418225058.1257014-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Turn printfpr() macro into a proper function: fpu_dump_fpr(). Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/cpu.c | 48 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 232f701b836..90ae232c8b8 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -145,44 +145,40 @@ void cpu_mips_store_cause(CPUMIPSState *env, target_u= long val) =20 #endif /* !CONFIG_USER_ONLY */ =20 +static void fpu_dump_fpr(fpr_t *fpr, FILE *f, bool is_fpu64) +{ + if (is_fpu64) { + qemu_fprintf(f, "w:%08x d:%016" PRIx64 " fd:%13g fs:%13g psu: %13g= \n", + fpr->w[FP_ENDIAN_IDX], fpr->d, + (double)fpr->fd, + (double)fpr->fs[FP_ENDIAN_IDX], + (double)fpr->fs[!FP_ENDIAN_IDX]); + } else { + fpr_t tmp; + + tmp.w[FP_ENDIAN_IDX] =3D fpr->w[FP_ENDIAN_IDX]; + tmp.w[!FP_ENDIAN_IDX] =3D (fpr + 1)->w[FP_ENDIAN_IDX]; + qemu_fprintf(f, "w:%08x d:%016" PRIx64 " fd:%13g fs:%13g psu:%13g\= n", + tmp.w[FP_ENDIAN_IDX], tmp.d, + (double)tmp.fd, + (double)tmp.fs[FP_ENDIAN_IDX], + (double)tmp.fs[!FP_ENDIAN_IDX]); + } +} + static void fpu_dump_state(CPUMIPSState *env, FILE *f, int flags) { int i; int is_fpu64 =3D !!(env->hflags & MIPS_HFLAG_F64); =20 -#define printfpr(fp) \ - do { \ - if (is_fpu64) \ - qemu_fprintf(f, "w:%08x d:%016" PRIx64 \ - " fd:%13g fs:%13g psu: %13g\n", \ - (fp)->w[FP_ENDIAN_IDX], (fp)->d, \ - (double)(fp)->fd, \ - (double)(fp)->fs[FP_ENDIAN_IDX], \ - (double)(fp)->fs[!FP_ENDIAN_IDX]); \ - else { \ - fpr_t tmp; \ - tmp.w[FP_ENDIAN_IDX] =3D (fp)->w[FP_ENDIAN_IDX]; \ - tmp.w[!FP_ENDIAN_IDX] =3D ((fp) + 1)->w[FP_ENDIAN_IDX]; \ - qemu_fprintf(f, "w:%08x d:%016" PRIx64 \ - " fd:%13g fs:%13g psu:%13g\n", \ - tmp.w[FP_ENDIAN_IDX], tmp.d, \ - (double)tmp.fd, \ - (double)tmp.fs[FP_ENDIAN_IDX], \ - (double)tmp.fs[!FP_ENDIAN_IDX]); \ - } \ - } while (0) - - qemu_fprintf(f, "CP1 FCR0 0x%08x FCR31 0x%08x SR.FR %d fp_status 0x%02= x\n", env->active_fpu.fcr0, env->active_fpu.fcr31, is_fpu64, get_float_exception_flags(&env->active_fpu.fp_status)); for (i =3D 0; i < 32; (is_fpu64) ? i++ : (i +=3D 2)) { qemu_fprintf(f, "%3s: ", fregnames[i]); - printfpr(&env->active_fpu.fpr[i]); + fpu_dump_fpr(&env->active_fpu.fpr[i], f, is_fpu64); } - -#undef printfpr } =20 static void mips_cpu_dump_state(CPUState *cs, FILE *f, int flags) --=20 2.26.3