Merge branch 'binutils' into tmp

[pf3gnuchains/pf3gnuchains4x.git] / sim / rx / reg.c

diff --git a/sim/rx/reg.c b/sim/rx/reg.c
index bfb77a3..6b06322 100644 (file)
--- a/sim/rx/reg.c
+++ b/sim/rx/reg.c
@@ -1,6 +1,6 @@
 /* reg.c --- register set model for RX simulator.
 
-   Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2012 Free Software Foundation, Inc.
    Contributed by Red Hat, Inc.
 
    This file is part of the GNU simulators.
@@ -19,6 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -67,6 +68,11 @@ init_regs (void)
 {
   memset (&regs, 0, sizeof (regs));
   memset (&oldregs, 0, sizeof (oldregs));
+
+#ifdef CYCLE_ACCURATE
+  regs.rt = -1;
+  oldregs.rt = -1;
+#endif
 }
 
 static unsigned int
@@ -377,7 +383,7 @@ set_flags (int mask, int newbits)
 void
 set_oszc (long long value, int b, int c)
 {
-  int mask = b2mask[b];
+  unsigned int mask = b2mask[b];
   int f = 0;
 
   if (c)
@@ -394,7 +400,7 @@ set_oszc (long long value, int b, int c)
 void
 set_szc (long long value, int b, int c)
 {
-  int mask = b2mask[b];
+  unsigned int mask = b2mask[b];
   int f = 0;
 
   if (c)
@@ -409,7 +415,7 @@ set_szc (long long value, int b, int c)
 void
 set_osz (long long value, int b)
 {
-  int mask = b2mask[b];
+  unsigned int mask = b2mask[b];
   int f = 0;
 
   if ((value & mask) == 0)
@@ -424,7 +430,7 @@ set_osz (long long value, int b)
 void
 set_sz (long long value, int b)
 {
-  int mask = b2mask[b];
+  unsigned int mask = b2mask[b];
   int f = 0;
 
   if ((value & mask) == 0)