gas: sparc: fix collision of registers and pseudo-ops.

[deliverable/binutils-gdb.git] / sim / d10v / endian.c

diff --git a/sim/d10v/endian.c b/sim/d10v/endian.c
index 929edc9317c2c0eebdb4b88c67ecc8bb05d01591..dbc3db2003405fd5b31aef0a29e605f23fcff771 100644 (file)
--- a/sim/d10v/endian.c
+++ b/sim/d10v/endian.c
@@ -1,45 +1,41 @@
+/* If we're being compiled as a .c file, rather than being included in
+   d10v_sim.h, then ENDIAN_INLINE won't be defined yet.  */
+
 #ifndef ENDIAN_INLINE
 #define NO_ENDIAN_INLINE
-#include "d10v_sim.h"
+#include "sim-main.h"
 #define ENDIAN_INLINE
 #endif
 
+ENDIAN_INLINE uint16
+get_word (uint8 *x)
+{
+  return ((uint16)x[0]<<8) + x[1];
+}
+
 ENDIAN_INLINE uint32
-get_longword (x)
-      uint8 *x;
+get_longword (uint8 *x)
 {
   return ((uint32)x[0]<<24) + ((uint32)x[1]<<16) + ((uint32)x[2]<<8) + ((uint32)x[3]);
 }
 
 ENDIAN_INLINE int64
-get_longlong (x)
-      uint8 *x;
+get_longlong (uint8 *x)
 {
-  uint32 top = ((uint32)x[0]<<24) + ((uint32)x[1]<<16) + ((uint32)x[2]<<8) + ((uint32)x[3]);
-  uint32 bottom = ((uint32)x[4]<<24) + ((uint32)x[5]<<16) + ((uint32)x[6]<<8) + ((uint32)x[7]);
+  uint32 top = get_longword (x);
+  uint32 bottom = get_longword (x+4);
   return (((int64)top)<<32) | (int64)bottom;
 }
 
-ENDIAN_INLINE uint16
-get_word (x)
-      uint8 *x;
-{
-  return ((uint16)x[0]<<8) + x[1];
-}
-
 ENDIAN_INLINE void
-write_word (addr, data)
-     uint8 *addr;
-     uint16 data;
+write_word (uint8 *addr, uint16 data)
 {
   addr[0] = (data >> 8) & 0xff;
   addr[1] = data & 0xff;
 }
 
 ENDIAN_INLINE void
-write_longword (addr, data)
-     uint8 *addr;
-     uint32 data;
+write_longword (uint8 *addr, uint32 data)
 {
   addr[0] = (data >> 24) & 0xff;
   addr[1] = (data >> 16) & 0xff;
@@ -48,16 +44,8 @@ write_longword (addr, data)
 }
 
 ENDIAN_INLINE void
-write_longlong (addr, data)
-     uint8 *addr;
-     int64 data;
+write_longlong (uint8 *addr, int64 data)
 {
-  addr[0] = data >> 56;
-  addr[1] = (data >> 48) & 0xff;
-  addr[2] = (data >> 40) & 0xff;
-  addr[3] = (data >> 32) & 0xff;
-  addr[4] = (data >> 24) & 0xff;
-  addr[5] = (data >> 16) & 0xff;
-  addr[6] = (data >> 8) & 0xff;
-  addr[7] = data & 0xff;
+  write_longword (addr, (uint32)(data >> 32));
+  write_longword (addr+4, (uint32)data);
 }