From patchwork Tue Mar 17 17:50:37 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: 184646 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4436303ile; Tue, 17 Mar 2020 10:56:57 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsZwJ/5ghjO/XBc7XHcRZ9msL4jyD7t18lfIWN3KhoIkaNUFwJL/IXl5Y07oFEkHH9Nxd0R X-Received: by 2002:aed:21c5:: with SMTP id m5mr377831qtc.42.1584467817823; Tue, 17 Mar 2020 10:56:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584467817; cv=none; d=google.com; s=arc-20160816; b=Y43N94P2jLE4uwN3f48c81W01i34fEy0bAA/knUHQhhdDaGuKnqRxy8wP5VmY0uh4F S8n4/IAM0d6jKumJZqTyfYm42k0QMeYYAcVIlPX5wTS0pIjdxBTK0gNbV2mq1c5wlxKK bHogaj3MrX0Y/SpR968l/HTbRSYh+OjpqnAEyFO+jfVT/ydTeBUaoyl6aMvKFfDprieb F2bj2o0wkOp7GLPaeMYvHg1fB7RqY7W8LUQTvH8ZBSuKKMJdbLWRO5nFVWyWTOQuAiTj lIKNm6+K1YIedzKBl9og0I0hihtNu1ZSoSuC+cJ3eFNedLnGlc+VyuGQRsh/WTEa9r9m qvPw== 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=Yf5LYbxQ7vZFI2e7ouWmWtLtY/JYKItbGmCRFHATcOA=; b=oSDZ+xZ43b0zWHIohRq1hNwS3V3/x8LY6uZSvTYkZDRQpT9+EdL2LEzv+WiVrRrM8Q SYVLV0vWP5VDLwnNHriVgpuzIzu4HpnhnzMeQ2wdJFmmXaw6tAKuj3AdW3Qph2xXVBqE luxhd1GNII3LZySvA65aFtcjWxLKpBGYShjWGbMwKB9imCh4tYtuBWSk8i1Wdd53r9Ii iMtzZj+F71ZJidlqY/D25Rmm3zRbxouGd/x2gxkpwI7YM8Ulo+ulP0iyMk3FUVl1iT4f GFT87sENBUOgACDsxJEmFVMPb9GaOdrW7omcV0PfMzJLzTKSIY0WPbQZb+kh/e1DhCei sjGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ar7YY6PN; 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 k65si2509119qke.224.2020.03.17.10.56.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Mar 2020 10:56:57 -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=ar7YY6PN; 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]:38194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGSX-0002DI-7s for patch@linaro.org; Tue, 17 Mar 2020 13:56:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57157) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGN1-0000au-Ks for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:51:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEGN0-00034n-AC for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:51:15 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:52277) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEGMz-0002wj-S4 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:51:14 -0400 Received: by mail-wm1-x336.google.com with SMTP id 11so256618wmo.2 for ; Tue, 17 Mar 2020 10:51:13 -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=Yf5LYbxQ7vZFI2e7ouWmWtLtY/JYKItbGmCRFHATcOA=; b=ar7YY6PNDtBqwBxuuw77nK1CTRBikQxIeKKSjsbxOrQa+qHhyxe1YJP6AVKl8kRihS O3wyXI7Fl64axSinztzBt+J0flUQ//Y0waq5IO+gLyEVJcCKiiV9xAjM0HkIC3823aA3 b0zC0f8h3pvsSPtpdpbAUzMsHr86kQqgN5ojW+URw0cZSI80ICFJWPXseJGfhLUQ5B4v 6jeaDaEq3gL12l0XtMDXVlz34yw0kQBb0ZaJs/mTvc0FiwEYy9mFWxZYZTbmL78wklRv s+fQsLsHKDzE6Ps8PUx1S/CsX58hq1c5coU2PR6SAy7Qzl629XYyRIYIkn3kGFeZa3zk 6OcQ== 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=Yf5LYbxQ7vZFI2e7ouWmWtLtY/JYKItbGmCRFHATcOA=; b=KIjyLfDBgmrdMCUhuD+sguYXFcYsB+18+wdkKkFiWQpk7hYFt7W7lBUYXT8QWoesnb 8EvdCGRz6jUIZbYgBoHMapIMSBqcuiAG+5A3p4o7/Hluo6IXrLAIP+Hq37U5prkiznhW VXKUlhLTeb633+o7Kj2nJ6y58xbLkg2yn5FOG+Vz6It7V4exHLtp1BCWVqLBOxP/hOUG XvWw74mxak/Hiwp2/n79FbBOOZaaGtODx1x41inPOXRT/QyoxNXg93SK4z+ADmlRgOnq q/Dy6nGA6yAjawi+rJYTHqV+VcVY7UnpnQ7d44iyaMqtJpW+JRHpMmOQJn6EGjt7Ldzm zE8g== X-Gm-Message-State: ANhLgQ0VeFiJPm2KJ4EoWTs7LoV1tWLxIVjMzEFKzn7kG8qZM9HVIMgO oBlja9CZVKHc4sQ5V7CG3n6bkg== X-Received: by 2002:a1c:a584:: with SMTP id o126mr174541wme.49.1584467472729; Tue, 17 Mar 2020 10:51:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 133sm237427wmd.5.2020.03.17.10.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 10:51:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 59F201FF9B; Tue, 17 Mar 2020 17:50:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 12/28] target/m68k: use gdb_get_reg helpers Date: Tue, 17 Mar 2020 17:50:37 +0000 Message-Id: <20200317175053.5278-13-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::336 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: Richard Henderson , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Laurent Vivier 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: Richard Henderson Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200316172155.971-13-alex.bennee@linaro.org> -- 2.20.1 diff --git a/target/m68k/helper.c b/target/m68k/helper.c index baf7729af00..c23b70f854d 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -72,19 +72,15 @@ static int cf_fpu_gdb_get_reg(CPUM68KState *env, uint8_t *mem_buf, int n) { if (n < 8) { float_status s; - stfq_p(mem_buf, floatx80_to_float64(env->fregs[n].d, &s)); - return 8; + return gdb_get_reg64(mem_buf, floatx80_to_float64(env->fregs[n].d, &s)); } switch (n) { case 8: /* fpcontrol */ - stl_be_p(mem_buf, env->fpcr); - return 4; + return gdb_get_reg32(mem_buf, env->fpcr); case 9: /* fpstatus */ - stl_be_p(mem_buf, env->fpsr); - return 4; + return gdb_get_reg32(mem_buf, env->fpsr); case 10: /* fpiar, not implemented */ - memset(mem_buf, 0, 4); - return 4; + return gdb_get_reg32(mem_buf, 0); } return 0; } @@ -112,21 +108,18 @@ static int cf_fpu_gdb_set_reg(CPUM68KState *env, uint8_t *mem_buf, int n) static int m68k_fpu_gdb_get_reg(CPUM68KState *env, uint8_t *mem_buf, int n) { if (n < 8) { - stw_be_p(mem_buf, env->fregs[n].l.upper); - memset(mem_buf + 2, 0, 2); - stq_be_p(mem_buf + 4, env->fregs[n].l.lower); - return 12; + int len = gdb_get_reg16(mem_buf, env->fregs[n].l.upper); + len += gdb_get_reg16(mem_buf + len, 0); + len += gdb_get_reg64(mem_buf + len, env->fregs[n].l.lower); + return len; } switch (n) { case 8: /* fpcontrol */ - stl_be_p(mem_buf, env->fpcr); - return 4; + return gdb_get_reg32(mem_buf, env->fpcr); case 9: /* fpstatus */ - stl_be_p(mem_buf, env->fpsr); - return 4; + return gdb_get_reg32(mem_buf, env->fpsr); case 10: /* fpiar, not implemented */ - memset(mem_buf, 0, 4); - return 4; + return gdb_get_reg32(mem_buf, 0); } return 0; }