Correct r5900 sanitization.

diff --git a/sim/mips/interp.c b/sim/mips/interp.c
index b605dbca1d59233c1b5aebe576ce49c8bc1b5666..835dbdb0ed79f05d6d6dd420f90c0e08a4b33ab9 100644 (file)
--- a/sim/mips/interp.c
+++ b/sim/mips/interp.c
@@ -3735,10 +3735,12 @@ sim_engine_run (sd, next_cpu_nr, siggnal)
        HIACCESS--;
       if (LOACCESS > 0)
        LOACCESS--;
+      /* start-sanitize-r5900 */
       if (HI1ACCESS > 0)
        HI1ACCESS--;
       if (LO1ACCESS > 0)
        LO1ACCESS--;
+      /* end-sanitize-r5900 */
 #endif /* WARN_LOHI */
 
       /* For certain MIPS architectures, GPR[0] is hardwired to zero. We

diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index b096069def77fa3b184050253fdd8b98860e3d50..7809714a0852761068ed26a2bc91fc1cd1775565 100644 (file)
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -471,7 +471,7 @@ struct _sim_cpu {
   if ((HIACCESS != 0) || (LOACCESS != 0)) \
     sim_io_eprintf(sd,"%s over-writing HI and LO registers values (PC = 0x%s HLPC = 0x%s)\n",(s),pr_addr(PC),pr_addr(HLPC));\
 }
-  /* end-sanitize-r5900 */
+  /* start-sanitize-r5900 */
 #undef CHECKHILO
 #define CHECKHILO(s) {\
   if ((HIACCESS != 0) || (LOACCESS != 0) || (HI1ACCESS != 0) || (LO1ACCESS != 0))\