diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2005-11-13 18:04:14 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@debian.org> | 2005-11-13 18:04:14 +0000 |
| commit | c2d9ef1b3d1564443ed8c851d268ce22e4727b67 (patch) | |
| tree | 1b737f1e9bac4baccded8166cb99bbaf4e784637 | |
| parent | f8e2347a54b72aa4b4f3dcfaafde3255804569f9 (diff) | |
| download | gdb-c2d9ef1b3d1564443ed8c851d268ce22e4727b67.tar.gz | |
* arm-linux-tdep.c (eabi_linux_arm_le_breakpoint)
(eabi_linux_arm_be_breakpoint): New variables.
(arm_linux_init_abi): Use them.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/arm-linux-tdep.c | 23 |
2 files changed, 27 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b78569fc95f..85e9fb1ac41 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2005-11-13 Daniel Jacobowitz <dan@codesourcery.com> + + * arm-linux-tdep.c (eabi_linux_arm_le_breakpoint) + (eabi_linux_arm_be_breakpoint): New variables. + (arm_linux_init_abi): Use them. + 2005-11-11 Michael Snyder <msnyder@redhat.com> * inftarg.c (child_wait): Delete unused local variable. diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index e6ce06f56e9..98786f63764 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -45,6 +45,19 @@ static const char arm_linux_arm_le_breakpoint[] = { 0x01, 0x00, 0x9f, 0xef }; static const char arm_linux_arm_be_breakpoint[] = { 0xef, 0x9f, 0x00, 0x01 }; +/* However, the EABI syscall interface (new in Nov. 2005) does not look at + the operand of the swi if old-ABI compatibility is disabled. Therefore, + use an undefined instruction instead. This is supported as of kernel + version 2.5.70 (May 2003), so should be a safe assumption for EABI + binaries. */ + +static const char eabi_linux_arm_le_breakpoint[] = { 0xf0, 0x01, 0xf0, 0xe7 }; + +static const char eabi_linux_arm_be_breakpoint[] = { 0xe7, 0xf0, 0x01, 0xf0 }; + +/* All the kernels which support Thumb support using a specific undefined + instruction for the Thumb breakpoint. */ + static const char arm_linux_thumb_be_breakpoint[] = {0xde, 0x01}; static const char arm_linux_thumb_le_breakpoint[] = {0x01, 0xde}; @@ -329,12 +342,18 @@ arm_linux_init_abi (struct gdbarch_info info, tdep->lowest_pc = 0x8000; if (info.byte_order == BFD_ENDIAN_BIG) { - tdep->arm_breakpoint = arm_linux_arm_be_breakpoint; + if (tdep->arm_abi == ARM_ABI_AAPCS) + tdep->arm_breakpoint = eabi_linux_arm_be_breakpoint; + else + tdep->arm_breakpoint = arm_linux_arm_be_breakpoint; tdep->thumb_breakpoint = arm_linux_thumb_be_breakpoint; } else { - tdep->arm_breakpoint = arm_linux_arm_le_breakpoint; + if (tdep->arm_abi == ARM_ABI_AAPCS) + tdep->arm_breakpoint = eabi_linux_arm_le_breakpoint; + else + tdep->arm_breakpoint = arm_linux_arm_le_breakpoint; tdep->thumb_breakpoint = arm_linux_thumb_le_breakpoint; } tdep->arm_breakpoint_size = sizeof (arm_linux_arm_le_breakpoint); |