Message ID | 20220616121611.3316074-8-gaosong@loongson.cn |
---|---|
State | New |
Headers | show |
Series | Add LoongArch linux-user emulation support | expand |
On 6/16/22 05:16, Song Gao wrote: > We can use CSR_BADV to replace badaddr. > > Signed-off-by: Song Gao <gaosong@loongson.cn> > Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> > --- Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~ > target/loongarch/cpu.h | 2 -- > target/loongarch/gdbstub.c | 2 +- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h > index 71a5036c3c..4b4fbcdc71 100644 > --- a/target/loongarch/cpu.h > +++ b/target/loongarch/cpu.h > @@ -246,8 +246,6 @@ typedef struct CPUArchState { > uint64_t lladdr; /* LL virtual address compared against SC */ > uint64_t llval; > > - uint64_t badaddr; > - > /* LoongArch CSRs */ > uint64_t CSR_CRMD; > uint64_t CSR_PRMD; > diff --git a/target/loongarch/gdbstub.c b/target/loongarch/gdbstub.c > index 0c48834201..24e126fb2d 100644 > --- a/target/loongarch/gdbstub.c > +++ b/target/loongarch/gdbstub.c > @@ -21,7 +21,7 @@ int loongarch_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) > } else if (n == 32) { > return gdb_get_regl(mem_buf, env->pc); > } else if (n == 33) { > - return gdb_get_regl(mem_buf, env->badaddr); > + return gdb_get_regl(mem_buf, env->CSR_BADV); > } > return 0; > }
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h index 71a5036c3c..4b4fbcdc71 100644 --- a/target/loongarch/cpu.h +++ b/target/loongarch/cpu.h @@ -246,8 +246,6 @@ typedef struct CPUArchState { uint64_t lladdr; /* LL virtual address compared against SC */ uint64_t llval; - uint64_t badaddr; - /* LoongArch CSRs */ uint64_t CSR_CRMD; uint64_t CSR_PRMD; diff --git a/target/loongarch/gdbstub.c b/target/loongarch/gdbstub.c index 0c48834201..24e126fb2d 100644 --- a/target/loongarch/gdbstub.c +++ b/target/loongarch/gdbstub.c @@ -21,7 +21,7 @@ int loongarch_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) } else if (n == 32) { return gdb_get_regl(mem_buf, env->pc); } else if (n == 33) { - return gdb_get_regl(mem_buf, env->badaddr); + return gdb_get_regl(mem_buf, env->CSR_BADV); } return 0; }