* sim/mips/gencode.c (build_instruction): Don't need to subtract 4 for

JALR, just 2.

sim/mips/ChangeLog

@@ -1,3 +1,8 @@
+Tue Sep 16 15:52:04 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* gencode.c (build_instruction): Don't need to subtract 4 for
+	JALR, just 2.
+
 Tue Sep 16 11:32:28 1997  Gavin Koch  <gavin@cygnus.com>
 
 	* interp.c: Correct some HASFPU problems.

sim/mips/gencode.c

@@ -2532,7 +2532,8 @@ build_instruction (doisa, features, mips16, insn)
      printf("   op1 = WORD64LO(op1);\n");
      printf("   /* NOTE: The jump occurs AFTER the next instruction has been executed */\n");
      printf("   DSPC = op1;\n");
-     if (insn->flags & LINK)
+     if ((insn->flags & LINK)
+         && ! (insn->flags & REG))
        printf("   JALDELAYSLOT();\n");
      else
        printf("   DELAYSLOT();\n");