* gx prototype: simulator I/O bug fix

1998-12-05  Frank Ch. Eigler  <fche@elastic.org>
	* gx-translate.c (m32r_emit_short_insn): Correct ABI result
	handling for TRAP insn.

diff --git a/sim/m32r-gx/ChangeLog b/sim/m32r-gx/ChangeLog
index ad03dac37c5509e31303db400407968b3b6a6fdb..a04bd6fdcb53e04d26ef7bd554e1022a188c3891 100644 (file)
--- a/sim/m32r-gx/ChangeLog
+++ b/sim/m32r-gx/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-05  Frank Ch. Eigler  <fche@elastic.org>
+
+       * gx-translate.c (m32r_emit_short_insn): Correct ABI result
+       handling for TRAP insn.
+
 1998-12-01  Frank Ch. Eigler  <fche@elastic.org>
 
        * Makefile.in (SIM_OBJS): Don't build sim-core.o.  

diff --git a/sim/m32r-gx/gx-translate.c b/sim/m32r-gx/gx-translate.c
index 461417c5da36c5ef841eccce83ddcb8dcc3e7a19..aa0a0f1f05badaa5a71b7ffa52d825520387871c 100644 (file)
--- a/sim/m32r-gx/gx-translate.c
+++ b/sim/m32r-gx/gx-translate.c
@@ -433,7 +433,9 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
   sim_gx_compiled_block* block = optimized ? gx->optimized_block : gx->learning_block;
   FILE* f  = block->source_file;
 
-  ASSERT(block->source_file != NULL);
+  ASSERT(f != NULL);
+
+  /* fprintf(f, "      printf(\"0x%06x\\n\");\n", pc); */
 
   if(op1 == 0x8 && op2 == 0x4 && r1 == 0)
     {
@@ -834,6 +836,8 @@ m32r_emit_short_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
 
   ASSERT(f != NULL);
 
+  /* fprintf(f, "      printf(\"0x%06x\\n\");\n", pc); */
+
   if(0)
     ; /* place holder */
   else if(op1 == 0x0 && op2 == 0x0)
@@ -1017,8 +1021,8 @@ m32r_emit_short_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
          fprintf(f, "          tgx_syscall_data d = { 0x%08x, gr0, gr1, gr2, gr3 };\n", (unsigned) pc);
          fprintf(f, "          (*(callbacks->syscall))(info, &d);\n");
          fprintf(f, "          gr2 = d.errcode;\n");
-         fprintf(f, "          gr1 = d.result;\n");
-         fprintf(f, "          gr0 = d.result2;\n");
+         fprintf(f, "          gr0 = d.result;\n");
+         fprintf(f, "          gr1 = d.result2;\n");
          fprintf(f, "        }\n");
        }
       else if (r2 == 1) /* gdb breakpoint */