sim: msp430: set initial PC to ELF entry if available

If we want to run a simple ELF, the reset vector isn't set up, so starting
at address 0 doesn't make sense.  Use the ELF's entry point instead.

diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 0a3da7dc491a7189d2f1d2515d20ac0b7a4694f0..484a5d2e498a92e2d4c31302e3e585a63fec9e7c 100644 (file)
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-10  Mike Frysinger  <vapier@gentoo.org>
+
+       * msp430-sim.c (sim_create_inferior): Set new_pc to the result of
+       bfd_get_start_address when abfd is not NULL and new_pc is zero.
+
 2014-03-10  Mike Frysinger  <vapier@gentoo.org>
 
        * msp430-sim (maybe_perform_syscall): Change %d to %ld.

diff --git a/sim/msp430/msp430-sim.c b/sim/msp430/msp430-sim.c
index c3fa4a9621bc22a5408240d4191e03ec0c63da84..2a648f58468359228e4ca76ba04a98b165034051 100644 (file)
--- a/sim/msp430/msp430-sim.c
+++ b/sim/msp430/msp430-sim.c
@@ -249,9 +249,14 @@ sim_create_inferior (SIM_DESC sd,
   int c;
   int new_pc;
 
+  /* Set the PC to the default reset vector if available.  */
   c = sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, resetv, 0xfffe, 2);
-
   new_pc = resetv[0] + 256 * resetv[1];
+
+  /* If the reset vector isn't initialized, then use the ELF entry.  */
+  if (abfd != NULL && !new_pc)
+    new_pc = bfd_get_start_address (abfd);
+
   sim_pc_set (MSP430_CPU (sd), new_pc);
   msp430_pc_store (MSP430_CPU (sd), new_pc);