2002-06-18 Chris Demetriou <cgd@broadcom.com>

        * mdmx.c (SD_): Delete.
        (Unpredictable): Re-define, for now, to directly invoke
        unpredictable_action().
        (mdmx_acc_op): Fix error in .ob immediate handling.

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 56e5de7c8f8e3b2c466836b3b42d5ea4485537f4..9b757823155218ec6643b0ac08c56ef375d050c8 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-18  Chris Demetriou  <cgd@broadcom.com>
+
+       * mdmx.c (SD_): Delete.
+       (Unpredictable): Re-define, for now, to directly invoke
+       unpredictable_action().
+       (mdmx_acc_op): Fix error in .ob immediate handling.
+
 2002-06-18  Andrew Cagney  <cagney@redhat.com>
 
        * interp.c (sim_firmware_command): Initialize `address'.

diff --git a/sim/mips/mdmx.c b/sim/mips/mdmx.c
index 96abe1ddc123b42812ee00b70be31a4db2c387ea..4955e821246831125f9f7a09b73aeb702d906f8a 100644 (file)
--- a/sim/mips/mdmx.c
+++ b/sim/mips/mdmx.c
@@ -25,7 +25,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /* Within mdmx.c we refer to the sim_cpu directly. */
 #define CPU cpu
 #define SD  (CPU_STATE(CPU))
-#define        SD_ cpu, cia, -1
+
+/* XXX FIXME: temporary hack while the impact of making unpredictable()
+   a "normal" (non-igen) function is evaluated.  */
+#undef Unpredictable
+#define Unpredictable() unpredictable_action (cpu, cia)
 
 /* MDMX Representations
 
@@ -874,7 +878,7 @@ mdmx_acc_op(sim_cpu *cpu,
          ob_vector_acc(ACC.ob, op1, ValueFPR(vt, fmt_mdmx), ob_acc[op]);
          break;
        case sel_imm:
-         ob_map_acc(ACC.ob, op1, op2, ob_acc[op]);
+         ob_map_acc(ACC.ob, op1, vt, ob_acc[op]);
          break;
        }
       break;