From a5652c21a829088da97a525fbcd9c9912b64c9dc Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 12 Feb 2016 16:08:25 +0000 Subject: [PATCH] [gdbserver, aarch64] Use linux_{set,get}_pc_{64,32}bit We can use shared functions linux_{set,get}_pc_{64,32}bit in linux-aarch64-low.c to write and read pc. gdb/gdbserver: 2016-02-12 Yao Qi * linux-aarch64-low.c (aarch64_get_pc): Call linux_get_pc_64bit or linux_get_pc_32bit. (aarch64_set_pc): Call linux_set_pc_64bit or linux_set_pc_32bit. --- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/linux-aarch64-low.c | 28 ++++------------------------ 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 8d02647..7676f71 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,11 @@ 2016-02-12 Yao Qi + * linux-aarch64-low.c (aarch64_get_pc): Call linux_get_pc_64bit + or linux_get_pc_32bit. + (aarch64_set_pc): Call linux_set_pc_64bit or linux_set_pc_32bit. + +2016-02-12 Yao Qi + * linux-arm-low.c (get_next_pcs_ops): Initialize it with arm_linux_get_next_pcs_fixup. diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index 806a762..12fe2e6 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -163,23 +163,9 @@ static CORE_ADDR aarch64_get_pc (struct regcache *regcache) { if (register_size (regcache->tdesc, 0) == 8) - { - unsigned long pc; - - collect_register_by_name (regcache, "pc", &pc); - if (debug_threads) - debug_printf ("stop pc is %08lx\n", pc); - return pc; - } + return linux_get_pc_64bit (regcache); else - { - unsigned int pc; - - collect_register_by_name (regcache, "pc", &pc); - if (debug_threads) - debug_printf ("stop pc is %04x\n", pc); - return pc; - } + return linux_get_pc_32bit (regcache); } /* Implementation of linux_target_ops method "set_pc". */ @@ -188,15 +174,9 @@ static void aarch64_set_pc (struct regcache *regcache, CORE_ADDR pc) { if (register_size (regcache->tdesc, 0) == 8) - { - unsigned long newpc = pc; - supply_register_by_name (regcache, "pc", &newpc); - } + linux_set_pc_64bit (regcache, pc); else - { - unsigned int newpc = pc; - supply_register_by_name (regcache, "pc", &newpc); - } + linux_set_pc_32bit (regcache, pc); } #define aarch64_breakpoint_len 4 -- 2.7.4