Get and set PC correctly on aarch64 in multi-arch
gdb/gdbserver: 2015-08-04 Yao Qi <yao.qi@linaro.org> * linux-aarch64-low.c (aarch64_get_pc): Get PC register on both aarch64 and aarch32. (aarch64_set_pc): Likewise.
This commit is contained in:
parent
3b53ae99fb
commit
8a7e4587c4
|
@ -1,3 +1,9 @@
|
||||||
|
2015-08-04 Yao Qi <yao.qi@linaro.org>
|
||||||
|
|
||||||
|
* linux-aarch64-low.c (aarch64_get_pc): Get PC register on
|
||||||
|
both aarch64 and aarch32.
|
||||||
|
(aarch64_set_pc): Likewise.
|
||||||
|
|
||||||
2015-08-04 Yao Qi <yao.qi@linaro.org>
|
2015-08-04 Yao Qi <yao.qi@linaro.org>
|
||||||
|
|
||||||
* configure.srv (case aarch64*-*-linux*): Append arm-with-neon.o
|
* configure.srv (case aarch64*-*-linux*): Append arm-with-neon.o
|
||||||
|
|
|
@ -155,12 +155,24 @@ extern int debug_threads;
|
||||||
static CORE_ADDR
|
static CORE_ADDR
|
||||||
aarch64_get_pc (struct regcache *regcache)
|
aarch64_get_pc (struct regcache *regcache)
|
||||||
{
|
{
|
||||||
unsigned long pc;
|
if (register_size (regcache->tdesc, 0) == 8)
|
||||||
|
{
|
||||||
|
unsigned long pc;
|
||||||
|
|
||||||
collect_register_by_name (regcache, "pc", &pc);
|
collect_register_by_name (regcache, "pc", &pc);
|
||||||
if (debug_threads)
|
if (debug_threads)
|
||||||
debug_printf ("stop pc is %08lx\n", pc);
|
debug_printf ("stop pc is %08lx\n", pc);
|
||||||
return pc;
|
return pc;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unsigned int pc;
|
||||||
|
|
||||||
|
collect_register_by_name (regcache, "pc", &pc);
|
||||||
|
if (debug_threads)
|
||||||
|
debug_printf ("stop pc is %04x\n", pc);
|
||||||
|
return pc;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Implementation of linux_target_ops method "set_pc". */
|
/* Implementation of linux_target_ops method "set_pc". */
|
||||||
|
@ -168,8 +180,16 @@ aarch64_get_pc (struct regcache *regcache)
|
||||||
static void
|
static void
|
||||||
aarch64_set_pc (struct regcache *regcache, CORE_ADDR pc)
|
aarch64_set_pc (struct regcache *regcache, CORE_ADDR pc)
|
||||||
{
|
{
|
||||||
unsigned long newpc = pc;
|
if (register_size (regcache->tdesc, 0) == 8)
|
||||||
supply_register_by_name (regcache, "pc", &newpc);
|
{
|
||||||
|
unsigned long newpc = pc;
|
||||||
|
supply_register_by_name (regcache, "pc", &newpc);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unsigned int newpc = pc;
|
||||||
|
supply_register_by_name (regcache, "pc", &newpc);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#define aarch64_breakpoint_len 4
|
#define aarch64_breakpoint_len 4
|
||||||
|
|
Loading…
Reference in New Issue