Update sim_fetch_register, sim_store_register for sh and mn10300.

Fix compile warnings for sh built on 64-bit hosts.

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index e8c845d23d9ecafd8a2ccf72a8b7d5819c7d4893..8b9fa1f16e58992fd99c67f78ba3a8ba0f557647 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-16  Kevin Buettner  <kevinb@redhat.com>
+
+       * interp.c (sim_fetch_register): Return length, not -1.
+
 2012-01-02  Joel Brobecker  <brobecker@adacore.com>
 
        * sim-main.h: Reformat copyright header.

diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c
index e06ae59079352669f7e537ffb0c1fe87ff28b448..9c458d658439ab28dcbaff56c3e73f4e7a3087f5 100644 (file)
--- a/sim/mn10300/interp.c
+++ b/sim/mn10300/interp.c
@@ -383,7 +383,7 @@ sim_fetch_register (SIM_DESC sd,
                    int length)
 {
   put_word (memory, State.regs[rn]);
-  return -1;
+  return length;
 }
  
 int

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index a5f530ca0a83b413c092a67a15f06ed8b19ecceb..f663c00813b5689d9d62ca9aaeeda469a3a7ef4d 100644 (file)
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-16  Kevin Buettner  <kevinb@redhat.com>
+
+       * interp.c (MA): Adjust cast to avoid warning on 64-bit hosts.
+
+       * interp.c (sim_store_register, sim_fetch_register): Return
+       length, not -1.
+
 2011-12-03  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4: New file.

diff --git a/sim/sh/interp.c b/sim/sh/interp.c
index 20239def614b53b879765b022490298f976e8593..e9313c76cbd5a2912ae3554c904a7d51658fa9b0 100644 (file)
--- a/sim/sh/interp.c
+++ b/sim/sh/interp.c
@@ -862,7 +862,7 @@ do { \
 #else
 
 #define MA(n) \
-  do { memstalls += ((((int) PC & 3) != 0) ? (n) : ((n) - 1)); } while (0)
+  do { memstalls += ((((long) PC & 3) != 0) ? (n) : ((n) - 1)); } while (0)
 
 #define L(x)   thislock = x;
 #define TL(x)  if ((x) == prevlock) stalls++;
@@ -2356,7 +2356,7 @@ sim_store_register (sd, rn, memory, length)
     default:
       return 0;
     }
-  return -1;
+  return length;
 }
 
 int
@@ -2531,7 +2531,7 @@ sim_fetch_register (sd, rn, memory, length)
       return 0;
     }
   * (int *) memory = swap (val);
-  return -1;
+  return length;
 }
 
 int