[PATCH 1/2] sim: ppc: implement 128-bit register read/writes with sim-endian APIs

[PATCH 1/2] sim: ppc: implement 128-bit register read/writes with sim-endian APIs

[Mike Frysinger]

We have APIs in sim-endian for working with 128-bit values like this code
is already doing for 8/16/32/64-bit values.  Switch over to that to make
it a bit simpler, and drop the WITH_ALTIVEC check.  The code probably is
only used when altivec is enabled, but it doesn't add much to always
compile it in, and avoids #ifdef rot by not actually compiling it.
---
 sim/ppc/psim.c | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/sim/ppc/psim.c b/sim/ppc/psim.c
index 2c900e64100a..88c485d695b2 100644
--- a/sim/ppc/psim.c
+++ b/sim/ppc/psim.c
@@ -796,6 +796,7 @@ psim_read_register(psim *system,
     unsigned_2 unsigned_2;
     unsigned_4 unsigned_4;
     unsigned_8 unsigned_8;
+    unsigned_16 unsigned_16;
     creg creg;
     fpreg fpreg;
     fpscreg fpscreg;
@@ -922,21 +923,12 @@ psim_read_register(psim *system,
     case 8:
       *(unsigned_8*)buf = H2T_8(cooked_buf.unsigned_8);
       break;
-#ifdef WITH_ALTIVEC
     case 16:
-      if (HOST_BYTE_ORDER != CURRENT_TARGET_BYTE_ORDER)
-        {
-	  union { vreg v; unsigned_8 d[2]; } h, t;
-          memcpy(&h.v/*dest*/, cooked_buf.bytes/*src*/, description.size);
-	  { _SWAP_8(t.d[0] =, h.d[1]); }
-	  { _SWAP_8(t.d[1] =, h.d[0]); }
-          memcpy(buf/*dest*/, &t/*src*/, description.size);
-          break;
-        }
-      else
-        memcpy(buf/*dest*/, cooked_buf.bytes/*src*/, description.size);
+      {
+	unsigned_16 v = H2T_16(cooked_buf.unsigned_16);
+	memcpy(buf/*dest*/, &v, description.size);
+      }
       break;
-#endif
     }
   }
   else {
@@ -965,6 +957,7 @@ psim_write_register(psim *system,
     unsigned_2 unsigned_2;
     unsigned_4 unsigned_4;
     unsigned_8 unsigned_8;
+    unsigned_16 unsigned_16;
     creg creg;
     fpreg fpreg;
     fpscreg fpscreg;
@@ -1014,20 +1007,9 @@ psim_write_register(psim *system,
     case 8:
       cooked_buf.unsigned_8 = T2H_8(*(unsigned_8*)buf);
       break;
-#ifdef WITH_ALTIVEC
     case 16:
-      if (HOST_BYTE_ORDER != CURRENT_TARGET_BYTE_ORDER)
-        {
-	  union { vreg v; unsigned_8 d[2]; } h, t;
-          memcpy(&t.v/*dest*/, buf/*src*/, description.size);
-	  { _SWAP_8(h.d[0] =, t.d[1]); }
-	  { _SWAP_8(h.d[1] =, t.d[0]); }
-          memcpy(cooked_buf.bytes/*dest*/, &h/*src*/, description.size);
-          break;
-        }
-      else
-        memcpy(cooked_buf.bytes/*dest*/, buf/*src*/, description.size);
-#endif
+      cooked_buf.unsigned_16 = T2H_16(*(unsigned_16*)buf);
+      break;
     }
   }
   else {
-- 
2.43.0

[PATCH 2/2] sim: endian: leverage __int128 when available

[Mike Frysinger]

Should be functionally the same, but the code is a little simpler.
---
 sim/common/sim-endian.c | 8 ++++++++
 sim/common/sim-types.h  | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/sim/common/sim-endian.c b/sim/common/sim-endian.c
index 9b498fbf94e3..76735ea6cfd5 100644
--- a/sim/common/sim-endian.c
+++ b/sim/common/sim-endian.c
@@ -98,6 +98,9 @@ INLINE_SIM_ENDIAN\
 (unsigned_8)
 sim_endian_split_16 (unsigned_16 word, int w)
 {
+#ifdef HAVE___INT128
+  return w == 0 ? word >> 64 : word;
+#else
   if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
     {
       return word.a[1 - w];
@@ -106,6 +109,7 @@ sim_endian_split_16 (unsigned_16 word, int w)
     {
       return word.a[w];
     }
+#endif
 }
 
 
@@ -114,6 +118,9 @@ INLINE_SIM_ENDIAN\
 sim_endian_join_16 (unsigned_8 h, unsigned_8 l)
 
 {
+#ifdef HAVE___INT128
+  return (unsigned_16)h << 64 | l;
+#else
   unsigned_16 word;
   if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
     {
@@ -126,6 +133,7 @@ sim_endian_join_16 (unsigned_8 h, unsigned_8 l)
       word.a[1] = l;
     }
   return word;
+#endif
 }
 
 
diff --git a/sim/common/sim-types.h b/sim/common/sim-types.h
index 182f0dbe1f38..f5f863c536e7 100644
--- a/sim/common/sim-types.h
+++ b/sim/common/sim-types.h
@@ -67,8 +67,13 @@
 # define SIGNED64(X)	((int64_t) X##LL)
 #endif
 
+#ifdef HAVE___INT128
+typedef unsigned __int128 unsigned128;
+typedef __int128 signed128;
+#else
 typedef struct { uint64_t a[2]; } unsigned128;
 typedef struct { int64_t a[2]; } signed128;
+#endif
 
 
 /* byte based */
-- 
2.43.0