commit 706f58c4e53dba8c4045661b6d9f400540e5f55a
author Sandipan Das <sandipan@linux.ibm.com> Sat Feb 06 17:27:36 2021 +0530
committer Boris Shingarov <shingarov@labware.com> Sun Jul 04 18:18:53 2021 +0000
tree 4ad7610d3a7edc813f0ed5df7b85bc4545f94b68
parent d879f390fe898dbc97923497d27fbd85a4130b33

arch-power: Add byte order attribute for PC state

This adds byte order as an attribute for PC state by
introducing a new PCState class. The decoder can now
fetch instructions bytes in the specified byte order
in preparation for multi-mode support.

Change-Id: I917333df88114a733cc5a8077cc420d5328f608b
Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40940
Reviewed-by: Boris Shingarov <shingarov@labware.com>
Maintainer: Boris Shingarov <shingarov@labware.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/arch/power/decoder.hh

diff --git a/src/arch/power/decoder.hh b/src/arch/power/decoder.hh
index 4e0c92b..20726a0 100644
--- a/src/arch/power/decoder.hh
+++ b/src/arch/power/decoder.hh
@@ -68,7 +68,7 @@
     void
     moreBytes(const PCState &pc, Addr fetchPC)
     {
-        emi = betoh(emi);
+        emi = gtoh(emi, pc.byteOrder());
         instDone = true;
     }
 

src/arch/power/pcstate.hh

diff --git a/src/arch/power/pcstate.hh b/src/arch/power/pcstate.hh
index 9553c73..d0757839 100644
--- a/src/arch/power/pcstate.hh
+++ b/src/arch/power/pcstate.hh
@@ -30,6 +30,8 @@
 #define __ARCH_POWER_PCSTATE_HH__
 
 #include "arch/generic/types.hh"
+#include "arch/power/types.hh"
+#include "enums/ByteOrder.hh"
 
 namespace gem5
 {
@@ -37,7 +39,40 @@
 namespace PowerISA
 {
 
-typedef GenericISA::SimplePCState<4> PCState;
+class PCState : public GenericISA::SimplePCState<4>
+{
+  private:
+    typedef GenericISA::SimplePCState<4> Base;
+    ByteOrder guestByteOrder = ByteOrder::big;
+
+  public:
+    PCState()
+    {}
+
+    void
+    set(Addr val)
+    {
+        Base::set(val);
+        npc(val + 4);
+    }
+
+    PCState(Addr val)
+    {
+        set(val);
+    }
+
+    ByteOrder
+    byteOrder() const
+    {
+        return guestByteOrder;
+    }
+
+    void
+    byteOrder(ByteOrder order)
+    {
+        guestByteOrder = order;
+    }
+};
 
 } // namespace PowerISA
 } // namespace gem5