diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/arm-wince-tdep.c | 37 |
2 files changed, 43 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 92534d9..609fd72 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2009-07-05 Pedro Alves <pedro@codesourcery.com> + + * arm-wince-tdep.c (arm_wince_skip_main_prologue): New. + (arm_wince_init_abi): Register it as gdbarch_skip_main_prologue + callback. + 2009-06-29 Tristan Gingold <gingold@adacore.com> * i386-darwin-tdep.c (amd64_darwin_thread_state_reg_offset) diff --git a/gdb/arm-wince-tdep.c b/gdb/arm-wince-tdep.c index 46d8770..bd676e3 100644 --- a/gdb/arm-wince-tdep.c +++ b/gdb/arm-wince-tdep.c @@ -77,6 +77,40 @@ arm_pe_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) return arm_skip_stub (frame, pc); } +/* GCC emits a call to __gccmain in the prologue of main. + + The function below examines the code pointed at by PC and checks to + see if it corresponds to a call to __gccmain. If so, it returns + the address of the instruction following that call. Otherwise, it + simply returns PC. */ + +CORE_ADDR +arm_wince_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) +{ + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + ULONGEST this_instr; + + this_instr = read_memory_unsigned_integer (pc, 4, byte_order); + + /* bl offset <__gccmain> */ + if ((this_instr & 0xfff00000) == 0xeb000000) + { +#define sign_extend(V, N) \ + (((long) (V) ^ (1L << ((N) - 1))) - (1L << ((N) - 1))) + + long offset = sign_extend (this_instr & 0x000fffff, 23) << 2; + CORE_ADDR call_dest = (pc + 8 + offset) & 0xffffffffU; + struct minimal_symbol *s = lookup_minimal_symbol_by_pc (call_dest); + + if (s != NULL + && SYMBOL_LINKAGE_NAME (s) != NULL + && strcmp (SYMBOL_LINKAGE_NAME (s), "__gccmain") == 0) + pc += 4; + } + + return pc; +} + static void arm_wince_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { @@ -102,6 +136,9 @@ arm_wince_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* Single stepping. */ set_gdbarch_software_single_step (gdbarch, arm_software_single_step); + + /* Skip call to __gccmain that gcc places in main. */ + set_gdbarch_skip_main_prologue (gdbarch, arm_wince_skip_main_prologue); } static enum gdb_osabi |