[gem5-dev] Change in gem5/gem5[develop]: arch-power: Revamp float regs.

[Gabe Black (Gerrit) via gem5-dev]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/49771 )

Change subject: arch-power: Revamp float regs.
......................................................................

arch-power: Revamp float regs.

Change-Id: I77a5a021da82c8528d092f7363a927dec224d5ac
---
M src/arch/power/isa.cc
M src/arch/power/regs/float.hh
M src/arch/power/remote_gdb.cc
M src/arch/power/remote_gdb.hh
4 files changed, 21 insertions(+), 15 deletions(-)



diff --git a/src/arch/power/isa.cc b/src/arch/power/isa.cc
index 99aef2f..ff9f9b6 100644
--- a/src/arch/power/isa.cc
+++ b/src/arch/power/isa.cc
@@ -55,7 +55,7 @@
 ISA::ISA(const Params &p) : BaseISA(p)
 {
     _regClasses.emplace_back(int_reg::NumRegs, debug::IntRegs);
-    _regClasses.emplace_back(NumFloatRegs, debug::FloatRegs);
+    _regClasses.emplace_back(float_reg::NumRegs, debug::FloatRegs);
     _regClasses.emplace_back(1, debug::IntRegs);
     _regClasses.emplace_back(2, debug::IntRegs);
     _regClasses.emplace_back(1, debug::IntRegs);
@@ -74,8 +74,10 @@
     }

     // Then loop through the floating point registers.
-    for (int i = 0; i < NumFloatRegs; ++i)
-        tc->setFloatReg(i, src->readFloatReg(i));
+    for (int i = 0; i < float_reg::NumRegs; ++i) {
+        RegId reg(FloatRegClass, i);
+        tc->setReg(reg, src->getReg(reg));
+    }

     //TODO Copy misc. registers

diff --git a/src/arch/power/regs/float.hh b/src/arch/power/regs/float.hh
index 9464101..ce31c3a 100644
--- a/src/arch/power/regs/float.hh
+++ b/src/arch/power/regs/float.hh
@@ -35,9 +35,13 @@
 namespace PowerISA
 {

-const int NumFloatArchRegs = 32;
-const int NumFloatRegs = NumFloatArchRegs;
+namespace float_reg
+{

+const int NumArchRegs = 32;
+const int NumRegs = NumArchRegs;
+
+} // namespace float_reg
 } // namespace PowerISA
 } // namespace gem5

diff --git a/src/arch/power/remote_gdb.cc b/src/arch/power/remote_gdb.cc
index b42f43d..1bf3891 100644
--- a/src/arch/power/remote_gdb.cc
+++ b/src/arch/power/remote_gdb.cc
@@ -191,8 +191,8 @@
         r.gpr[i] = htog((uint32_t)context->getReg(reg), order);
     }

-    for (int i = 0; i < NumFloatArchRegs; i++)
-        r.fpr[i] = context->readFloatReg(i);
+    for (int i = 0; i < float_reg::NumArchRegs; i++)
+        r.fpr[i] = context->getReg(RegId(FloatRegClass, i));

     r.pc = htog((uint32_t)context->pcState().pc(), order);
     r.msr = 0; // MSR is privileged, hence not exposed here
@@ -214,8 +214,8 @@
     for (int i = 0; i < int_reg::NumArchRegs; i++)
         context->setReg(RegId(IntRegClass, i), gtoh(r.gpr[i], order));

-    for (int i = 0; i < NumFloatArchRegs; i++)
-        context->setFloatReg(i, r.fpr[i]);
+    for (int i = 0; i < float_reg::NumArchRegs; i++)
+        context->setReg(RegId(FloatRegClass, i), r.fpr[i]);

     auto pc = context->pcState();
     pc.byteOrder(order);
@@ -245,8 +245,8 @@
     for (int i = 0; i < int_reg::NumArchRegs; i++)
         r.gpr[i] = htog(context->getReg(RegId(IntRegClass, i)), order);

-    for (int i = 0; i < NumFloatArchRegs; i++)
-        r.fpr[i] = context->readFloatReg(i);
+    for (int i = 0; i < float_reg::NumArchRegs; i++)
+        r.fpr[i] = context->getReg(RegId(FloatRegClass, i));

     r.pc = htog(context->pcState().pc(), order);
     r.msr = 0; // MSR is privileged, hence not exposed here
@@ -268,8 +268,8 @@
     for (int i = 0; i < int_reg::NumArchRegs; i++)
         context->setReg(RegId(IntRegClass, i), gtoh(r.gpr[i], order));

-    for (int i = 0; i < NumFloatArchRegs; i++)
-        context->setFloatReg(i, r.fpr[i]);
+    for (int i = 0; i < float_reg::NumArchRegs; i++)
+        context->setReg(RegId(FloatRegClass, i), r.fpr[i]);

     auto pc = context->pcState();
     pc.byteOrder(order);
diff --git a/src/arch/power/remote_gdb.hh b/src/arch/power/remote_gdb.hh
index c2a2853..138913e 100644
--- a/src/arch/power/remote_gdb.hh
+++ b/src/arch/power/remote_gdb.hh
@@ -57,7 +57,7 @@
         struct GEM5_PACKED
         {
             uint32_t gpr[int_reg::NumArchRegs];
-            uint64_t fpr[NumFloatArchRegs];
+            uint64_t fpr[float_reg::NumArchRegs];
             uint32_t pc;
             uint32_t msr;
             uint32_t cr;
@@ -86,7 +86,7 @@
         struct GEM5_PACKED
         {
             uint64_t gpr[int_reg::NumArchRegs];
-            uint64_t fpr[NumFloatArchRegs];
+            uint64_t fpr[float_reg::NumArchRegs];
             uint64_t pc;
             uint64_t msr;
             uint32_t cr;

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49771
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I77a5a021da82c8528d092f7363a927dec224d5ac
Gerrit-Change-Number: 49771
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s