From patchwork Tue Mar 17 17:50:38 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: 184658 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4446818ile; Tue, 17 Mar 2020 11:06:20 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuc1fmVDZu8AjyzknP5yHJxxhhFaSRM+7BYBpjDEIr8o5ZFHMImaswsyEa7hjRV73PhmtRQ X-Received: by 2002:a37:6311:: with SMTP id x17mr85250qkb.93.1584468380272; Tue, 17 Mar 2020 11:06:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584468380; cv=none; d=google.com; s=arc-20160816; b=qPHA2AA/AJw4xlqoLm88bwFUho4abCLmXLFqAsVc233LFXV72kOqNYeE4hoQYm3EnB 6529NFnufSuAc8SQwZkdR0eY3UFKJcxTwqyWgjnA/A7LPFv5fMw3Ns70+cLGeTHS6rBt gXX0y0L87oXJkOsPv6eusDu8O5LRWgM8qQ/oi+JnBkIyFvsEZ1Ar6pB5sZmThDfmj3Hm /+3Hz7yB3bugHoMfUmJJz6BgizRpgEkjRqQaGNHgp0l0jj2yLT6qBk1hyhwCuuz4g6vt XtanJCFRR4saFddzArBmHbfZYwsbXfOrPFsy+arFffRUB2D+FmjhZ8KrH4BNL4MX8NZM SiGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=0LurhQOzs6U/ZvFoMmo+r48W1bsv6y+gXlCttu3J7Bc=; b=Kd9uCpU5ttD7qEmvfGg5X9THIhNYmtMf6r09RvlUVgDRfkWt7pMa3TeuWrnNzYdlub nJaRmNdR5Ur6bkigcPcCpeUSTDbtrD9CfEZKZfRkaz9RHFPm5YuWIetp4kubSXXbGDNT DJGL5HGWnXKiI00vgewKVbzEdH2iqtVmSKRqyoDB9lb8STmYG9z2y2f4z6YjH49/cijY eywlcyCZQIiMyqBjnFEZxSu+jE0Kg2ak4b0zv2DAJLWCr0VngITPk7R1lGw0kx5bIHpE +Zl8dV8OSRbWurKb3sz82yG+9D6AHK9w7+BtMPC5Yk/COgTw+ZBjv24vxxETO0DPDZap sq3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=o7v3m7Es; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w13si2251294qvp.1.2020.03.17.11.06.20 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Mar 2020 11:06:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=o7v3m7Es; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGbb-0005yI-MP for patch@linaro.org; Tue, 17 Mar 2020 14:06:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57365) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGN9-0000uq-No for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:51:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEGN7-0003uw-MM for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:51:23 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:46439) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEGN7-0003pr-Dw for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:51:21 -0400 Received: by mail-wr1-x42b.google.com with SMTP id w16so10474003wrv.13 for ; Tue, 17 Mar 2020 10:51:21 -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=0LurhQOzs6U/ZvFoMmo+r48W1bsv6y+gXlCttu3J7Bc=; b=o7v3m7EsuzvyFIhhKoiL7J5MWwwfNigJd9ZkrUa3i3U/OkXXHVz5zu4lyebHyhWQ0X MthBOq8RAWwGnTG8CkW6lLLIYNc90rPwF8xK/QG8r2av8HTem3NODdT+mtz3pg4/mrER TdyD/Xyhnt4Aj1MvWXNkt0lC65IjodvZ2+kDeHjmVk2MXwpSI7CEMyp6mK8ftyewHa1D RsjeaN6EGAQ9sE7HxETNRhrojGqSj3M3vYxY79FRSmaavwcuN92PIHPOlMAIaCBq7axX xNiMRhUsfm1hHVPRSfY74RyCtSMnEqY0UR19eMv3iS5TFrHJMLEDYv+RO+SbwIgauGm9 6LRQ== 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=0LurhQOzs6U/ZvFoMmo+r48W1bsv6y+gXlCttu3J7Bc=; b=ip+GU7YqwmNnFn34bhHhwdpuCpixQ7ZDDcp8DAyRapju6gWs+p3ee1T8o3fLj/Spf6 4uDIh3IRcIcNuMZNKXiWUl2TC/K8JorYPpEjFIjlYHgXa2+SxI6O9vEhpjCPVLPvnzDb b3Bctsx4AWuuQy2/P9LyTXhuxYmSTk5sYHMVR9swHtSNxp7VLDgntD48qr/6Y8btRF6p 5papU8bb+IAaMtMUYdxu3m815o/MpBImfruLGbntsb7AM6s2BhPybO3ANv9hBVYqJIpL TLBlccXLyD3RvC/zwqx3mDHnqrj0Sk1aMUHqXDsnQwxvIqFtFnQhQC5Bv3iL+YhnMd0R qj7w== X-Gm-Message-State: ANhLgQ2ZjmsIUUxR3QKuBdfAPipotMyBBELFxhQ1OqkHYp/M511yZlqs ciP/Y7Gy0SaGufzCLdCkSYnDfFqWPp0= X-Received: by 2002:adf:f510:: with SMTP id q16mr149860wro.43.1584467480343; Tue, 17 Mar 2020 10:51:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t22sm921219wra.27.2020.03.17.10.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 10:51:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6FED61FF9C; Tue, 17 Mar 2020 17:50:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 13/28] target/i386: use gdb_get_reg helpers Date: Tue, 17 Mar 2020 17:50:38 +0000 Message-Id: <20200317175053.5278-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317175053.5278-1-alex.bennee@linaro.org> References: <20200317175053.5278-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::42b 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: Eduardo Habkost , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.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é Message-Id: <20200316172155.971-14-alex.bennee@linaro.org> -- 2.20.1 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;