From: Libo Zhou Date: Wed, 11 Sep 2019 13:19:26 +0000 (+0200) Subject: target/mips: gdbstub: Revert commit 8e0b373 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1cc1533509012916dceeb7f23accda8a9fee85c;p=qemu.git target/mips: gdbstub: Revert commit 8e0b373 Multiple reports from users were received regarding failures of packet 'g' communication with gdb for some MIPS configurations. It was found out (by bisecting) that the problematic commit is 8e0b373. Revert that commit until a better solution is developed. Suggested-by: Aleksandar Markovic Signed-off-by: Libo Zhou Signed-off-by: Aleksandar Markovic Reviewed-by: Aleksandar Markovic Message-Id: <1568207966-25202-1-git-send-email-aleksandar.markovic@rt-rk.com> --- diff --git a/target/mips/gdbstub.c b/target/mips/gdbstub.c index ebcc98bdde..bbb2544939 100644 --- a/target/mips/gdbstub.c +++ b/target/mips/gdbstub.c @@ -38,7 +38,7 @@ int mips_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) return gdb_get_regl(mem_buf, (int32_t)env->active_fpu.fcr0); default: if (env->CP0_Status & (1 << CP0St_FR)) { - return gdb_get_reg64(mem_buf, + return gdb_get_regl(mem_buf, env->active_fpu.fpr[n - 38].d); } else { return gdb_get_regl(mem_buf, @@ -99,7 +99,6 @@ int mips_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) break; default: if (env->CP0_Status & (1 << CP0St_FR)) { - uint64_t tmp = ldq_p(mem_buf); env->active_fpu.fpr[n - 38].d = tmp; } else { env->active_fpu.fpr[n - 38].w[FP_ENDIAN_IDX] = tmp;