ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/i386: use gdb_get_reg helpers 

This is cleaner than poking memory directly and will make later
clean-ups easier.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200316172155.971-14-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2020-03-16 17:21:40 +00:00
parent 462474d760
commit b7b8756a9c
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
target/i386/gdbstub.c
View File

@ -98,26 +98,22 @@ int x86_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
return gdb_get_reg64(mem_buf, return gdb_get_reg64(mem_buf,
env->regs[gpr_map[n]] & 0xffffffffUL); env->regs[gpr_map[n]] & 0xffffffffUL);
} else { } else {
memset(mem_buf, 0, sizeof(target_ulong)); return gdb_get_regl(mem_buf, 0);
return sizeof(target_ulong);
} }
} else { } else {
return gdb_get_reg32(mem_buf, env->regs[gpr_map32[n]]); return gdb_get_reg32(mem_buf, env->regs[gpr_map32[n]]);
} }
} else if (n >= IDX_FP_REGS && n < IDX_FP_REGS + 8) { } else if (n >= IDX_FP_REGS && n < IDX_FP_REGS + 8) {
#ifdef USE_X86LDOUBLE floatx80 *fp = (floatx80 *) &env->fpregs[n - IDX_FP_REGS];
/* FIXME: byteswap float values - after fixing fpregs layout. */ int len = gdb_get_reg64(mem_buf, cpu_to_le64(fp->low));
memcpy(mem_buf, &env->fpregs[n - IDX_FP_REGS], 10); len += gdb_get_reg16(mem_buf + len, cpu_to_le16(fp->high));
#else return len;
memset(mem_buf, 0, 10);
#endif
return 10;
} else if (n >= IDX_XMM_REGS && n < IDX_XMM_REGS + CPU_NB_REGS) { } else if (n >= IDX_XMM_REGS && n < IDX_XMM_REGS + CPU_NB_REGS) {
n -= IDX_XMM_REGS; n -= IDX_XMM_REGS;
if (n < CPU_NB_REGS32 || TARGET_LONG_BITS == 64) { if (n < CPU_NB_REGS32 || TARGET_LONG_BITS == 64) {
stq_p(mem_buf, env->xmm_regs[n].ZMM_Q(0)); return gdb_get_reg128(mem_buf,
stq_p(mem_buf + 8, env->xmm_regs[n].ZMM_Q(1)); env->xmm_regs[n].ZMM_Q(0),
return 16; env->xmm_regs[n].ZMM_Q(1));
} }
} else { } else {
switch (n) { switch (n) {
@ -290,10 +286,9 @@ int x86_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
return 4; return 4;
} }
} else if (n >= IDX_FP_REGS && n < IDX_FP_REGS + 8) { } else if (n >= IDX_FP_REGS && n < IDX_FP_REGS + 8) {
#ifdef USE_X86LDOUBLE floatx80 *fp = (floatx80 *) &env->fpregs[n - IDX_FP_REGS];
/* FIXME: byteswap float values - after fixing fpregs layout. */ fp->low = le64_to_cpu(* (uint64_t *) mem_buf);
memcpy(&env->fpregs[n - IDX_FP_REGS], mem_buf, 10); fp->high = le16_to_cpu(* (uint16_t *) (mem_buf + 8));
#endif
return 10; return 10;
} else if (n >= IDX_XMM_REGS && n < IDX_XMM_REGS + CPU_NB_REGS) { } else if (n >= IDX_XMM_REGS && n < IDX_XMM_REGS + CPU_NB_REGS) {
n -= IDX_XMM_REGS; n -= IDX_XMM_REGS;