X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fsim-bits.c;h=82e82814bd64bc2dc180be9c2a07c5508d6e99b6;hb=1ce22eebea40573551c2db2e7c83951154d14c81;hp=1f0a8e5f25ee233028428408e39b744f0e64c68e;hpb=f2de7dfd8cf1ffd6edc7ed650e709c7fa4488da1;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/common/sim-bits.c b/sim/common/sim-bits.c
index 1f0a8e5f25..82e82814bd 100644
--- a/sim/common/sim-bits.c
+++ b/sim/common/sim-bits.c
@@ -1,94 +1,260 @@
-/*  This file is part of the program psim.
+/* The common simulator framework for GDB, the GNU Debugger.
 
-    Copyright (C) 1994-1997, Andrew Cagney <cagney@highland.com.au>
+   Copyright 2002-2020 Free Software Foundation, Inc.
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+   Contributed by Andrew Cagney and Red Hat.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
-    */
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #ifndef _SIM_BITS_C_
 #define _SIM_BITS_C_
 
 #include "sim-basics.h"
+#include "sim-assert.h"
+#include "sim-io.h"
 
 
 INLINE_SIM_BITS\
 (unsigned_word)
-MASKED(unsigned_word val,
-       unsigned start,
-       unsigned stop)
+LSMASKED (unsigned_word val,
+	  int start,
+	  int stop)
 {
-  return ((val) & MASK(start, stop));
+  /* NOTE - start, stop can wrap */
+  val &= LSMASK (start, stop);
+  return val;
 }
 
 
-
 INLINE_SIM_BITS\
 (unsigned_word)
-LSMASKED(unsigned_word val,
-	 unsigned nr_bits)
+MSMASKED (unsigned_word val,
+	  int start,
+	  int stop)
 {
-  return MASKED(val,
-		WITH_TARGET_WORD_BITSIZE - nr_bits,
-		WITH_TARGET_WORD_BITSIZE - 1);
+  /* NOTE - start, stop can wrap */
+  val &= MSMASK (start, stop);
+  return val;
 }
 
 
+INLINE_SIM_BITS\
+(unsigned_word)
+LSEXTRACTED (unsigned_word val,
+	     int start,
+	     int stop)
+{
+  ASSERT (start >= stop);
+#if (WITH_TARGET_WORD_BITSIZE == 64)
+  return LSEXTRACTED64 (val, start, stop);
+#endif
+#if (WITH_TARGET_WORD_BITSIZE == 32)
+  if (stop >= 32)
+    return 0;
+  else
+    {
+      if (start < 32)
+	val &= LSMASK (start, 0);
+      val >>= stop;
+      return val;
+    }
+#endif
+#if (WITH_TARGET_WORD_BITSIZE == 16)
+  if (stop >= 16)
+    return 0;
+  else
+    {
+      if (start < 16)
+	val &= LSMASK (start, 0);
+      val >>= stop;
+      return val;
+    }
+#endif
+}
+
 
 INLINE_SIM_BITS\
 (unsigned_word)
-EXTRACTED(unsigned_word val,
-	  unsigned start,
-	  unsigned stop)
+MSEXTRACTED (unsigned_word val,
+	     int start,
+	     int stop)
 {
-  ASSERT(start <= stop);
+  ASSERT (start <= stop);
 #if (WITH_TARGET_WORD_BITSIZE == 64)
-  return EXTRACTED64(val, start, stop);
+  return MSEXTRACTED64 (val, start, stop);
 #endif
 #if (WITH_TARGET_WORD_BITSIZE == 32)
   if (stop < 32)
     return 0;
   else
-    return ((val >> (63 - stop))
-	    & MASK(start+(63-stop), 63));
+    {
+      if (start >= 32)
+	val &= MSMASK (start, 64 - 1);
+      val >>= (64 - stop - 1);
+      return val;
+    }
+#endif
+#if (WITH_TARGET_WORD_BITSIZE == 16)
+  if (stop < 16)
+    return 0;
+  else
+    {
+      if (start >= 16)
+	val &= MSMASK (start, 64 - 1);
+      val >>= (64 - stop - 1);
+      return val;
+    }
 #endif
 }
 
 
 INLINE_SIM_BITS\
 (unsigned_word)
