diff options
| author | Antoine Tremblay <antoine.tremblay@ericsson.com> | 2015-12-18 11:33:59 -0500 |
|---|---|---|
| committer | Antoine Tremblay <antoine.tremblay@ericsson.com> | 2015-12-18 11:39:02 -0500 |
| commit | d0e59a68884ad3a346ff0f6f763636c7245e4cb3 (patch) | |
| tree | fff48f87fd5a2933f0acb4af7d80274ac4e06cc3 /gdb/regcache.c | |
| parent | cba7e83fda349cbf423fab274f5b8677d8148947 (diff) | |
| download | gdb-d0e59a68884ad3a346ff0f6f763636c7245e4cb3.zip gdb-d0e59a68884ad3a346ff0f6f763636c7245e4cb3.tar.gz gdb-d0e59a68884ad3a346ff0f6f763636c7245e4cb3.tar.bz2 | |
Refactor arm_software_single_step to use regcache
This patch is in preparation for software single step support on ARM in
GDBServer. It refactors arm_*_software_single_step and sub-functions to
use regcache instead of frame to access registers so that the code can be
shared more easily between GDB and GDBServer.
Note also that since the intention is at some point to get rid of frame
completely in that function, memory reads have also been replaced by
read_memory_unsigned_integer rather than get_frame_memory_unsigned.
No regressions, tested on ubuntu 14.04 ARMv7 and x86.
With gdbserver-{native,extended} / { -marm -mthumb }
gdb/ChangeLog:
* arm-linux-tdep.c (arm_linux_sigreturn_next_pc_offset): New function.
(arm_linux_sigreturn_next_pc): Likewise.
(arm_linux_syscall_next_pc): Use regcache instead of frame.
(arm_linux_software_single_step): Likewise.
* arm-tdep.c (arm_is_thumb): New function.
(shifted_reg_va): Use regcache instead of frame.
(thumb_get_next_pc_raw): Likewise.
(arm_get_next_pc_raw): Likewise.
(arm_get_next_pc): Likewise.
(thumb_deal_with_atomic_sequence_raw): Likewise.
(arm_deal_with_atomic_sequence_raw): Likewise.
(arm_deal_with_atomic_sequence): Likewise.
(arm_software_single_step): Likewise.
* arm-tdep.h (struct gdbarch_tdep): Use regcache for syscall_next_pc.
(arm_get_next_pc): Use regcache.
(arm_deal_with_atomic_sequence): Likewise.
(arm_is_thumb): New declaration.
* regcache.c (regcache_raw_get_unsigned): New function.
* regcache.h (regcache_raw_get_unsigned): New function declaration.
Diffstat (limited to 'gdb/regcache.c')
| -rw-r--r-- | gdb/regcache.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gdb/regcache.c b/gdb/regcache.c index 5ee31fb..7fb9d18 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -715,6 +715,21 @@ regcache_raw_read_unsigned (struct regcache *regcache, int regnum, return status; } +/* Return the register's value or throw if it's not available. */ + +ULONGEST +regcache_raw_get_unsigned (struct regcache *regcache, int regnum) +{ + ULONGEST value; + enum register_status status; + + status = regcache_raw_read_unsigned (regcache, regnum, &value); + if (status == REG_UNAVAILABLE) + throw_error (NOT_AVAILABLE_ERROR, + _("Register %d is not available"), regnum); + return value; +} + void regcache_raw_write_signed (struct regcache *regcache, int regnum, LONGEST val) { |