This commit was generated by cvs2svn to track changes on a CVS vendor

[deliverable/binutils-gdb.git] / sim / common / sim-n-bits.h

diff --git a/sim/common/sim-n-bits.h b/sim/common/sim-n-bits.h
index 5c0aa5558e67cc44a9da7c04a6d8764ed5c628f3..83157fff05a503a43dfaa13f631dc3cf093d7e84 100644 (file)
--- a/sim/common/sim-n-bits.h
+++ b/sim/common/sim-n-bits.h
@@ -24,7 +24,7 @@
 #error "N must be #defined"
 #endif
 
-#include "sim-xcat.h"
+#include "symcat.h"
 
 #if defined(__STDC__) && defined(signed)
 /* If signed were defined to be say __signed (ie, some versions of Linux),
@@ -36,39 +36,30 @@
 /* NOTE: See end of file for #undef */
 #define unsignedN XCONCAT2(unsigned,N)
 #define signedN XCONCAT2(signed,N)
-#define MASKEDn XCONCAT2(MASKED,N)
-#define MASKn XCONCAT2(MASK,N)
-#define LSMASKEDn XCONCAT2(LSMASKED,N)
 #define LSMASKn XCONCAT2(LSMASK,N)
-#define MSMASKEDn XCONCAT2(MSMASKED,N)
 #define MSMASKn XCONCAT2(MSMASK,N)
+#define LSMASKEDn XCONCAT2(LSMASKED,N)
+#define MSMASKEDn XCONCAT2(MSMASKED,N)
 #define LSEXTRACTEDn XCONCAT2(LSEXTRACTED,N)
 #define MSEXTRACTEDn XCONCAT2(MSEXTRACTED,N)
-#define INSERTEDn XCONCAT2(INSERTED,N)
+#define LSINSERTEDn XCONCAT2(LSINSERTED,N)
+#define MSINSERTEDn XCONCAT2(MSINSERTED,N)
 #define ROTn XCONCAT2(ROT,N)
 #define ROTLn XCONCAT2(ROTL,N)
 #define ROTRn XCONCAT2(ROTR,N)
-#define SEXTn XCONCAT2(SEXT,N)
-
-/* TAGS: MASKED16 MASKED32 MASKED64 */
-
-INLINE_SIM_BITS\
-(unsignedN)
-MASKEDn (unsignedN word,
-        unsigned start,
-        unsigned stop)
-{
-  return (word & MASKn (start, stop));
-}
+#define MSSEXTn XCONCAT2(MSSEXT,N)
+#define LSSEXTn XCONCAT2(LSSEXT,N)
 
 /* TAGS: LSMASKED16 LSMASKED32 LSMASKED64 */
 
 INLINE_SIM_BITS\
 (unsignedN)
 LSMASKEDn (unsignedN word,
-          unsigned nr_bits)
+          int start,
+          int stop)
 {
-  return (word & LSMASKn (nr_bits));
+  word &= LSMASKn (start, stop);
+  return word;
 }
 
 /* TAGS: MSMASKED16 MSMASKED32 MSMASKED64 */
@@ -76,9 +67,11 @@ LSMASKEDn (unsignedN word,
 INLINE_SIM_BITS\
 (unsignedN)
 MSMASKEDn (unsignedN word,
-          unsigned nr_bits)
+          int start,
+          int stop)
 {
-  return (word & MSMASKn (nr_bits));
+  word &= MSMASKn (start, stop);
+  return word;
 }
 
 /* TAGS: LSEXTRACTED16 LSEXTRACTED32 LSEXTRACTED64 */
