[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/28] target/i386: use gdb_get_reg helpers
From: |
Alex Bennée |
Subject: |
[PULL 13/28] target/i386: use gdb_get_reg helpers |
Date: |
Tue, 17 Mar 2020 17:50:38 +0000 |
This is cleaner than poking memory directly and will make later
clean-ups easier.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c
index 572ead641ca..e4d8cb66c00 100644
--- a/target/i386/gdbstub.c
+++ b/target/i386/gdbstub.c
@@ -98,26 +98,22 @@ int x86_cpu_gdb_read_register(CPUState *cs, uint8_t
*mem_buf, int n)
return gdb_get_reg64(mem_buf,
env->regs[gpr_map[n]] & 0xffffffffUL);
} else {
- memset(mem_buf, 0, sizeof(target_ulong));
- return sizeof(target_ulong);
+ return gdb_get_regl(mem_buf, 0);
}
} else {
return gdb_get_reg32(mem_buf, env->regs[gpr_map32[n]]);
}
} else if (n >= IDX_FP_REGS && n < IDX_FP_REGS + 8) {
-#ifdef USE_X86LDOUBLE
- /* FIXME: byteswap float values - after fixing fpregs layout. */
- memcpy(mem_buf, &env->fpregs[n - IDX_FP_REGS], 10);
-#else
- memset(mem_buf, 0, 10);
-#endif
- return 10;
+ floatx80 *fp = (floatx80 *) &env->fpregs[n - IDX_FP_REGS];
+ int len = gdb_get_reg64(mem_buf, cpu_to_le64(fp->low));
+ len += gdb_get_reg16(mem_buf + len, cpu_to_le16(fp->high));
+ return len;
} else if (n >= IDX_XMM_REGS && n < IDX_XMM_REGS + CPU_NB_REGS) {
n -= IDX_XMM_REGS;
if (n < CPU_NB_REGS32 || TARGET_LONG_BITS == 64) {
- stq_p(mem_buf, env->xmm_regs[n].ZMM_Q(0));
- stq_p(mem_buf + 8, env->xmm_regs[n].ZMM_Q(1));
- return 16;
+ return gdb_get_reg128(mem_buf,
+ env->xmm_regs[n].ZMM_Q(0),
+ env->xmm_regs[n].ZMM_Q(1));
}
} else {
switch (n) {
@@ -290,10 +286,9 @@ int x86_cpu_gdb_write_register(CPUState *cs, uint8_t
*mem_buf, int n)
return 4;
}
} else if (n >= IDX_FP_REGS && n < IDX_FP_REGS + 8) {
-#ifdef USE_X86LDOUBLE
- /* FIXME: byteswap float values - after fixing fpregs layout. */
- memcpy(&env->fpregs[n - IDX_FP_REGS], mem_buf, 10);
-#endif
+ floatx80 *fp = (floatx80 *) &env->fpregs[n - IDX_FP_REGS];
+ fp->low = le64_to_cpu(* (uint64_t *) mem_buf);
+ fp->high = le16_to_cpu(* (uint16_t *) (mem_buf + 8));
return 10;
} else if (n >= IDX_XMM_REGS && n < IDX_XMM_REGS + CPU_NB_REGS) {
n -= IDX_XMM_REGS;
--
2.20.1
- [PULL 03/28] tests/docker: Remove obsolete VirGL --with-glx configure option, (continued)
- [PULL 03/28] tests/docker: Remove obsolete VirGL --with-glx configure option, Alex Bennée, 2020/03/17
- [PULL 08/28] gdbstub: move str_buf to GDBState and use GString, Alex Bennée, 2020/03/17
- [PULL 09/28] gdbstub: move mem_buf to GDBState and use GByteArray, Alex Bennée, 2020/03/17
- [PULL 10/28] gdbstub: add helper for 128 bit registers, Alex Bennée, 2020/03/17
- [PULL 06/28] gdbstub: make GDBState static and have common init function, Alex Bennée, 2020/03/17
- [PULL 11/28] target/arm: use gdb_get_reg helpers, Alex Bennée, 2020/03/17
- [PULL 12/28] target/m68k: use gdb_get_reg helpers, Alex Bennée, 2020/03/17
- [PULL 15/28] target/arm: prepare for multiple dynamic XMLs, Alex Bennée, 2020/03/17
- [PULL 25/28] tests/tcg/aarch64: add test-sve-ioctl guest-debug test, Alex Bennée, 2020/03/17
- [PULL 16/28] target/arm: explicitly encode regnum in our XML, Alex Bennée, 2020/03/17
- [PULL 13/28] target/i386: use gdb_get_reg helpers,
Alex Bennée <=
- [PULL 07/28] gdbstub: stop passing GDBState * around and use global, Alex Bennée, 2020/03/17
- [PULL 14/28] gdbstub: extend GByteArray to read register helpers, Alex Bennée, 2020/03/17
- [PULL 23/28] tests/tcg/aarch64: add a gdbstub testcase for SVE registers, Alex Bennée, 2020/03/17
- [PULL 19/28] target/arm: don't bother with id_aa64pfr0_read for USER_ONLY, Alex Bennée, 2020/03/17
- [PULL 27/28] gdbstub: do not split gdb_monitor_write payload, Alex Bennée, 2020/03/17
- [PULL 20/28] tests/tcg/aarch64: userspace system register test, Alex Bennée, 2020/03/17
- [PULL 26/28] gdbstub: change GDBState.last_packet to GByteArray, Alex Bennée, 2020/03/17
- [PULL 18/28] target/arm: generate xml description of our SVE registers, Alex Bennée, 2020/03/17
- [PULL 24/28] tests/tcg/aarch64: add SVE iotcl test, Alex Bennée, 2020/03/17
- [PULL 22/28] tests/guest-debug: add a simple test runner, Alex Bennée, 2020/03/17