Peter Xu <pet...@redhat.com> writes:
> We should only pass in gdb_get_reg16() with the GByteArray* object
> itself, no need to shift. Without this patch, gdb remote attach will
> crash QEMU.
>
> Cc: Alex Bennée <alex.ben...@linaro.org>
> Cc: Philippe Mathieu-Daudé <phi...@redhat.com>
> Signed-off-by: Peter Xu <pet...@redhat.com>
Queued to for-5.0/more-random-fixes, thanks.
> ---
> target/i386/gdbstub.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c
> index f3d23b614e..b98a99500a 100644
> --- a/target/i386/gdbstub.c
> +++ b/target/i386/gdbstub.c
> @@ -106,7 +106,7 @@ int x86_cpu_gdb_read_register(CPUState *cs, GByteArray
> *mem_buf, int n)
> } else if (n >= IDX_FP_REGS && n < IDX_FP_REGS + 8) {
> 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));
> + len += gdb_get_reg16(mem_buf, cpu_to_le16(fp->high));
> return len;
> } else if (n >= IDX_XMM_REGS && n < IDX_XMM_REGS + CPU_NB_REGS) {
> n -= IDX_XMM_REGS;
--
Alex Bennée