@@ -86,8 +79,8 @@ MSMASKEDn (unsignedN word,
 INLINE_SIM_BITS\
 (unsignedN)
 LSEXTRACTEDn (unsignedN val,
-             unsigned start,
-             unsigned stop)
+             int start,
+             int stop)
 {
   val <<= (N - 1 - start); /* drop high bits */
   val >>= (N - 1 - start) + (stop); /* drop low bits */
@@ -99,24 +92,37 @@ LSEXTRACTEDn (unsignedN val,
 INLINE_SIM_BITS\
 (unsignedN)
 MSEXTRACTEDn (unsignedN val,
-             unsigned start,
-             unsigned stop)
+             int start,
+             int stop)
 {
   val <<= (start); /* drop high bits */
   val >>= (start) + (N - 1 - stop); /* drop low bits */
   return val;
 }
 
-/* TAGS: INSERTED16 INSERTED32 INSERTED64 */
+/* TAGS: LSINSERTED16 LSINSERTED32 LSINSERTED64 */
 
 INLINE_SIM_BITS\
 (unsignedN)
-INSERTEDn (unsignedN val,
-          unsigned start,
-          unsigned stop)
+LSINSERTEDn (unsignedN val,
+            int start,
+            int stop)
 {
-  val &= LSMASKn (_MAKE_WIDTH (start, stop));
-  val <<= _LSB_SHIFT (N, stop);
+  val <<= stop;
+  val &= LSMASKn (start, stop);
+  return val;
+}
+
+/* TAGS: MSINSERTED16 MSINSERTED32 MSINSERTED64 */
+
+INLINE_SIM_BITS\
+(unsignedN)
+MSINSERTEDn (unsignedN val,
+            int start,
+            int stop)
+{
+  val <<= ((N - 1) - stop);
+  val &= MSMASKn (start, stop);
   return val;
 }
 
@@ -140,7 +146,7 @@ ROTn (unsignedN val,
 INLINE_SIM_BITS\
 (unsignedN)
 ROTLn (unsignedN val,
-       unsigned shift)
+       int shift)
 {
   unsignedN result;
   ASSERT (shift <= N);
@@ -153,7 +159,7 @@ ROTLn (unsignedN val,
 INLINE_SIM_BITS\
 (unsignedN)
 ROTRn (unsignedN val,
-       unsigned shift)
+       int shift)
 {
   unsignedN result;
   ASSERT (shift <= N);
@@ -161,35 +167,52 @@ ROTRn (unsignedN val,
   return result;
 }
 
-/* TAGS: SEXT16 SEXT32 SEXT64 */
+/* TAGS: LSSEXT16 LSSEXT32 LSSEXT64 */
+
+INLINE_SIM_BITS\
+(unsignedN)
+LSSEXTn (signedN val,
+        int sign_bit)
+{
+  int shift;
+  /* make the sign-bit most significant and then smear it back into
+     position */
+  ASSERT (sign_bit < N);
+  shift = ((N - 1) - sign_bit);
+  val <<= shift;
+  val >>= shift;
+  return val;
+}
+
+/* TAGS: MSSEXT16 MSSEXT32 MSSEXT64 */
 
 INLINE_SIM_BITS\
 (unsignedN)
-SEXTn (signedN val,
-       unsigned sign_bit)
+MSSEXTn (signedN val,
+        int sign_bit)
 {
   /* make the sign-bit most significant and then smear it back into
      position */
   ASSERT (sign_bit < N);
-  val <<= _MSB_SHIFT (N, sign_bit);
-  val >>= _MSB_SHIFT (N, sign_bit);
+  val <<= sign_bit;
+  val >>= sign_bit;
   return val;
 }
 
 
 /* NOTE: See start of file for #define */
-#undef SEXTn
+#undef LSSEXTn
+#undef MSSEXTn
 #undef ROTLn
 #undef ROTRn
 #undef ROTn
-#undef INSERTEDn
+#undef LSINSERTEDn
+#undef MSINSERTEDn
 #undef LSEXTRACTEDn
 #undef MSEXTRACTEDn
 #undef LSMASKEDn
 #undef LSMASKn
 #undef MSMASKEDn
 #undef MSMASKn
-#undef MASKn
-#undef MASKEDn
 #undef signedN
 #undef unsignedN