mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/loongarch: Fix GDB get the wrong pc

Browse Source 
GDB LoongArch add a register orig_a0, see the base64.xml [1].
We should add the orig_a0 to match the upstream GDB.

[1]: https://github.com/bminor/binutils-gdb/blob/master/gdb/features/loongarch/base64.xml

Signed-off-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220805033523.1416837-2-gaosong@loongson.cn>
This commit is contained in:
Song Gao 2022-08-05 11:35:19 +08:00 committed by Richard Henderson
parent 4cbadc40b9
commit 1fe8ac3511
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdb-xml/loongarch-base64.xml
View File

@ -39,6 +39,7 @@
<reg name="r29" bitsize="64" type="uint64" group="general"/> <reg name="r29" bitsize="64" type="uint64" group="general"/>
<reg name="r30" bitsize="64" type="uint64" group="general"/> <reg name="r30" bitsize="64" type="uint64" group="general"/>
<reg name="r31" bitsize="64" type="uint64" group="general"/> <reg name="r31" bitsize="64" type="uint64" group="general"/>
<reg name="orig_a0" bitsize="64" type="uint64" group="general"/>
<reg name="pc" bitsize="64" type="code_ptr" group="general"/> <reg name="pc" bitsize="64" type="code_ptr" group="general"/>
<reg name="badvaddr" bitsize="64" type="code_ptr" group="general"/> <reg name="badvaddr" bitsize="64" type="code_ptr" group="general"/>
</feature> </feature>

2
target/loongarch/cpu.c
View File

@ -683,7 +683,7 @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data)
cc->gdb_read_register = loongarch_cpu_gdb_read_register; cc->gdb_read_register = loongarch_cpu_gdb_read_register;
cc->gdb_write_register = loongarch_cpu_gdb_write_register; cc->gdb_write_register = loongarch_cpu_gdb_write_register;
cc->disas_set_info = loongarch_cpu_disas_set_info; cc->disas_set_info = loongarch_cpu_disas_set_info;
cc->gdb_num_core_regs = 34; cc->gdb_num_core_regs = 35;
cc->gdb_core_xml_file = "loongarch-base64.xml"; cc->gdb_core_xml_file = "loongarch-base64.xml";
cc->gdb_stop_before_watchpoint = true; cc->gdb_stop_before_watchpoint = true;

7
target/loongarch/gdbstub.c
View File

@ -19,8 +19,11 @@ int loongarch_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
if (0 <= n && n < 32) { if (0 <= n && n < 32) {
return gdb_get_regl(mem_buf, env->gpr[n]); return gdb_get_regl(mem_buf, env->gpr[n]);
} else if (n == 32) { } else if (n == 32) {
return gdb_get_regl(mem_buf, env->pc); /* orig_a0 */
return gdb_get_regl(mem_buf, 0);
} else if (n == 33) { } else if (n == 33) {
return gdb_get_regl(mem_buf, env->pc);
} else if (n == 34) {
return gdb_get_regl(mem_buf, env->CSR_BADV); return gdb_get_regl(mem_buf, env->CSR_BADV);
} }
return 0; return 0;
@ -36,7 +39,7 @@ int loongarch_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
if (0 <= n && n < 32) { if (0 <= n && n < 32) {
env->gpr[n] = tmp; env->gpr[n] = tmp;
length = sizeof(target_ulong); length = sizeof(target_ulong);
} else if (n == 32) { } else if (n == 33) {
env->pc = tmp; env->pc = tmp;
length = sizeof(target_ulong); length = sizeof(target_ulong);
} }