Fix ld/st tracing

diff --git a/sim/tic80/ChangeLog b/sim/tic80/ChangeLog
index 5752ea6b1595283ed1d6da29d7c6b9b50ceb2fbf..cbd7fcf67bf9ac973765aaae046aa4d91b38f9e1 100644 (file)
--- a/sim/tic80/ChangeLog
+++ b/sim/tic80/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 12 17:15:52 1997  Mike Meissner  <meissner@cygnus.com>
+
+       * insns (do_{ld,st}): Fix tracing for ld/st.
+
 Mon May 12 11:12:24 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * sim-calls.c (sim_stop_reason): Restore keep_running after a

diff --git a/sim/tic80/insns b/sim/tic80/insns
index d92400588ce5ea2f02e37d567a9c7a45ded66e19..f057f1c3ca01f86ba61a9f5f2cfd79dc462e2beb 100644 (file)
--- a/sim/tic80/insns
+++ b/sim/tic80/insns
@@ -671,7 +671,7 @@ void::function::do_ld:int Dest, unsigned32 Base, unsigned32 *rBase, int m , int
            addr = -1;
            engine_error (SD, CPU, cia, "ld - invalid sz %d", sz);
          }
-       TRACE_LD (MY_INDEX, m, S, GPR(Dest), Base, Offset);
+       TRACE_LD (MY_INDEX, GPR(Dest), m, S, Base, Offset);
 31.Dest,26.Base,21.0b0100,17.m,16.sz,14.SignedOffset::::ld i
        do_ld (_SD, Dest, rBase, &GPR(Base), m, sz, 0, vSignedOffset);
 31.Dest,26.Base,21.0b110100,15.m,14.sz,12.0,11.S,10.0,9./,4.IndOff::::ld r
@@ -932,7 +932,7 @@ void::function::do_st:int Source, unsigned32 Base, unsigned32 *rBase, int m , in
          }
        if (m)
          *rBase = addr;
-       TRACE_ST (MY_INDEX, m, S, Source, Base, Offset);
+       TRACE_ST (MY_INDEX, Source, m, S, Base, Offset);
 31.Source,26.Base,21.0b0110,17.m,16.sz,14.SignedOffset::::st i
        do_st (_SD, Source, rBase, &GPR(Base), m, sz, 0, vSignedOffset);
 31.Source,26.Base,21.0b110110,15.m,14.sz,12.0,11.S,10.0,9./,4.IndOff::::st r