* Makefile.in (SIM_OBJS): Add dsp.o.

[deliverable/binutils-gdb.git] / sim / mips / interp.c

diff --git a/sim/mips/interp.c b/sim/mips/interp.c
index 8cc6318aaef1a9f65accf6f986889c01ee1d5b63..043d76d10d3db8b73aeec8c28a1ab25dc0f8ef4b 100644 (file)
--- a/sim/mips/interp.c
+++ b/sim/mips/interp.c
@@ -61,8 +61,8 @@ code on the hardware.
 #include "getopt.h"
 #include "libiberty.h"
 #include "bfd.h"
-#include "callback.h"   /* GDB simulator callback interface */
-#include "remote-sim.h" /* GDB simulator interface */
+#include "gdb/callback.h"   /* GDB simulator callback interface */
+#include "gdb/remote-sim.h" /* GDB simulator interface */
 
 #include "sysdep.h"
 
@@ -326,7 +326,7 @@ SIM_DESC
 sim_open (kind, cb, abfd, argv)
      SIM_OPEN_KIND kind;
      host_callback *cb;
-     struct _bfd *abfd;
+     struct bfd *abfd;
      char **argv;
 {
   SIM_DESC sd = sim_state_alloc (kind, cb);
@@ -971,7 +971,7 @@ sim_fetch_register (sd,rn,memory,length)
 SIM_RC
 sim_create_inferior (sd, abfd, argv,env)
      SIM_DESC sd;
-     struct _bfd *abfd;
+     struct bfd *abfd;
      char **argv;
      char **env;
 {
@@ -1077,7 +1077,10 @@ sim_firmware_command (SIM_DESC sd, char *arg)
          }
       }
     else
-      address_present = 0;
+      {
+       address_present = 0;
+       address = -1; /* Dummy value.  */
+      }
   }
 
   if (! strncmp (arg, "idt", 3))
@@ -2099,7 +2102,7 @@ decode_coproc (SIM_DESC sd,
              case 8:
                /* 8 = BadVAddr            R4000   VR4100  VR4300 */
                if (code == 0x00)
-                 GPR[rt] = COP0_BADVADDR;
+                 GPR[rt] = (signed_word) (signed_address) COP0_BADVADDR;
                else
                  COP0_BADVADDR = GPR[rt];
                break;