From patchwork Fri Jun 22 14:11:59 2018 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: 139664 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp943695lji; Fri, 22 Jun 2018 07:31:21 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKcNN0ryPbcEkWrcOH6Ec3vWqesjmE3QMSdi/fvfswLn3iFuH59N28qDP/m/7pvAWxKCHBd X-Received: by 2002:aed:39ea:: with SMTP id m97-v6mr1522474qte.231.1529677881136; Fri, 22 Jun 2018 07:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529677881; cv=none; d=google.com; s=arc-20160816; b=QknXlEck6XOMnQBHUlcamSGxhrYhuA+tK3OwcAcoWGThwdvXwqFzXgX/hqLKR4An9g e12cX8OTvCodAtnekkqDtTSQlrzAcFmeQQahW+Le8xGGNT498+YMEY8c8+SFGXocNSak 8nSqqEUHs5p1RuA5rarOGmqkY44bxG5raIJxSJbx/WFbMmrsvKEV7EiQsAzWY2t2NCfJ +FJQedeJUC39ZJXiEFg136C6pBmDCFi5ZOZM1LvZGYHR+0xJDSPentPKhQV2OV3ZL+CK 9RZ440WUtE0uyqeU7j/pq927xBuWZ2NmP0ZZqfzbCw3T1jEYFpzhVgELlE/Pw7Pug3NE n+ZQ== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=nY1mbDPdhT4h3XIsfZuzlnsw3ol/c3Sp62EFruoWlqg=; b=WxnQlgaHead0YPOF7kAWYjIJLG3lXda8cPaJwuTk9TeGPh7LjlC5KvUvKMXBDe87zV nNDV47VZ8sT/TYoSIh5E/Tu6dNrqfzGBJzmQsrPldrtl52A41nUajKPkc/iuXd4BtxP/ r2BIhv93OZkqjelXmAARr/yDPyzW2ICc+A3PgYDAAoDJKMX/UrrAGtw837+F1CbFEvUl +KvRvSuuc8UpD25W+Bx4mepKAgKHOl7EKoaF6rRyR6wl4HTDSb7iIJBuHZIevLfoJ4nX cA9I9qKCk9pk/LJbRik6Z3gD6x7pwWe83bRLyf0FyrglVskHsVnqfynI1mfM1zvnvoG+ f4PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MsX9fvHz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v35-v6si2129041qvv.262.2018.06.22.07.31.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Jun 2018 07:31:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MsX9fvHz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:34413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWN5s-0004zQ-BN for patch@linaro.org; Fri, 22 Jun 2018 10:31:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWMnX-0006HK-BL for qemu-devel@nongnu.org; Fri, 22 Jun 2018 10:12:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWMnU-0006Dt-00 for qemu-devel@nongnu.org; Fri, 22 Jun 2018 10:12:23 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:50486) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fWMnT-0006DF-Q7 for qemu-devel@nongnu.org; Fri, 22 Jun 2018 10:12:19 -0400 Received: by mail-wm0-x22c.google.com with SMTP id e16-v6so2421295wmd.0 for ; Fri, 22 Jun 2018 07:12:19 -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=nY1mbDPdhT4h3XIsfZuzlnsw3ol/c3Sp62EFruoWlqg=; b=MsX9fvHz8zG3fXbL2R/UNplqWgBo4jk28mt11s4awxa2wVZ3RZr/B9yOfF9ZrBw6mM FmZsy9gp1fpxSg+fgc5uTQRGxiifRhqclprz0K7u60o5RJpSXkp43olwBV1eXm6Zw1lG hsRnqtS/D1XEI9/DkHeGRGNcasmREuyLpsk6U= 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=nY1mbDPdhT4h3XIsfZuzlnsw3ol/c3Sp62EFruoWlqg=; b=pJtclZyTDNTSGxht77SSD9+qCr1Za842OCLX925gloWXRrnA3SYIqSXdg/QA0J8Skb XkvTLLcvU+IgnzHLTsapQtW0hZFse4BTK6DvOqz5RHExBP+LPUoHdNFh4XAiN8IBOA+F kf5D6kCCY4l2/5yLhoaMmaZJ9QtxMHgU0kpKtjHiSDJ5W1AfgitU/uBmfp6+oYx4RGeY 4MAvaseusacxS7gb4uK4bXW9H3GEniUd49K6j5rjEifOjwOmoA4Vkfjq1hO03T80Got+ qVxGIMg+zTZK56g/jjdXbSHuX7FY5fgQsKLIPbmh4u8pZweorz335HMC8jI/gxXRBcc3 AiAg== X-Gm-Message-State: APt69E3u5BXeJ2CGqsc+Bz7tW9Tgj+aToVtL/XyGr9Rw63iNUrfTyh00 JYL5Ik0vjdGLn2K9i/GuSzWCIA== X-Received: by 2002:a1c:afc3:: with SMTP id y186-v6mr1757733wme.87.1529676738758; Fri, 22 Jun 2018 07:12:18 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a203-v6sm1900890wme.46.2018.06.22.07.12.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jun 2018 07:12:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1DEE03E0C4D; Fri, 22 Jun 2018 15:12:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 22 Jun 2018 15:11:59 +0100 Message-Id: <20180622141205.16306-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180622141205.16306-1-alex.bennee@linaro.org> References: <20180622141205.16306-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:400c:c09::22c Subject: [Qemu-devel] [RISU PATCH v4 16/22] risu_reginfo_aarch64: unionify VFP regs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, richard.henderson@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is preparation for the SVE work as we won't want to be carrying around both VFP and SVE registers at the same time as they overlap. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- risu_reginfo_aarch64.c | 16 ++++++++-------- risu_reginfo_aarch64.h | 9 ++++++++- 2 files changed, 16 insertions(+), 9 deletions(-) -- 2.17.1 diff --git a/risu_reginfo_aarch64.c b/risu_reginfo_aarch64.c index 34dd9af..62a5599 100644 --- a/risu_reginfo_aarch64.c +++ b/risu_reginfo_aarch64.c @@ -64,7 +64,7 @@ void reginfo_init(struct reginfo *ri, ucontext_t *uc) ri->fpcr = fp->fpcr; for (i = 0; i < 32; i++) { - ri->vregs[i] = fp->vregs[i]; + ri->simd.vregs[i] = fp->vregs[i]; } } @@ -92,8 +92,8 @@ int reginfo_dump(struct reginfo *ri, FILE * f) for (i = 0; i < 32; i++) { fprintf(f, " V%2d : %016" PRIx64 "%016" PRIx64 "\n", i, - (uint64_t) (ri->vregs[i] >> 64), - (uint64_t) (ri->vregs[i] & 0xffffffffffffffff)); + (uint64_t) (ri->simd.vregs[i] >> 64), + (uint64_t) (ri->simd.vregs[i] & 0xffffffffffffffff)); } return !ferror(f); @@ -138,14 +138,14 @@ int reginfo_dump_mismatch(struct reginfo *m, struct reginfo *a, FILE * f) } for (i = 0; i < 32; i++) { - if (m->vregs[i] != a->vregs[i]) { + if (m->simd.vregs[i] != a->simd.vregs[i]) { fprintf(f, " V%2d : " "%016" PRIx64 "%016" PRIx64 " vs " "%016" PRIx64 "%016" PRIx64 "\n", i, - (uint64_t) (m->vregs[i] >> 64), - (uint64_t) (m->vregs[i] & 0xffffffffffffffff), - (uint64_t) (a->vregs[i] >> 64), - (uint64_t) (a->vregs[i] & 0xffffffffffffffff)); + (uint64_t) (m->simd.vregs[i] >> 64), + (uint64_t) (m->simd.vregs[i] & 0xffffffffffffffff), + (uint64_t) (a->simd.vregs[i] >> 64), + (uint64_t) (a->simd.vregs[i] & 0xffffffffffffffff)); } } diff --git a/risu_reginfo_aarch64.h b/risu_reginfo_aarch64.h index a05fb4e..a1c708b 100644 --- a/risu_reginfo_aarch64.h +++ b/risu_reginfo_aarch64.h @@ -13,6 +13,10 @@ #ifndef RISU_REGINFO_AARCH64_H #define RISU_REGINFO_AARCH64_H +struct simd_reginfo { + __uint128_t vregs[32]; +}; + struct reginfo { uint64_t fault_address; uint64_t regs[31]; @@ -24,7 +28,10 @@ struct reginfo { /* FP/SIMD */ uint32_t fpsr; uint32_t fpcr; - __uint128_t vregs[32]; + + union { + struct simd_reginfo simd; + }; }; #endif /* RISU_REGINFO_AARCH64_H */