From patchwork Mon Mar 16 17:21:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1255739 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=ohAtQFEb; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48h4Bf0dscz9sSd for ; Tue, 17 Mar 2020 05:11:54 +1100 (AEDT) Received: from localhost ([::1]:45424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuDQ-0005sZ-0u for incoming@patchwork.ozlabs.org; Mon, 16 Mar 2020 14:11:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45579) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDtRe-00019q-TL for qemu-devel@nongnu.org; Mon, 16 Mar 2020 13:22:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDtRa-0001ZO-OE for qemu-devel@nongnu.org; Mon, 16 Mar 2020 13:22:30 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:51458) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jDtRa-0001S0-CU for qemu-devel@nongnu.org; Mon, 16 Mar 2020 13:22:26 -0400 Received: by mail-wm1-x341.google.com with SMTP id a132so18581313wme.1 for ; Mon, 16 Mar 2020 10:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Iavl1t+1hLO1HhNMpopBwo5UBi82XsMo5friXiEmqcA=; b=ohAtQFEbqBJOfQLMC2YL9mpAkl10cKUrKnnCI5uxbDY5KZKAwUDW7GCxTvRnbRnfSZ 7osy9E5PzJCLe2zTKZ/wpNpsvkmA4c27o5TrAXDeKdTgUizvbbvDoRwiTDtwb4MROzjk siGc11OnvgUCBWYBDo5VzPkCXiRVwObkSa0xNm4pV7KkxfnfyTrnn5lJk/ArtZd1PLow Kehy3iuwG/ueAAmffaw+Js0juiyyfKHVgBRpIm85uIdI5WTqEvwDFvO8jkl3YW7ZGEgX fT5Wj1r+hKc0ampZE1YIg93ys+wJ5ymnJo5lL3OpLWu+B7+R/YoIzFqlldKsIcHjHAnx p62A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Iavl1t+1hLO1HhNMpopBwo5UBi82XsMo5friXiEmqcA=; b=ZehOWhGLSOVRfwuh6pjQKZ9YgfsK0AZwyxlvLcHzNOEufYFgvHA6tTmSOYlS7je3K2 sYXWBB8m2uTJeJmBcxs/ckDHgrbIs92g95sSbTv0TGlwsuYJJzt78w8bqXovMuRWtNoy bgPxSaPQchx/LL1/rhDAlSamqvKfbHLsK08d3e9ysvSxn5gZBkq2nF32xQqJeX8cQKgH eoQwh1gexFcSP8Ut1JfqXi5Lsmm16iBFkAe3w7vGaO6AyugqVLsC1WweIJbTLQv1DkSB XWeVOnI5TdIHt9txh+ERfBUhuY1rAFVEAIdBHzMXOpFaSIY/zOGY2kymWk/+ZdfBZDUi sbGA== X-Gm-Message-State: ANhLgQ23dZR4QO3YH28CuuajS4PfW7W7+uQUzx+G+o47Fb9qYgIyuPtR tUunDaUb0yUpjmdZABm+a/tImw== X-Google-Smtp-Source: ADFU+vv7TxjPh5K/iMTQDvoIqhsOLvWaB0jr/IrO94OHJ72eIHncksqJWT7V+6oNkXqncOpT5PCLsg== X-Received: by 2002:a1c:9815:: with SMTP id a21mr154919wme.11.1584379345135; Mon, 16 Mar 2020 10:22:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y200sm447043wmc.20.2020.03.16.10.22.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 10:22:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4EA8E1FF9C; Mon, 16 Mar 2020 17:21:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 13/28] target/i386: use gdb_get_reg helpers Date: Mon, 16 Mar 2020 17:21:40 +0000 Message-Id: <20200316172155.971-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200316172155.971-1-alex.bennee@linaro.org> References: <20200316172155.971-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , qemu-arm@nongnu.org, =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This is cleaner than poking memory directly and will make later clean-ups easier. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- v7 - remove stray space - fixup the floatx80 set/get routines --- target/i386/gdbstub.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) 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;