-INSERTED(unsigned_word val,
-	 unsigned start,
-	 unsigned stop)
+LSINSERTED (unsigned_word val,
+	    int start,
+	    int stop)
+{
+  ASSERT (start >= stop);
+#if (WITH_TARGET_WORD_BITSIZE == 64)
+  return LSINSERTED64 (val, start, stop);
+#endif
+#if (WITH_TARGET_WORD_BITSIZE == 32)
+  /* Bit numbers are 63..0, even for 32 bit targets.
+     On 32 bit targets we ignore 63..32  */
+  if (stop >= 32)
+    return 0;
+  else
+    {
+      val <<= stop;
+      val &= LSMASK (start, stop);
+      return val;
+    }
+#endif
+#if (WITH_TARGET_WORD_BITSIZE == 16)
+  /* Bit numbers are 63..0, even for 16 bit targets.
+     On 16 bit targets we ignore 63..16  */
+  if (stop >= 16)
+    return 0;
+  else
+    {
+      val <<= stop;
+      val &= LSMASK (start, stop);
+      return val;
+    }
+#endif
+}
+
+INLINE_SIM_BITS\
+(unsigned_word)
+MSINSERTED (unsigned_word val,
+	    int start,
+	    int stop)
 {
-  ASSERT(start <= stop);
+  ASSERT (start <= stop);
 #if (WITH_TARGET_WORD_BITSIZE == 64)
-  return INSERTED64(val, start, stop);
+  return MSINSERTED64 (val, start, stop);
 #endif
 #if (WITH_TARGET_WORD_BITSIZE == 32)
+  /* Bit numbers are 0..63, even for 32 bit targets.
+     On 32 bit targets we ignore 0..31.  */
   if (stop < 32)
     return 0;
   else
-    return ((val & MASK(start+(63-stop), 63))
-	    << (63 - stop));
+    {
+      val <<= ((64 - 1) - stop);
+      val &= MSMASK (start, stop);
+      return val;
+    }
+#endif
+#if (WITH_TARGET_WORD_BITSIZE == 16)
+  /* Bit numbers are 0..63, even for 16 bit targets.
+     On 16 bit targets we ignore 0..47.  */
+  if (stop < 32 + 16)
+    return 0;
+  else
+    {
+      val <<= ((64 - 1) - stop);
+      val &= MSMASK (start, stop);
+      return val;
+    }
 #endif
 }
 
 
 
+INLINE_SIM_BITS\
+(unsigned_word)
+LSSEXT (signed_word val,
+	int sign_bit)
+{
+  ASSERT (sign_bit < 64);
+#if (WITH_TARGET_WORD_BITSIZE == 64)
+  return LSSEXT64 (val, sign_bit);
+#endif
+#if (WITH_TARGET_WORD_BITSIZE == 32)
+  if (sign_bit >= 32)
+    return val;
+  else {
+    val = LSSEXT32 (val, sign_bit);
+    return val;
+  }
+#endif
+#if (WITH_TARGET_WORD_BITSIZE == 16)
+  if (sign_bit >= 16)
+    return val;
+  else {
+    val = LSSEXT16 (val, sign_bit);
+    return val;
+  }
+#endif
+}
+
+INLINE_SIM_BITS\
+(unsigned_word)
+MSSEXT (signed_word val,
+	int sign_bit)
+{
+  ASSERT (sign_bit < 64);
+#if (WITH_TARGET_WORD_BITSIZE == 64)
+  return MSSEXT64 (val, sign_bit);
+#endif
+#if (WITH_TARGET_WORD_BITSIZE == 32)
+  if (sign_bit < 32)
+    return val;
+  else {
+    val = MSSEXT32 (val, sign_bit - 32);
+    return val;
+  }
+#endif
+#if (WITH_TARGET_WORD_BITSIZE == 16)
+  if (sign_bit < 32 + 16)
+    return val;
+  else {
+    val = MSSEXT16 (val, sign_bit - 32 - 16);
+    return val;
+  }
+#endif
+}
+
+
+
+#define N 8
+#include "sim-n-bits.h"
+#undef N
 
 #define N 16
 #include "sim-n-bits.h"