From: Gabe Black <gabeblack@google.com>
Date: Wed, 21 Nov 2018 00:22:26 +0000 (-0800)
Subject: x86: Get rid of a problematic DPRINTF in PremFp.
X-Git-Tag: v19.0.0.0~1378
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5bc2291391b0497fdc60fdc960e07bcecebfb8f;p=gem5.git

x86: Get rid of a problematic DPRINTF in PremFp.

This DPRINTF shouldn't be necessary since it shows the operands and
results of the instruction which the trace should already make
available. Also by passing the destination register to DPRINTF, the ISA
parser will assume that it's also a source when tracking dependencies.

Change-Id: I820387c82578bdbb8d2e3d91652a6c0185077f54
Reviewed-on: https://gem5-review.googlesource.com/c/14475
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
---

diff --git a/src/arch/x86/isa/microops/fpop.isa b/src/arch/x86/isa/microops/fpop.isa
index 65c2fdb57..52193f2c0 100644
--- a/src/arch/x86/isa/microops/fpop.isa
+++ b/src/arch/x86/isa/microops/fpop.isa
@@ -380,29 +380,27 @@ let {{
 
     class PremFp(FpBinaryOp):
         code = '''
-            MiscReg new_fsw(FSW);
+            MiscReg new_fsw = FSW;
             int src1_exp;
             int src2_exp;
             std::frexp(FpSrcReg1, &src1_exp);
             std::frexp(FpSrcReg2, &src2_exp);
 
-            const int d(src2_exp - src1_exp);
+            const int d = src2_exp - src1_exp;
             if (d < 64) {
-                const int64_t q(std::trunc(FpSrcReg2 / FpSrcReg1));
+                const int64_t q = std::trunc(FpSrcReg2 / FpSrcReg1);
                 FpDestReg = FpSrcReg2 - FpSrcReg1 * q;
                 new_fsw &= ~(CC0Bit | CC1Bit | CC2Bit | CC2Bit);
                 new_fsw |= (q & 0x1) ? CC1Bit : 0;
                 new_fsw |= (q & 0x2) ? CC3Bit : 0;
                 new_fsw |= (q & 0x4) ? CC0Bit : 0;
             } else {
-                const int n(42);
-                const int64_t qq(std::trunc(
-                    FpSrcReg2 / std::ldexp(FpSrcReg1, d - n)));
+                const int n = 42;
+                const int64_t qq = std::trunc(
+                    FpSrcReg2 / std::ldexp(FpSrcReg1, d - n));
                 FpDestReg = FpSrcReg2 - std::ldexp(FpSrcReg1 * qq, d - n);
                 new_fsw |= CC2Bit;
             }
-            DPRINTF(X86, "src1: %lf, src2: %lf, dest: %lf, FSW: 0x%x\\n",
-                    FpSrcReg1, FpSrcReg2, FpDestReg, new_fsw);
         '''
         op_class = 'FloatDivOp'