[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-7.1 v2 1/5] target/loongarch: Fix GDB get the wrong pc
From: |
Song Gao |
Subject: |
[PATCH for-7.1 v2 1/5] target/loongarch: Fix GDB get the wrong pc |
Date: |
Fri, 5 Aug 2022 11:35:19 +0800 |
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>
---
gdb-xml/loongarch-base64.xml | 1 +
target/loongarch/cpu.c | 2 +-
target/loongarch/gdbstub.c | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gdb-xml/loongarch-base64.xml b/gdb-xml/loongarch-base64.xml
index 4962bdbd28..a1dd4f2208 100644
--- a/gdb-xml/loongarch-base64.xml
+++ b/gdb-xml/loongarch-base64.xml
@@ -39,6 +39,7 @@
<reg name="r29" 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="orig_a0" bitsize="64" type="uint64" group="general"/>
<reg name="pc" bitsize="64" type="code_ptr" group="general"/>
<reg name="badvaddr" bitsize="64" type="code_ptr" group="general"/>
</feature>
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index 1c69a76f2b..d84ec38cf7 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -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_write_register = loongarch_cpu_gdb_write_register;
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_stop_before_watchpoint = true;
diff --git a/target/loongarch/gdbstub.c b/target/loongarch/gdbstub.c
index 24e126fb2d..5feb43445f 100644
--- a/target/loongarch/gdbstub.c
+++ b/target/loongarch/gdbstub.c
@@ -19,8 +19,11 @@ int loongarch_cpu_gdb_read_register(CPUState *cs, GByteArray
*mem_buf, int n)
if (0 <= n && n < 32) {
return gdb_get_regl(mem_buf, env->gpr[n]);
} 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) {
+ return gdb_get_regl(mem_buf, env->pc);
+ } else if (n == 34) {
return gdb_get_regl(mem_buf, env->CSR_BADV);
}
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) {
env->gpr[n] = tmp;
length = sizeof(target_ulong);
- } else if (n == 32) {
+ } else if (n == 33) {
env->pc = tmp;
length = sizeof(target_ulong);
}
--
2.31.1
- [PATCH for-7.1 v2 0/5] Fix gdb bugs and update gdb-xml, Song Gao, 2022/08/04
- [PATCH for-7.1 v2 1/5] target/loongarch: Fix GDB get the wrong pc,
Song Gao <=
- [PATCH for-7.1 v2 5/5] target/loongarch: Update gdb_set_fpu() and gdb_get_fpu(), Song Gao, 2022/08/04
- [PATCH for-7.1 v2 4/5] target/loongarch: Update loongarch-fpu.xml, Song Gao, 2022/08/04
- [PATCH for-7.1 v2 3/5] target/loongarch: update loongarch-base64.xml, Song Gao, 2022/08/04
- [PATCH for-7.1 v2 2/5] target/loongarch: add gdb_arch_name(), Song Gao, 2022/08/04
- Re: [PATCH for-7.1 v2 0/5] Fix gdb bugs and update gdb-xml, Alex Bennée, 2022/08/05
- Re: [PATCH for-7.1 v2 0/5] Fix gdb bugs and update gdb-xml, Richard Henderson, 2022/08/05