From patchwork Fri Mar 1 20:04:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159514 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1146143jad; Fri, 1 Mar 2019 12:10:51 -0800 (PST) X-Google-Smtp-Source: APXvYqxUYUnWBIpJqqxdCBmAh1LVASehZbVfKigY7EvnVov02nH4QdX1BQsbRQqmotN8dPmS33NN X-Received: by 2002:a81:e52:: with SMTP id 79mr5221079ywo.367.1551471051535; Fri, 01 Mar 2019 12:10:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551471051; cv=none; d=google.com; s=arc-20160816; b=CuKq6w+XLMP1PnPgpsJY7h7TqQUJzyvRiye4r1oDeNeNXRzBAH1+QINSpyLGeV5B/N d65W+rDgO4r+nWklNe2G24fMsuPj5DFmXM0GH/EgJnwakEK8+Jld+C4hZ7pPbuQ9Ci/I 6wScFmnrKmExws64R9A5X2ftdxiT7zZ6/DTN7R1xrtLuZffbhIkhOxvr/V5KW+5Pta2u iBWunWRncDdoQ5yFkqfAXDghPP0mI0yUmw/bc70NQ1f8E1yKuFr0lrxWFWLQwk8fsgI8 e4uUc2jTwitBMJVx6PhVLu1rPYAPBrmSNJRL1ti/vxui4ZsvBW1x+0Z3Nxoy+YoM6Z9O 3h1w== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=snPPjJnUHGdCTSecn79/tXDjxGHKZDIkeDVTp9ppzI0=; b=hsR9Elc/pvNoSNyQgcaxDyy9/X7m++OACp6TyuSaCebnyVHza9snK1sJeJHlKVJXtN Zv7S0Ff5G7dYEx/zIH0AlJ3OzCUKjBxedqrSdphn88g+yNTt64eh9DRtEqiRc6+SXkSg 4ALTiqP77Z/da+SK4VxfOjNbtnSEOtBc10ZoKVeZigKEuLDp6GCYfHPASDO9hir97qcB YhTdj95AukeZpE9Vpat3FOSycXrsl4jfdlYlAvtQ1JfHLvZeYtcpGTg6H4bIvmkP1i6y dzzdL7apUvJoOwrSp/++V1AYfprkg33+ZKQcLlzFYhJ3MIckbnxaky+BDLi5JPX98s+G Ro0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vM+8NDRW; 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 j17si11345171ybm.480.2019.03.01.12.10.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:10:51 -0800 (PST) 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=vM+8NDRW; 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 ([127.0.0.1]:43490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoUd-0002Hh-1p for patch@linaro.org; Fri, 01 Mar 2019 15:10:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPF-000481-QT for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPB-0001gh-Nx for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:17 -0500 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:46948) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoP5-0001Zc-Ll for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:07 -0500 Received: by mail-pf1-x443.google.com with SMTP id g6so11889895pfh.13 for ; Fri, 01 Mar 2019 12:05:06 -0800 (PST) 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; bh=snPPjJnUHGdCTSecn79/tXDjxGHKZDIkeDVTp9ppzI0=; b=vM+8NDRW8LCjws/XYTWWGW9o4olT/16N6snh2uHKpWdzPJF8wH93CvoIwOzWImIqAx qWORrWziVPT4LZjxq9Otyy1fchV6iSplwKDLMal9sIo+iXIL+eGjE4lpVlTT9BE4J3Wk xKjty4dgeawocO8Vj8/j8UArDD+ztAUdBTn+KyL/kpEj04lUmZcRc70YVfDQY5zlHsjf wvpfRClShd+5AEZpwSaNCsTiYiicqawGHguPClcbdFOpJolBApX2zja9BreSKL8Ia8xK E8O7uC81VsBX6x6R9VMLh2fhbuZCDpjHBpWMiv4GhPolkF0J/YA42xhHZqDab7bJa889 ZBvg== 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; bh=snPPjJnUHGdCTSecn79/tXDjxGHKZDIkeDVTp9ppzI0=; b=oElHPuJGu1B3dkHz45+MKEWFkKVyiUPVK9+OVo5sjkXCJqJeQVoxTzar09hAV/UBgz /URwo95z5SvfUbojn4dlk2wF2vlEhmNGcquzHwKM4mhbjZ/QSqj7DtkcLoSyIJLVt2/I lQC02BNDf9iNjo6yFY8zyZciaSWMw2pVsWPH1FM9P0mbXyOjpJmyQ5hnBezda3Van+Pz mWiLdGgZ0dQMNK8qTup3l7rpBJdpayU8XusQkhFX45TkkZdARy6A7eeyv0WpLRTxftUT hgYc/mZb6SCzAlEjR8NaSSer4WrQcOb8KmlB1YkuWpcmJVeBFLoAiXTXRb5irO52Ye3H wAPg== X-Gm-Message-State: APjAAAXhq6C/C03g3D/0UfeJUFhzVh10WxXLq2nIbXrjqRAwnkT8CEI5 35Yb6XpVZYv7G2mX+IOopewkkCnynnw= X-Received: by 2002:a62:3990:: with SMTP id u16mr7379475pfj.80.1551470704931; Fri, 01 Mar 2019 12:05:04 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:04 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:04:52 -0800 Message-Id: <20190301200501.16533-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 Subject: [Qemu-devel] [PATCH v3 01/10] target/arm: Split out arm_sctlr 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Minimize the number of places that will need updating when the virtual host extensions are added. Signed-off-by: Richard Henderson --- target/arm/cpu.h | 26 ++++++++++++++++---------- target/arm/helper.c | 8 ++------ 2 files changed, 18 insertions(+), 16 deletions(-) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 36cd365efa..67b06bfad0 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3042,11 +3042,20 @@ static inline bool arm_sctlr_b(CPUARMState *env) (env->cp15.sctlr_el[1] & SCTLR_B) != 0; } +static inline uint64_t arm_sctlr(CPUARMState *env, int el) +{ + if (el == 0) { + /* FIXME: ARMv8.1-VHE S2 translation regime. */ + return env->cp15.sctlr_el[1]; + } else { + return env->cp15.sctlr_el[el]; + } +} + + /* Return true if the processor is in big-endian mode. */ static inline bool arm_cpu_data_is_big_endian(CPUARMState *env) { - int cur_el; - /* In 32bit endianness is determined by looking at CPSR's E bit */ if (!is_a64(env)) { return @@ -3065,15 +3074,12 @@ static inline bool arm_cpu_data_is_big_endian(CPUARMState *env) arm_sctlr_b(env) || #endif ((env->uncached_cpsr & CPSR_E) ? 1 : 0); + } else { + int cur_el = arm_current_el(env); + uint64_t sctlr = arm_sctlr(env, cur_el); + + return (sctlr & (cur_el ? SCTLR_EE : SCTLR_E0E)) != 0; } - - cur_el = arm_current_el(env); - - if (cur_el == 0) { - return (env->cp15.sctlr_el[1] & SCTLR_E0E) != 0; - } - - return (env->cp15.sctlr_el[cur_el] & SCTLR_EE) != 0; } #include "exec/cpu-all.h" diff --git a/target/arm/helper.c b/target/arm/helper.c index 1fa282a7fc..49ff79a146 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12854,12 +12854,8 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, flags = FIELD_DP32(flags, TBFLAG_A64, ZCR_LEN, zcr_len); } - if (current_el == 0) { - /* FIXME: ARMv8.1-VHE S2 translation regime. */ - sctlr = env->cp15.sctlr_el[1]; - } else { - sctlr = env->cp15.sctlr_el[current_el]; - } + sctlr = arm_sctlr(env, current_el); + if (cpu_isar_feature(aa64_pauth, cpu)) { /* * In order to save space in flags, we record only whether From patchwork Fri Mar 1 20:04:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159507 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1143057jad; Fri, 1 Mar 2019 12:08:06 -0800 (PST) X-Google-Smtp-Source: APXvYqwUruLsR7kWcuB1sAnLxf9pltthTH2q+A8fb2qzvXq0dUBpYj/qCYotOGbfJjI7oYyhmQkb X-Received: by 2002:a25:ce87:: with SMTP id x129mr5845714ybe.353.1551470886655; Fri, 01 Mar 2019 12:08:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551470886; cv=none; d=google.com; s=arc-20160816; b=CSNuV7SPyTRt+4zSFOoRbRPCoLVG/GcafbvBt8WHdeyeLjCDt4qwjrmngRlwp3n8Br d8TjxyGBF51YFNcHRDxOEF4lY2ZIo+qVxWjtwfblZkQkukW3WoJJ1bmr5ordS2dPKPY5 Q2zNbZ9M4uPmoOyPExmPpYjC1b1cjOYCLV6DAcMyGP799thcCz3Gaig4FXuxcyJufOQf bN+kiBSlff8/xzMDw1m2vtbYtZRqOLycvZs8lUo4Z3Rfs9KRSCMhJmWGqWB2JDXs5p42 a5mKdBXkFXZLWWBQec87Ue+Gv7Z3biu4o2RKcSjT9tvtGxyXabqEGvVnK76GbGqF0aDw 5+Uw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=kTul6r+YHLG/twWO20Fci4nsTs7i/YjyXbAZy8P0wPU=; b=ylQU5it8zwnF/AZfOc0dULSxgFStabR+6b87ESAeFyVc7f4ScH7AP68kTk9k9DBrvc hYhC+M95zrgoG+7YOvOAlVcFxkZWfzpuglW/Xp+wktDJQnyplUdFAmL2f2KqowkPvTHT 8tdFNSFrM2O64KVaQSc0J/Sodi81gGBMFNlT1rQXKKCYLVKimvbkDBsgxwVmDr1KqLiT 0ToqrPQYD9QtH/42LkDypQxBX73g2q9+K8lBBWXbauqrOXSJBVWsDqN+Al/kk/bCi/bH 0S6O54UC0SOwRZYJHWOXbOO0AJlPXbdpqREuj/g/J70q8Mi+4gkhLVJSUrTB+IPSadfJ muaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EwT0Wl00; 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 b68si4720802ywh.221.2019.03.01.12.08.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:08:06 -0800 (PST) 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=EwT0Wl00; 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 ([127.0.0.1]:43461 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoRy-0006SL-2n for patch@linaro.org; Fri, 01 Mar 2019 15:08:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPH-0004At-Pq for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPF-0001jA-P1 for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:19 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:38301) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoP9-0001cf-UQ for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:15 -0500 Received: by mail-pg1-x543.google.com with SMTP id m2so11930978pgl.5 for ; Fri, 01 Mar 2019 12:05:08 -0800 (PST) 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; bh=kTul6r+YHLG/twWO20Fci4nsTs7i/YjyXbAZy8P0wPU=; b=EwT0Wl00W4Zta4lfHyhL717d4SIshQWoluiENA5OWQ+7DDUzD5zDQfZWXMhiFprvzD ZfurlKcLKa6OshXgqOAKuWtLKDSLIgeChog0MzUuV2ExIm79AvxUljKe5o5I1Fx1elK8 tkCRxs2aGu3CPJpybgifzhJqnqahozG/IkADpJ3INmcQrfa7NScbgYLLq2e63WfW0Yv1 33BeO7zUHWAZ0W4a0Ma/FM1JE97bc/T7/1BjZX9r/w2/2vwTcDqJ25U1GNTgegPFxqWN Fav1Hu4aQTMmA9SXSOx1q/WK4oP7JMIzxuWq3O9NAhkxheOSqkDcNUguypNTB3sJDgS+ A2Xg== 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; bh=kTul6r+YHLG/twWO20Fci4nsTs7i/YjyXbAZy8P0wPU=; b=rU2nPCyN/PsNxsbNXKrurLZCbDWeKmzYygKd/J+S53zjxpM/jQeC1CZ7a6UYSLBkGu 7vPsRFS0VEUcEckEjgyFjeW5vO85UqIeP1e/jiI1FUV1x/S38B74pFTmxr+t5yIfFqAl Pfpp66yBBwaIWEHkdgoxB4hY043CLWWHt495a2Uk8KGekIApLkoI3PLXlFJtQGYQgZVo V8wT4gBjAJsDh+1j7AzFEJzVsEejR+a1T++LnhT2Ss9vv99S5o6LtKRzahayKcAxjiM5 qeOrpPQXWJib4Ql1HixzOEKy04ImGbCfGrTst0pWFTeCLuqkA4BvrZcFwDYEus7C0zg7 1ejA== X-Gm-Message-State: AHQUAuacuJV15asrwOJyZrm+d0LBCRe+bgfRu0FToeXY8Rd80dR2dWtc woK4Qyn4qBao1v0f3q4XU+YB6+rfHyM= X-Received: by 2002:aa7:80c8:: with SMTP id a8mr7279156pfn.27.1551470706938; Fri, 01 Mar 2019 12:05:06 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:04:53 -0800 Message-Id: <20190301200501.16533-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH v3 02/10] target/arm: Implement ARMv8.0-SB 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/cpu.h | 10 ++++++++++ linux-user/elfload.c | 1 + target/arm/cpu.c | 1 + target/arm/cpu64.c | 2 ++ target/arm/translate-a64.c | 14 ++++++++++++++ target/arm/translate.c | 22 ++++++++++++++++++++++ 6 files changed, 50 insertions(+) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 67b06bfad0..361e51143c 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3307,6 +3307,11 @@ static inline bool isar_feature_aa32_fhm(const ARMISARegisters *id) return FIELD_EX32(id->id_isar6, ID_ISAR6, FHM) != 0; } +static inline bool isar_feature_aa32_sb(const ARMISARegisters *id) +{ + return FIELD_EX32(id->id_isar6, ID_ISAR6, SB) != 0; +} + static inline bool isar_feature_aa32_fp16_arith(const ARMISARegisters *id) { /* @@ -3445,6 +3450,11 @@ static inline bool isar_feature_aa64_pauth(const ARMISARegisters *id) FIELD_DP64(0, ID_AA64ISAR1, GPI, 0xf))) != 0; } +static inline bool isar_feature_aa64_sb(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, SB) != 0; +} + static inline bool isar_feature_aa64_fp16(const ARMISARegisters *id) { /* We always set the AdvSIMD and FP fields identically wrt FP16. */ diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b9f7cbbdc1..6cfebe1446 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -604,6 +604,7 @@ static uint32_t get_elf_hwcap(void) GET_FEATURE_ID(aa64_pauth, ARM_HWCAP_A64_PACA | ARM_HWCAP_A64_PACG); GET_FEATURE_ID(aa64_fhm, ARM_HWCAP_A64_ASIMDFHM); GET_FEATURE_ID(aa64_jscvt, ARM_HWCAP_A64_JSCVT); + GET_FEATURE_ID(aa64_sb, ARM_HWCAP_A64_SB); #undef GET_FEATURE_ID diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 54b61f917b..ef069c268d 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2021,6 +2021,7 @@ static void arm_max_initfn(Object *obj) t = FIELD_DP32(t, ID_ISAR6, JSCVT, 1); t = FIELD_DP32(t, ID_ISAR6, DP, 1); t = FIELD_DP32(t, ID_ISAR6, FHM, 1); + t = FIELD_DP32(t, ID_ISAR6, SB, 1); cpu->isar.id_isar6 = t; t = cpu->id_mmfr4; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 1b0c427277..6788c0f6ff 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -318,6 +318,7 @@ static void aarch64_max_initfn(Object *obj) t = FIELD_DP64(t, ID_AA64ISAR1, API, 0); t = FIELD_DP64(t, ID_AA64ISAR1, GPA, 1); t = FIELD_DP64(t, ID_AA64ISAR1, GPI, 0); + t = FIELD_DP64(t, ID_AA64ISAR1, SB, 1); cpu->isar.id_aa64isar1 = t; t = cpu->isar.id_aa64pfr0; @@ -349,6 +350,7 @@ static void aarch64_max_initfn(Object *obj) u = FIELD_DP32(u, ID_ISAR6, JSCVT, 1); u = FIELD_DP32(u, ID_ISAR6, DP, 1); u = FIELD_DP32(u, ID_ISAR6, FHM, 1); + u = FIELD_DP32(u, ID_ISAR6, SB, 1); cpu->isar.id_isar6 = u; /* diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index d3c8eaf089..4aa5a307e4 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1637,7 +1637,21 @@ static void handle_sync(DisasContext *s, uint32_t insn, reset_btype(s); gen_goto_tb(s, 0, s->pc); return; + + case 7: /* SB */ + if (crm != 0 || !dc_isar_feature(aa64_sb, s)) { + goto do_unallocated; + } + /* + * TODO: There is no speculation barrier opcode for TCG; + * MB and end the TB instead. + */ + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + gen_goto_tb(s, 0, s->pc); + return; + default: + do_unallocated: unallocated_encoding(s); return; } diff --git a/target/arm/translate.c b/target/arm/translate.c index 8f7f5b95aa..61adefb328 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9282,6 +9282,17 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) */ gen_goto_tb(s, 0, s->pc & ~1); return; + case 7: /* sb */ + if ((insn & 0xf) || !dc_isar_feature(aa32_sb, s)) { + goto illegal_op; + } + /* + * TODO: There is no speculation barrier opcode + * for TCG; MB and end the TB instead. + */ + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + gen_goto_tb(s, 0, s->pc & ~1); + return; default: goto illegal_op; } @@ -11900,6 +11911,17 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) */ gen_goto_tb(s, 0, s->pc & ~1); break; + case 7: /* sb */ + if ((insn & 0xf) || !dc_isar_feature(aa32_sb, s)) { + goto illegal_op; + } + /* + * TODO: There is no speculation barrier opcode + * for TCG; MB and end the TB instead. + */ + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + gen_goto_tb(s, 0, s->pc & ~1); + break; default: goto illegal_op; } From patchwork Fri Mar 1 20:04:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159517 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1149446jad; Fri, 1 Mar 2019 12:14:15 -0800 (PST) X-Google-Smtp-Source: APXvYqxu/SpM5RcEfMnn9iFFhGMETdavCNne18CV8k3wEVXqNyLBZ1BpvL04Fjco/5pgJqRi2gLH X-Received: by 2002:a0d:cb15:: with SMTP id n21mr4957659ywd.209.1551471254998; Fri, 01 Mar 2019 12:14:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551471254; cv=none; d=google.com; s=arc-20160816; b=bVIK7peXLvnRV2Oup9dHwvsUlfIFzrNywhhnXIN9/4hKg8BbcdPu/2EiMM/QLavbHg Jd9r9WvzKpl/L4uU8ev4+dkpdilI9VR8ZGn9yYM6tSdZfEtALn2vBbVUIEDBCJ2kDRN9 nP5nOsZhQe2XxeRpLApUZn+0wk123E4ernXbHzwGPF5cpkXaqGK0X9NdlcSSqQhP56JF yqQcBBIdg6i2yaJalLAM3PhDCqtbVZHXO1bi0bKDZwacDktW0DyQctPT9WhlwaX5jxmJ 2ocP/FjuSS1Ii+1EQVFsaQ04DbTmTAXDFxHEiz055sQleAKO8oOJqUv9yW++RgIjIxl1 6Dgg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=e5S+wkc/GorK1btTXbXOPpamD5OJCnpi6JpWnmoa3L8=; b=SP5fa6gRw+rk7sy17+rq292Z1eSvFBLtRmSgiIMA62ZJJNfjfOWYO5XM2xOoIL62UO 9471I5VWnzD62xkMl2Gw/t5TrLR7kPHnTNujwX/QIW1aZU2FlaXFA6brmu/0kMHsuV5t VZ1u5Bp4mlZu8Dr25hkXlTZD1dGRU95EKVvsrniyYiglQ1LSi5EaZ4Srp5WdhN+pSpfz yp1SZiX8RAvrN17zNrYKs+KjVPDquhYb4xj32HkV8CTrylJaBEIkWKzzuJJR4ziCsKDR ofyUgYG76+w1Z0HnZbp7YGgD8QDsCaa0zE+/xYBx/yQ/62kCk6WtXINbArUeK9GCGm1t EjTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=y1u8B99N; 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 o81si13321306ywc.424.2019.03.01.12.14.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:14:14 -0800 (PST) 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=y1u8B99N; 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 ([127.0.0.1]:43566 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoXu-0006VY-Hv for patch@linaro.org; Fri, 01 Mar 2019 15:14:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPd-0004kR-JN for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPM-0001qe-2t for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:29 -0500 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:36773) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoPH-0001eP-Vb for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:22 -0500 Received: by mail-pf1-x441.google.com with SMTP id n22so11916212pfa.3 for ; Fri, 01 Mar 2019 12:05:09 -0800 (PST) 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; bh=e5S+wkc/GorK1btTXbXOPpamD5OJCnpi6JpWnmoa3L8=; b=y1u8B99N6ugESVQViJP/shOR4NIGwvuQHF4L+uEOZ479/H1LKM0wIFicJHahLW2MSY ka0O0FIK4SrCjUo8sbi++Mp6WHuZbyaY/0wGLvWobSwXyxq8t76mJYkcUmV7G0a+MyU2 zOF9iEcYtFXqDMwh+nixFNQk80KzI5TV0gheKc5wr8G02BH0vIllZ5822DRoEWXbS75u 14ZRFp6k9YBry66inb7veDWxjpCySwoGxuHW5e118nUUfAfjHI+k59JDibOWLhDKQpB6 7aAeCKTWnSd+YFnleOXaF0egUVIbVp/fZhIGzmbaYnPMcdslcs4i4BkeDpd9CKv/JJoA LVUQ== 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; bh=e5S+wkc/GorK1btTXbXOPpamD5OJCnpi6JpWnmoa3L8=; b=Ychzj0shio/sUIpUH3lZCa3D8krTB10IWmLAvnybqQtpexcOgd35fHIcYDK9dxRiyI Vrvd54uEaMBBuyqp5rRsd73qUs3lIA9idU1RclUt3JdDuO7lRbXx4xSwzjj2BURCDDAi yKozfuhsInJa61YfZ7Y28bxHI18kWQ0lvH7HBe79AQZrHu3LCIBiyqNh3uK7JiN+eWHf ttaXgQy1GMWmcBRI6MGsM+cU4VwvUw3Z0bIS2uMwS75mC6ZarPR0XqJMGp0J2iOYxbvb VbjuTeG+WTAUcMVkzUl7ZiNRBQhL1wv3ExSBl5sRVbJvT65RIZhgTB13wlVFnOI9YoDy ta3w== X-Gm-Message-State: APjAAAVtWr0HHdjI5o7mnycCgAq6iLto4AInEP3m0k/CJ/21b2Jzfh8j HoTlUhU5i2c4g+DB3U0g2M7eebmkGL0= X-Received: by 2002:a65:4844:: with SMTP id i4mr6314062pgs.347.1551470708259; Fri, 01 Mar 2019 12:05:08 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:07 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:04:54 -0800 Message-Id: <20190301200501.16533-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::441 Subject: [Qemu-devel] [PATCH v3 03/10] target/arm: Implement ARMv8.0-PredInv 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/cpu.h | 13 ++++++++++- target/arm/cpu.c | 1 + target/arm/cpu64.c | 2 ++ target/arm/helper.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 361e51143c..c822f94236 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1060,7 +1060,8 @@ void pmu_init(ARMCPU *cpu); #define SCTLR_R (1U << 9) /* up to v6; RAZ in v7 */ #define SCTLR_UMA (1U << 9) /* v8 onward, AArch64 only */ #define SCTLR_F (1U << 10) /* up to v6 */ -#define SCTLR_SW (1U << 10) /* v7, RES0 in v8 */ +#define SCTLR_SW (1U << 10) /* v7 */ +#define SCTLR_EnRCTX (1U << 10) /* in v8.0-PredInv */ #define SCTLR_Z (1U << 11) /* in v7, RES1 in v8 */ #define SCTLR_EOS (1U << 11) /* v8.5-ExS */ #define SCTLR_I (1U << 12) @@ -3312,6 +3313,11 @@ static inline bool isar_feature_aa32_sb(const ARMISARegisters *id) return FIELD_EX32(id->id_isar6, ID_ISAR6, SB) != 0; } +static inline bool isar_feature_aa32_predinv(const ARMISARegisters *id) +{ + return FIELD_EX32(id->id_isar6, ID_ISAR6, SPECRES) != 0; +} + static inline bool isar_feature_aa32_fp16_arith(const ARMISARegisters *id) { /* @@ -3455,6 +3461,11 @@ static inline bool isar_feature_aa64_sb(const ARMISARegisters *id) return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, SB) != 0; } +static inline bool isar_feature_aa64_predinv(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, SPECRES) != 0; +} + static inline bool isar_feature_aa64_fp16(const ARMISARegisters *id) { /* We always set the AdvSIMD and FP fields identically wrt FP16. */ diff --git a/target/arm/cpu.c b/target/arm/cpu.c index ef069c268d..96f0ff0ec7 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2022,6 +2022,7 @@ static void arm_max_initfn(Object *obj) t = FIELD_DP32(t, ID_ISAR6, DP, 1); t = FIELD_DP32(t, ID_ISAR6, FHM, 1); t = FIELD_DP32(t, ID_ISAR6, SB, 1); + t = FIELD_DP32(t, ID_ISAR6, SPECRES, 1); cpu->isar.id_isar6 = t; t = cpu->id_mmfr4; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 6788c0f6ff..87337b6385 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -319,6 +319,7 @@ static void aarch64_max_initfn(Object *obj) t = FIELD_DP64(t, ID_AA64ISAR1, GPA, 1); t = FIELD_DP64(t, ID_AA64ISAR1, GPI, 0); t = FIELD_DP64(t, ID_AA64ISAR1, SB, 1); + t = FIELD_DP64(t, ID_AA64ISAR1, SPECRES, 1); cpu->isar.id_aa64isar1 = t; t = cpu->isar.id_aa64pfr0; @@ -351,6 +352,7 @@ static void aarch64_max_initfn(Object *obj) u = FIELD_DP32(u, ID_ISAR6, DP, 1); u = FIELD_DP32(u, ID_ISAR6, FHM, 1); u = FIELD_DP32(u, ID_ISAR6, SB, 1); + u = FIELD_DP32(u, ID_ISAR6, SPECRES, 1); cpu->isar.id_isar6 = u; /* diff --git a/target/arm/helper.c b/target/arm/helper.c index 49ff79a146..2607d39ad1 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5719,6 +5719,50 @@ static const ARMCPRegInfo pauth_reginfo[] = { }; #endif +static CPAccessResult access_predinv(CPUARMState *env, const ARMCPRegInfo *ri, + bool isread) +{ + int el = arm_current_el(env); + + if (el == 0) { + uint64_t sctlr = arm_sctlr(env, el); + if (!(sctlr & SCTLR_EnRCTX)) { + return CP_ACCESS_TRAP; + } + } else if (el == 1) { + uint64_t hcr = arm_hcr_el2_eff(env); + if (hcr & HCR_NV) { + return CP_ACCESS_TRAP_EL2; + } + } + return CP_ACCESS_OK; +} + +static const ARMCPRegInfo predinv_reginfo[] = { + { .name = "CFP_RCTX", .state = ARM_CP_STATE_AA64, + .opc0 = 1, .opc1 = 3, .crn = 7, .crm = 3, .opc2 = 4, + .type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv }, + { .name = "DVP_RCTX", .state = ARM_CP_STATE_AA64, + .opc0 = 1, .opc1 = 3, .crn = 7, .crm = 3, .opc2 = 5, + .type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv }, + { .name = "CPP_RCTX", .state = ARM_CP_STATE_AA64, + .opc0 = 1, .opc1 = 3, .crn = 7, .crm = 3, .opc2 = 7, + .type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv }, + /* + * Note the AArch32 opcodes have a different OPC1. + */ + { .name = "CFPRCTX", .state = ARM_CP_STATE_AA32, + .cp = 15, .opc1 = 0, .crn = 7, .crm = 3, .opc2 = 4, + .type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv }, + { .name = "DVPRCTX", .state = ARM_CP_STATE_AA32, + .cp = 15, .opc1 = 0, .crn = 7, .crm = 3, .opc2 = 5, + .type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv }, + { .name = "CPPRCTX", .state = ARM_CP_STATE_AA32, + .cp = 15, .opc1 = 0, .crn = 7, .crm = 3, .opc2 = 7, + .type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv }, + REGINFO_SENTINEL +}; + void register_cp_regs_for_features(ARMCPU *cpu) { /* Register all the coprocessor registers based on feature bits */ @@ -6618,6 +6662,17 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_arm_cp_regs(cpu, pauth_reginfo); } #endif + + /* + * While all v8.0 cpus support aarch64, QEMU does have configurations + * that do not set ID_AA64ISAR1, e.g. user-only qemu-arm -cpu max, + * which will set ID_ISAR6. + */ + if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) + ? cpu_isar_feature(aa64_predinv, cpu) + : cpu_isar_feature(aa32_predinv, cpu)) { + define_arm_cp_regs(cpu, predinv_reginfo); + } } void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) From patchwork Fri Mar 1 20:04:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159516 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1148163jad; Fri, 1 Mar 2019 12:12:56 -0800 (PST) X-Google-Smtp-Source: APXvYqxpQY8nGjj1lRh7FcIdpjBoqi34sU5Epx88up79d4Ig9gxiooCtB9gIgY0xsmlfSFC0NTy3 X-Received: by 2002:a81:11d7:: with SMTP id 206mr5208938ywr.267.1551471176741; Fri, 01 Mar 2019 12:12:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551471176; cv=none; d=google.com; s=arc-20160816; b=c3YOGRUkATXu0PvNXsfa3H8uNadVI5997/IoYItUeON1jKswWC+FQF8Q1YWz0mRRti UTImlq7Vwu6hre4qRssjslUIaSvupY16nFBejn7Pxyj+kMnGtqCEF2xeZJEbKuzixaFW q0WT7TlURbgtkxl8iNICIXjOYJcesau1wKQUxOXVWFZuFMMDBW/VD/8nDs/SBl1xuwjf wSRB2QfafYDBYwG4Vrp7tdLLN3ycI0XCXacji8rErdqTcnAx1lyzJXM0KvQtEhEVTc8f FmVhVnBdlmYubBdLpbHUD0X1ZPwMikXroP6uN1maMFcVXVRi+vlhOSHOnloZ/fLFyu1Q ZuYg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=SVxej404JeqYSoeOtDsixmlnz9jOeVJ+T9kAKItyhFs=; b=PsEozFezSAgFp6cccMBtRQA25mYuBP/WK1AifGAoyb0skejakbZDLD/UoXrQ3jq/iF lgo05brStsxqns/1zJb9xLHNkIT7a4+72NdywoF9OQAtg5zC9mgZG6+DrcKwmJlasq/t YgRM0tCWJ7jjyJ8iSjtYHm3fyn/85qDngaFHcIuoTPFHFmhbD/SlvdcJyeo6ZoJfkg5Y ABfx6yJogsLUOgUALikSCI5fnrnpFFu1tTEZnlWjhmbsEK9ayI1Iz0TitD7bv7F2Cy+M dZmC4QmPIuSWnfMUYtsUFfoA8V7rhl8aU8OUdyu7VNMHVLqkE7MYO2v7/aAQ2UDZqPh5 SUWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=B8+RVJx1; 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 h12si13326376ywc.46.2019.03.01.12.12.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:12:56 -0800 (PST) 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=B8+RVJx1; 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 ([127.0.0.1]:43558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoWe-0005Sa-8u for patch@linaro.org; Fri, 01 Mar 2019 15:12:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPM-0004IZ-DE for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPJ-0001o2-U2 for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:23 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:36776) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoPH-0001fE-Oh for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:20 -0500 Received: by mail-pf1-x444.google.com with SMTP id n22so11916254pfa.3 for ; Fri, 01 Mar 2019 12:05:11 -0800 (PST) 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; bh=SVxej404JeqYSoeOtDsixmlnz9jOeVJ+T9kAKItyhFs=; b=B8+RVJx1di4Z6gnfT5wsl+WXyIedlNuoPefZ1vDcpQN4muzBA1/c0aqaPKJKR1NjYx bXugzOJzs5vVv1rJ7LvI6PQnbJVi25CCyKM6BI7GFMteyJ/sCzZPPkf+U75oelfhxViH 2jPkXA4jFQ4ChAZtvI+VXRVHTGdhOZXTv1lzfkQm2Fc4g6exU/EleAUOSkjfnNnee7WX qC7HOzZkQtH3TTKIKZTTPZXifB5N9vhl3F0mxr2zmeXAlsJfIIGAo49JMP4R2mDULEfK j0C9Mk/1Wvw0nkHltL9Iky1zvRc+D14OFcWktkaqDWCTYaG5KfZwSqLlFpNhj87rqIL6 iDaw== 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; bh=SVxej404JeqYSoeOtDsixmlnz9jOeVJ+T9kAKItyhFs=; b=AQJj2frw5cEIhOJD0US6DG6hPBAIlwd1ySSwegVX2x+PD+45Ne+5hkSZEfkaUck4h0 vbcJb/ni5RgvbbsOwzW3bBpemqI+rCfQRk/DoK+H7rdxC5d1LzG0i3zFsuXpjuaXC0mu 3jSpZ3LLILYHCWP+vNVOVyJ5OVnLNrrtpmAbnr3dI93Gwkmr/ueeOLawrfqB7bXLXQbJ bRGaNYHXAFWH4XRePdKM61sijSIW0p2hpfwPeR25LeiXsICTXZ8oj+3tIxZrokABcGMq rQICibzCmmUl47VMGvMi5T6XeA5ajQYWtljAiTGmZPhkdzVD3x9aEEapd20SrjfrvYmp lG1g== X-Gm-Message-State: APjAAAVYb3r7WTJuHS0LDgBRZD0CN3Uk0ek0x0Xy6YL45rNQrt5x7w3o Uq65SPtPlAPhj8LlzCM+c7YZ0EtBOMQ= X-Received: by 2002:a62:4287:: with SMTP id h7mr7527105pfd.110.1551470709837; Fri, 01 Mar 2019 12:05:09 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:09 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:04:55 -0800 Message-Id: <20190301200501.16533-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 Subject: [Qemu-devel] [PATCH v3 04/10] target/arm: Split helper_msr_i_pstate into 3 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The EL0+UMA check is unique to DAIF. While SPSel had avoided the check by nature of already checking EL >= 1, the other post v8.0 extensions to MSR (imm) allow EL0 and do not require UMA. Avoid the unconditional write to pc and use raise_exception_ra to unwind. Signed-off-by: Richard Henderson --- target/arm/helper-a64.h | 3 +++ target/arm/helper.h | 1 - target/arm/internals.h | 15 ++++++++++++++ target/arm/helper-a64.c | 30 +++++++++++++++++++++++++++ target/arm/op_helper.c | 42 -------------------------------------- target/arm/translate-a64.c | 41 ++++++++++++++++++++++--------------- 6 files changed, 73 insertions(+), 59 deletions(-) -- 2.17.2 diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index aff8d6c9f3..a915c1247f 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -19,6 +19,9 @@ DEF_HELPER_FLAGS_2(udiv64, TCG_CALL_NO_RWG_SE, i64, i64, i64) DEF_HELPER_FLAGS_2(sdiv64, TCG_CALL_NO_RWG_SE, s64, s64, s64) DEF_HELPER_FLAGS_1(rbit64, TCG_CALL_NO_RWG_SE, i64, i64) +DEF_HELPER_2(msr_i_spsel, void, env, i32) +DEF_HELPER_2(msr_i_daifset, void, env, i32) +DEF_HELPER_2(msr_i_daifclear, void, env, i32) DEF_HELPER_3(vfp_cmph_a64, i64, f16, f16, ptr) DEF_HELPER_3(vfp_cmpeh_a64, i64, f16, f16, ptr) DEF_HELPER_3(vfp_cmps_a64, i64, f32, f32, ptr) diff --git a/target/arm/helper.h b/target/arm/helper.h index d363904278..6f0f386926 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -77,7 +77,6 @@ DEF_HELPER_2(get_cp_reg, i32, env, ptr) DEF_HELPER_3(set_cp_reg64, void, env, ptr, i64) DEF_HELPER_2(get_cp_reg64, i64, env, ptr) -DEF_HELPER_3(msr_i_pstate, void, env, i32, i32) DEF_HELPER_1(clear_pstate_ss, void, env) DEF_HELPER_2(get_r13_banked, i32, env, i32) diff --git a/target/arm/internals.h b/target/arm/internals.h index a4bd1becb7..587a1ddf58 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -968,4 +968,19 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, ARMMMUIdx mmu_idx, bool data); +static inline int exception_target_el(CPUARMState *env) +{ + int target_el = MAX(1, arm_current_el(env)); + + /* + * No such thing as secure EL1 if EL3 is aarch32, + * so update the target EL to EL3 in this case. + */ + if (arm_is_secure(env) && !arm_el_is_aa64(env, 3) && target_el == 1) { + target_el = 3; + } + + return target_el; +} + #endif diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index 70850e564d..796ef34b55 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -61,6 +61,36 @@ uint64_t HELPER(rbit64)(uint64_t x) return revbit64(x); } +void HELPER(msr_i_spsel)(CPUARMState *env, uint32_t imm) +{ + update_spsel(env, imm); +} + +static void daif_check(CPUARMState *env, uint32_t op, + uint32_t imm, uintptr_t ra) +{ + /* DAIF update to PSTATE. This is OK from EL0 only if UMA is set. */ + if (arm_current_el(env) == 0 && !(env->cp15.sctlr_el[1] & SCTLR_UMA)) { + raise_exception_ra(env, EXCP_UDEF, + syn_aa64_sysregtrap(0, extract32(op, 0, 3), + extract32(op, 3, 3), 4, + imm, 0x1f, 0), + exception_target_el(env), ra); + } +} + +void HELPER(msr_i_daifset)(CPUARMState *env, uint32_t imm) +{ + daif_check(env, 0x1e, imm, GETPC()); + env->daif |= (imm << 6) & PSTATE_DAIF; +} + +void HELPER(msr_i_daifclear)(CPUARMState *env, uint32_t imm) +{ + daif_check(env, 0x1f, imm, GETPC()); + env->daif &= ~((imm << 6) & PSTATE_DAIF); +} + /* Convert a softfloat float_relation_ (as returned by * the float*_compare functions) to the correct ARM * NZCV flag state. diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index c998eadfaa..c5721a866d 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -68,20 +68,6 @@ void raise_exception_ra(CPUARMState *env, uint32_t excp, uint32_t syndrome, cpu_loop_exit_restore(cs, ra); } -static int exception_target_el(CPUARMState *env) -{ - int target_el = MAX(1, arm_current_el(env)); - - /* No such thing as secure EL1 if EL3 is aarch32, so update the target EL - * to EL3 in this case. - */ - if (arm_is_secure(env) && !arm_el_is_aa64(env, 3) && target_el == 1) { - target_el = 3; - } - - return target_el; -} - uint32_t HELPER(neon_tbl)(uint32_t ireg, uint32_t def, void *vn, uint32_t maxindex) { @@ -875,34 +861,6 @@ uint64_t HELPER(get_cp_reg64)(CPUARMState *env, void *rip) return res; } -void HELPER(msr_i_pstate)(CPUARMState *env, uint32_t op, uint32_t imm) -{ - /* MSR_i to update PSTATE. This is OK from EL0 only if UMA is set. - * Note that SPSel is never OK from EL0; we rely on handle_msr_i() - * to catch that case at translate time. - */ - if (arm_current_el(env) == 0 && !(env->cp15.sctlr_el[1] & SCTLR_UMA)) { - uint32_t syndrome = syn_aa64_sysregtrap(0, extract32(op, 0, 3), - extract32(op, 3, 3), 4, - imm, 0x1f, 0); - raise_exception(env, EXCP_UDEF, syndrome, exception_target_el(env)); - } - - switch (op) { - case 0x05: /* SPSel */ - update_spsel(env, imm); - break; - case 0x1e: /* DAIFSet */ - env->daif |= (imm << 6) & PSTATE_DAIF; - break; - case 0x1f: /* DAIFClear */ - env->daif &= ~((imm << 6) & PSTATE_DAIF); - break; - default: - g_assert_not_reached(); - } -} - void HELPER(clear_pstate_ss)(CPUARMState *env) { env->pstate &= ~PSTATE_SS; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 4aa5a307e4..1e49d33365 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1661,29 +1661,38 @@ static void handle_sync(DisasContext *s, uint32_t insn, static void handle_msr_i(DisasContext *s, uint32_t insn, unsigned int op1, unsigned int op2, unsigned int crm) { + TCGv_i32 t1; int op = op1 << 3 | op2; + + /* End the TB by default, chaining is ok. */ + s->base.is_jmp = DISAS_TOO_MANY; + switch (op) { case 0x05: /* SPSel */ if (s->current_el == 0) { - unallocated_encoding(s); - return; + goto do_unallocated; } - /* fall through */ - case 0x1e: /* DAIFSet */ - case 0x1f: /* DAIFClear */ - { - TCGv_i32 tcg_imm = tcg_const_i32(crm); - TCGv_i32 tcg_op = tcg_const_i32(op); - gen_a64_set_pc_im(s->pc - 4); - gen_helper_msr_i_pstate(cpu_env, tcg_op, tcg_imm); - tcg_temp_free_i32(tcg_imm); - tcg_temp_free_i32(tcg_op); - /* For DAIFClear, exit the cpu loop to re-evaluate pending IRQs. */ - gen_a64_set_pc_im(s->pc); - s->base.is_jmp = (op == 0x1f ? DISAS_EXIT : DISAS_JUMP); + t1 = tcg_const_i32(crm & PSTATE_SP); + gen_helper_msr_i_spsel(cpu_env, t1); + tcg_temp_free_i32(t1); break; - } + + case 0x1e: /* DAIFSet */ + t1 = tcg_const_i32(crm); + gen_helper_msr_i_daifset(cpu_env, t1); + tcg_temp_free_i32(t1); + break; + + case 0x1f: /* DAIFClear */ + t1 = tcg_const_i32(crm); + gen_helper_msr_i_daifclear(cpu_env, t1); + tcg_temp_free_i32(t1); + /* For DAIFClear, exit the cpu loop to re-evaluate pending IRQs. */ + s->base.is_jmp = DISAS_UPDATE; + break; + default: + do_unallocated: unallocated_encoding(s); return; } From patchwork Fri Mar 1 20:04:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159509 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1143142jad; Fri, 1 Mar 2019 12:08:11 -0800 (PST) X-Google-Smtp-Source: APXvYqy9d+HaD82z+Gu3Sbko74J8HH5g1nLY4+Aihkm00yIDgGmuHfrkgm0jsbo6ffs3i0Wa2eU4 X-Received: by 2002:a81:3083:: with SMTP id w125mr5155107yww.170.1551470891142; Fri, 01 Mar 2019 12:08:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551470891; cv=none; d=google.com; s=arc-20160816; b=U/86uQ3Pp4/+M+1wk9RQZQjiuNCa+r38PCH9SuP4sFv9n/l7tVjuMHOn8iNF+fzWIu yC/XUA3bHMvf72a+nhfQQ8Jnay+OTx2iStp3X3MCnAKw/LWoSZFm3m7kxZrTVQIH/EdX 4SvePplTybO+IcT6F+WY81R7tfOm2BKCcLC2eZ4DyDtViQ1RSek28y6WTTXoMp1cCpaP lwqBO7UnkX9stzbVw42Kl9s+WYv9qydZb9oF2xjx1L1bQwGNR3i9ZwD16HCrGZ2p6geA qqkCwBmZU1g/ZYBMuGZQk5PTboXRNXWdlNQcLehP9R9T8YI8bAKMnKu4i5SLqwpPpH7R lkHg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=5II3W0GCv38vy4xT1Ex+ISMHLuNEGK1jNjKYydxihwE=; b=k4aTNXFtKL3XJKN9xpHYs6Ihqn1cDQar/7lpxCPmoTlu3MzZj+d+7J7GY83XAkQ/zy JHhXKo55FYIrzz46upCQ69uC/eR4FuLVaDBt4OXuPyZk6DDetWS0Z5ejF0cM+jr5Phw4 w+euRPVgWUMaoW8cno6tLcz2gAUDf905YGGxQHCcA/aOEraDNL74lJLrIqP6chnDEA+z HoCuyaYFIsw3pHZ30OSZ4zvSrQIwVsVC45JCLPARcyNXWkRuFY+xkZH69/pBJWEo5Fww xuwjDYiQzSeSZAemaWQ361ytgfw7Co1+XogqxnaVp1bB4ywIeaLyP34jSu7H74VJ6WMO 8l2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MerERbua; 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 14si6726117ywr.321.2019.03.01.12.08.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:08:11 -0800 (PST) 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=MerERbua; 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 ([127.0.0.1]:43463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoS2-0006eD-Gs for patch@linaro.org; Fri, 01 Mar 2019 15:08:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPL-0004HR-S5 for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPH-0001mG-T4 for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:21 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:41668) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoPG-0001g0-CA for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:19 -0500 Received: by mail-pl1-x62a.google.com with SMTP id y5so11968509plk.8 for ; Fri, 01 Mar 2019 12:05:12 -0800 (PST) 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; bh=5II3W0GCv38vy4xT1Ex+ISMHLuNEGK1jNjKYydxihwE=; b=MerERbuaofV26kXjUh1K6BayADEgmgDlWIYurPPlBSxNoH/lzMh0UWecdxMeInrsA6 82AlH/vRCtbgC17BeVNK9RW1c8aTRwQVZn7CqFHA+EcCf/7H9gNoNFqa0tSV7guN8zp/ jHoG8sEITstUzBn0FVXyZfYPJEtDKZpvYgU+iBrq7A7QhVlU3G+Z+NyVtRc7OIoN77S2 cL+K7jD9aBHu5YVg1tE9qJdN0H67cSZ/cFpFyb7kk3O+Vkry/9VIxtFliMnwfBt6JksK eH2z/BmSKdoX8ge0J2JGfLoNBDGt6NYJ0Yb705xfLIkx5+vG8EIvlWUMxQlagacNjiB8 uV0g== 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; bh=5II3W0GCv38vy4xT1Ex+ISMHLuNEGK1jNjKYydxihwE=; b=fOxHAvW2HkP8Kk0uGuAqv5/2fDktSeyDhPK9PpH2ZkMSqBc31o8Or6hhn21DV4L3qh VTaezCXYTUb8SCWGeWolNayxjJtb2wNt9vk/ZpBd8u9VWaPhRhdW2p0kiUmpNG7nBHJG xA4CDQb1cQuItlajZtb9bN7PYYoBoIwCpw76iYcVeaWAOpihTwU1xv9KMVOLzIhZKOYw bwpnKksa5zyV07dMykuIJSVo8yS8rMusWc5avvywZ6LoDbHOVT3FNVLwk9Ps2YI9tDfI BTl4bA6lWaxxCc1Jxq6U7veOur9Ti7TQxd6z7m3EODxmIt7tXyRgTEHoZmclHBuiHpSB 46Zw== X-Gm-Message-State: APjAAAVkBoObMPj1O3rADOLRTUfx1QL3x4imxZitiMN4ODonHHwh/8ED JZq5DMw4CTLSTTZ7N9UWt9qfEHQlLts= X-Received: by 2002:a17:902:b416:: with SMTP id x22mr7326291plr.285.1551470711499; Fri, 01 Mar 2019 12:05:11 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:10 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:04:56 -0800 Message-Id: <20190301200501.16533-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62a Subject: [Qemu-devel] [PATCH v3 05/10] target/arm: Add set/clear_pstate_bits, share gen_ss_advance 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We do not need an out-of-line helper for manipulating bits in pstate. While changing things, share the implementation of gen_ss_advance. Signed-off-by: Richard Henderson --- v3: Assert no manual change to CACHED_PSTATE_BITS, merged in from a previously separate patch. --- target/arm/helper.h | 2 -- target/arm/translate.h | 34 ++++++++++++++++++++++++++++++++++ target/arm/op_helper.c | 5 ----- target/arm/translate-a64.c | 11 ----------- target/arm/translate.c | 11 ----------- 5 files changed, 34 insertions(+), 29 deletions(-) -- 2.17.2 diff --git a/target/arm/helper.h b/target/arm/helper.h index 6f0f386926..583adba9b0 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -77,8 +77,6 @@ DEF_HELPER_2(get_cp_reg, i32, env, ptr) DEF_HELPER_3(set_cp_reg64, void, env, ptr, i64) DEF_HELPER_2(get_cp_reg64, i64, env, ptr) -DEF_HELPER_1(clear_pstate_ss, void, env) - DEF_HELPER_2(get_r13_banked, i32, env, i32) DEF_HELPER_3(set_r13_banked, void, env, i32, i32) diff --git a/target/arm/translate.h b/target/arm/translate.h index f25fe75685..912cc2a4a5 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -202,6 +202,40 @@ static inline TCGv_i32 get_ahp_flag(void) return ret; } +/* Set bits within PSTATE. */ +static inline void set_pstate_bits(uint32_t bits) +{ + TCGv_i32 p = tcg_temp_new_i32(); + + tcg_debug_assert(!(bits & CACHED_PSTATE_BITS)); + + tcg_gen_ld_i32(p, cpu_env, offsetof(CPUARMState, pstate)); + tcg_gen_ori_i32(p, p, bits); + tcg_gen_st_i32(p, cpu_env, offsetof(CPUARMState, pstate)); + tcg_temp_free_i32(p); +} + +/* Clear bits within PSTATE. */ +static inline void clear_pstate_bits(uint32_t bits) +{ + TCGv_i32 p = tcg_temp_new_i32(); + + tcg_debug_assert(!(bits & CACHED_PSTATE_BITS)); + + tcg_gen_ld_i32(p, cpu_env, offsetof(CPUARMState, pstate)); + tcg_gen_andi_i32(p, p, ~bits); + tcg_gen_st_i32(p, cpu_env, offsetof(CPUARMState, pstate)); + tcg_temp_free_i32(p); +} + +/* If the singlestep state is Active-not-pending, advance to Active-pending. */ +static inline void gen_ss_advance(DisasContext *s) +{ + if (s->ss_active) { + s->pstate_ss = 0; + clear_pstate_bits(PSTATE_SS); + } +} /* Vector operations shared between ARM and AArch64. */ extern const GVecGen3 bsl_op; diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index c5721a866d..8698b4dc83 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -861,11 +861,6 @@ uint64_t HELPER(get_cp_reg64)(CPUARMState *env, void *rip) return res; } -void HELPER(clear_pstate_ss)(CPUARMState *env) -{ - env->pstate &= ~PSTATE_SS; -} - void HELPER(pre_hvc)(CPUARMState *env) { ARMCPU *cpu = arm_env_get_cpu(env); diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 1e49d33365..eaeb43577d 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -421,17 +421,6 @@ static void gen_exception_bkpt_insn(DisasContext *s, int offset, s->base.is_jmp = DISAS_NORETURN; } -static void gen_ss_advance(DisasContext *s) -{ - /* If the singlestep state is Active-not-pending, advance to - * Active-pending. - */ - if (s->ss_active) { - s->pstate_ss = 0; - gen_helper_clear_pstate_ss(cpu_env); - } -} - static void gen_step_complete_exception(DisasContext *s) { /* We just completed step of an insn. Move from Active-not-pending diff --git a/target/arm/translate.c b/target/arm/translate.c index 61adefb328..57b1b20287 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -298,17 +298,6 @@ static void gen_exception(int excp, uint32_t syndrome, uint32_t target_el) tcg_temp_free_i32(tcg_excp); } -static void gen_ss_advance(DisasContext *s) -{ - /* If the singlestep state is Active-not-pending, advance to - * Active-pending. - */ - if (s->ss_active) { - s->pstate_ss = 0; - gen_helper_clear_pstate_ss(cpu_env); - } -} - static void gen_step_complete_exception(DisasContext *s) { /* We just completed step of an insn. Move from Active-not-pending From patchwork Fri Mar 1 20:04:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159513 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1146095jad; Fri, 1 Mar 2019 12:10:49 -0800 (PST) X-Google-Smtp-Source: APXvYqwW9NTo7QhqBmo/S9WzDKUpwp29E1eQz49K+h4TkGe7YWePLbHndoZhZ3dN8uNOLXMNAeee X-Received: by 2002:a25:10a:: with SMTP id 10mr5709953ybb.131.1551471048954; Fri, 01 Mar 2019 12:10:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551471048; cv=none; d=google.com; s=arc-20160816; b=GDeJ0cMliCepb2Xp95sxtQRXYm6Iy+szW6RG2Eo8loIUBuK8pNbeR9KZfbRIxDF2WB oVonx7VXzO6V09q4QMJ8YYfyk1XJHIGzJlIppsiWZAZiWmeDNQG3cJ7p18B/qgFS0Tzi Dxz5HOHaa6//xC+1Fr+um8h5weN0QyIgtHJMlojbpBj5NQr6lPcXiOFj5YobwmQ9Ww9q OONmyfLqJyUYnHPLe5R4UEQqP5Oex2kZAfmSHb7pL8dghfq0kEArAQujgmkxMXVyqqEH 9EvJKbHShTiHvzjljQ4L6gKjNm/s1ZQpdTJ9XI4Y+zqP1lm9lOpCB6mEm7GQQAWrviIh f0yw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=7E29T0HDlFgU1q0mOVCwGp4O+vEXm9+HF8E2P+7ECrw=; b=Fk8kmjwdwwVliFLi9KKEy2RfNmn6b3Pi7osWKYPtZ0KpQHqlROVjffSwSDJ+gN59KN Svvx/OoNbqWHhWwCJw5B0h1CZ9ngfcoUOTbpmtbFW2sC0/tpsCTCu5ZTMALVgbIck2P7 it+GsuI6XY2GxN6LY/ClKgthYufkwGUmf0qnChzZJrOw0CtCu+yYQX2c8HCGVv1G+nKn u6molPxkAhf07QwDiWPbZkv37VWXoEQnS0fuwO0jN0kOzZEkiv1KN1HA1/cBcQGXCz01 4IAACS4fFAW43bNgeqnUgZsR36537ca9n7VkeGfWR4254bk+NmZgzz49iYi8LFkWohDS 1NXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OZJdylyr; 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 o7si11340201ybg.227.2019.03.01.12.10.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:10:48 -0800 (PST) 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=OZJdylyr; 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 ([127.0.0.1]:43488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoUa-0002FX-BW for patch@linaro.org; Fri, 01 Mar 2019 15:10:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPq-00058D-3v for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPm-0002Dp-1h for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:51 -0500 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:43172) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoPj-0001gz-HH for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:48 -0500 Received: by mail-pf1-x42a.google.com with SMTP id q17so11895252pfh.10 for ; Fri, 01 Mar 2019 12:05:14 -0800 (PST) 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; bh=7E29T0HDlFgU1q0mOVCwGp4O+vEXm9+HF8E2P+7ECrw=; b=OZJdylyriVQkrsJgxYoBQuZ6G1bXa+MVszDqkFN3hitETosqtYhpvgMhs6Hgun4beP 2dwKUCAV/mjd1rb7A+fjRvlgHeFWkBm1xb0ICJMc2bY60ShJ6n+Rz7fXUJEdxHQaBma/ pqdnoBN9nFyK6NK406CqcAZ5wso24+IyruJNvxM+cT0/+q6oyNqXkpTUXtkGKh+KEme2 QzTxQwbs99PYyrwoJxXVga9rzKs8hLWKMiW885Mqh3FsGE+4XaMdjyUIMwCiD25y7zwI ZbIV/1yD2OD+byhQcQ1YhYq6NE6LSX556kkzSdznqNXsRG3tmjWKBVULgelrPLT6FHN+ tEiQ== 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; bh=7E29T0HDlFgU1q0mOVCwGp4O+vEXm9+HF8E2P+7ECrw=; b=cgERdCxQEQV7S2n2XowChWTUavL8kGw/KqZkHSdmFVyQ5k3uvSP0VguQcNHu4e8uIO ERzFjLqdGXFpIq8vpwCDh+HkpSvJHpuyjb6cYMtJOylAtZpsgUd2YlI4jeSC4pKrKMd0 xWp9Bl429CasbzqnJDGJLEs1QiSPRdMjrmhDoYGsv1lpK3NpOLF7qAY44sR6UHAOK7AL jCc1+fnqZtasMgFymlQAqm+ccnp18LBLFFBT1a7AXmnvI1zrNyvd29y6vXd4iIU2BS0U WEDrxntTYjnA2kBZy90bpOTbQe0gvKATQQmgPKX0ZYDflaBJVzp64NvIqssmj5k3k11A qK+w== X-Gm-Message-State: APjAAAXvgTGevkJdst1vIAZSNr/AvxLJLSNTI6eLjL/loWgdLd7K7cvJ Wqs2LnPtpL0NX5w6GpqDwNj13aMc7gY= X-Received: by 2002:a65:6294:: with SMTP id f20mr6483452pgv.174.1551470713132; Fri, 01 Mar 2019 12:05:13 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:12 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:04:57 -0800 Message-Id: <20190301200501.16533-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42a Subject: [Qemu-devel] [PATCH v3 06/10] target/arm: Rearrange disas_data_proc_reg 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This decoding more closely matches the ARMv8.4 Table C4-6, Encoding table for Data Processing - Register Group. In particular, op2 == 0 is now more than just Add/sub (with carry). Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 98 ++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 41 deletions(-) -- 2.17.2 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index eaeb43577d..12d2649c20 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -4494,11 +4494,10 @@ static void disas_data_proc_3src(DisasContext *s, uint32_t insn) } /* Add/subtract (with carry) - * 31 30 29 28 27 26 25 24 23 22 21 20 16 15 10 9 5 4 0 - * +--+--+--+------------------------+------+---------+------+-----+ - * |sf|op| S| 1 1 0 1 0 0 0 0 | rm | opcode2 | Rn | Rd | - * +--+--+--+------------------------+------+---------+------+-----+ - * [000000] + * 31 30 29 28 27 26 25 24 23 22 21 20 16 15 10 9 5 4 0 + * +--+--+--+------------------------+------+-------------+------+-----+ + * |sf|op| S| 1 1 0 1 0 0 0 0 | rm | 0 0 0 0 0 0 | Rn | Rd | + * +--+--+--+------------------------+------+-------------+------+-----+ */ static void disas_adc_sbc(DisasContext *s, uint32_t insn) @@ -4506,11 +4505,6 @@ static void disas_adc_sbc(DisasContext *s, uint32_t insn) unsigned int sf, op, setflags, rm, rn, rd; TCGv_i64 tcg_y, tcg_rn, tcg_rd; - if (extract32(insn, 10, 6) != 0) { - unallocated_encoding(s); - return; - } - sf = extract32(insn, 31, 1); op = extract32(insn, 30, 1); setflags = extract32(insn, 29, 1); @@ -5164,47 +5158,69 @@ static void disas_data_proc_2src(DisasContext *s, uint32_t insn) } } -/* Data processing - register */ +/* + * Data processing - register + * 31 30 29 28 25 21 20 16 10 0 + * +--+---+--+---+-------+-----+-------+-------+---------+ + * | |op0| |op1| 1 0 1 | op2 | | op3 | | + * +--+---+--+---+-------+-----+-------+-------+---------+ + */ static void disas_data_proc_reg(DisasContext *s, uint32_t insn) { - switch (extract32(insn, 24, 5)) { - case 0x0a: /* Logical (shifted register) */ - disas_logic_reg(s, insn); - break; - case 0x0b: /* Add/subtract */ - if (insn & (1 << 21)) { /* (extended register) */ - disas_add_sub_ext_reg(s, insn); + int op0 = extract32(insn, 30, 1); + int op1 = extract32(insn, 28, 1); + int op2 = extract32(insn, 21, 4); + int op3 = extract32(insn, 10, 6); + + if (!op1) { + if (op2 & 8) { + if (op2 & 1) { + /* Add/sub (extended register) */ + disas_add_sub_ext_reg(s, insn); + } else { + /* Add/sub (shifted register) */ + disas_add_sub_reg(s, insn); + } } else { - disas_add_sub_reg(s, insn); + /* Logical (shifted register) */ + disas_logic_reg(s, insn); } - break; - case 0x1b: /* Data-processing (3 source) */ - disas_data_proc_3src(s, insn); - break; - case 0x1a: - switch (extract32(insn, 21, 3)) { - case 0x0: /* Add/subtract (with carry) */ + return; + } + + switch (op2) { + case 0x0: + switch (op3) { + case 0x00: /* Add/subtract (with carry) */ disas_adc_sbc(s, insn); break; - case 0x2: /* Conditional compare */ - disas_cc(s, insn); /* both imm and reg forms */ - break; - case 0x4: /* Conditional select */ - disas_cond_select(s, insn); - break; - case 0x6: /* Data-processing */ - if (insn & (1 << 30)) { /* (1 source) */ - disas_data_proc_1src(s, insn); - } else { /* (2 source) */ - disas_data_proc_2src(s, insn); - } - break; + default: - unallocated_encoding(s); - break; + goto do_unallocated; } break; + + case 0x2: /* Conditional compare */ + disas_cc(s, insn); /* both imm and reg forms */ + break; + + case 0x4: /* Conditional select */ + disas_cond_select(s, insn); + break; + + case 0x6: /* Data-processing */ + if (op0) { /* (1 source) */ + disas_data_proc_1src(s, insn); + } else { /* (2 source) */ + disas_data_proc_2src(s, insn); + } + break; + case 0x8 ... 0xf: /* (3 source) */ + disas_data_proc_3src(s, insn); + break; + default: + do_unallocated: unallocated_encoding(s); break; } From patchwork Fri Mar 1 20:04:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159510 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1143394jad; Fri, 1 Mar 2019 12:08:25 -0800 (PST) X-Google-Smtp-Source: APXvYqw6e+XdOQ8eZc4UInNLVfFFbcbsZytAY3+RQFGxIGIDwc4i7ZIwkabP64Krk0428+Z4PgqL X-Received: by 2002:a25:e053:: with SMTP id x80mr5687762ybg.74.1551470904981; Fri, 01 Mar 2019 12:08:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551470904; cv=none; d=google.com; s=arc-20160816; b=UjnZdmUlt3imik1cL+0Zs07NkDX81g65V+5XOOH8lLKmwshSrguP/65cNUopKvTfft 31qmPs8L6vmhsXDK0gWhSGWA4ksaspmAGxcaooRk/B7v0fgzGyinLl/DbkhkOq+H1Us2 8cP8clq7Z+rpI/4FQlBbG2KVi4+D7XHQAACIVkr5yQ1UjRLO494SzDbm473lSG4aRW/O 14remQonNqszBPek2hnOYuOul6k1y8098t22qlTC4vhzqLrLrRmyubuh96GwycyDwX63 Nbj6FLFQNJ9g7dYYZoh6yDmNRyotfd9+Ni50cdj7nkvhcKDAuor3QbSIpwnwa5fs7KX7 r/fA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Kg6P2uEJ+aoxoinkMArLjz3096awj3cjZO5y9GHc4bg=; b=zYfoerWGwcLKk0CA1Podm7ztKW4n9p1HrsvooZX+PdrPo9vI5HP+eL4C9IOGT7hWlP pFiXCZzlTi1XLkMJhKkX98yQZn4MjzLwUP1C7gZD7a9ZmJKtDIpuuOTD/ZCEoroo8DTs Ta4E+xqEpCgtVvmCpmH4XEpRf8hUzpiFTGuLxHkCWnrqg3MT9SqlR37na8jkbjX5XUvh NzrdEqK7nGJZ4tM8qirET3bv9lQD2EFzOYZfjW8/WGNUaJlzS0lha24Kr9de9LVeiK3C 9LwAm3EUtPNBSq5NcJXEO0EqYTPXpAu266Av6zhpee9tJsY8yj1BorExNUrJC2tkjsX/ vRzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=H1PRpSOk; 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 11si8945349ywx.197.2019.03.01.12.08.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:08:24 -0800 (PST) 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=H1PRpSOk; 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 ([127.0.0.1]:43467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoSG-000732-Cd for patch@linaro.org; Fri, 01 Mar 2019 15:08:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPd-0004kQ-JJ for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPM-0001qw-5L for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:32 -0500 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:36774) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoPH-0001ha-Ul for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:21 -0500 Received: by mail-pf1-x441.google.com with SMTP id n22so11916355pfa.3 for ; Fri, 01 Mar 2019 12:05:15 -0800 (PST) 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; bh=Kg6P2uEJ+aoxoinkMArLjz3096awj3cjZO5y9GHc4bg=; b=H1PRpSOkIobt+ZnE9Ul00dToONR/GMdaSmAhpm4tfWzp50qUtU77qGP53xcmizjwZF AZQkhw4uGnyIMpqdZszWxnn3WOHIyn+4xxpg2Siua+rsm6As5eaEE1v79U6OMu3YiVVo cMHQ80fBRSlmTwAPM6E7JAIw0it3jLNZYPxVOGR9WuTQYzp/521UxSrkGpRsb1syMqBo zqMgAKlvEUDXTxcB6Zu3oJernUEyk0SYlR2WIDE36a0+4BwqVYgyxJh9SbNZlAQ6Pg83 AOnfASnGhuP6UJLhXgQO6pWEjW3OvA5qyLDka3TgAINwtU5zevxeG2mQsqSPDJOv7l8Z pEWQ== 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; bh=Kg6P2uEJ+aoxoinkMArLjz3096awj3cjZO5y9GHc4bg=; b=TDYCMBgjSHjDUbD9G6+lvNnWPwfkz68AHONS9xipKsHEsytw2AsIjfVH5gSbEjKukn 5ipYvu8jAe9NtD3C9FX04O2Edrj3cAs13JcbGe+1Pu3CErrV57xxq7PcP4nW+g7g/ti3 uYcGE2UIbfvPbAqQZCrV+kJcCMK7/Sk3IDzYMfOjfaAzr+NYxv9L0VcUtfxcMOyRfyX4 yANm8df2qujUQlHIXhTrqQATY5nLpSRF0qQvX1Q5Qinj5Y/GZSKknmFmMX23jCz/06uo H3mov+68LJFTpCmYxMK6bW5GnWCm0f03scA1uHSnboRfYhTAz9Ay3voRyGIdIyXFuiOI AArw== X-Gm-Message-State: APjAAAWVXGpaV6sCCrjUicAuHqDWNMal1TGVqKo/z9k4lhvBmIPGj7BH BVnT9XYS6xC03VVYt1J4savjz92Sekg= X-Received: by 2002:a63:4287:: with SMTP id p129mr6308689pga.84.1551470714585; Fri, 01 Mar 2019 12:05:14 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:13 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:04:58 -0800 Message-Id: <20190301200501.16533-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::441 Subject: [Qemu-devel] [PATCH v3 07/10] target/arm: Implement ARMv8.4-CondM 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Tested-by: Laurent Desnogues Signed-off-by: Richard Henderson --- target/arm/cpu.h | 5 ++ linux-user/elfload.c | 1 + target/arm/cpu64.c | 1 + target/arm/translate-a64.c | 97 +++++++++++++++++++++++++++++++++++++- 4 files changed, 103 insertions(+), 1 deletion(-) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index c822f94236..fc2909ea6d 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3431,6 +3431,11 @@ static inline bool isar_feature_aa64_fhm(const ARMISARegisters *id) return FIELD_EX64(id->id_aa64isar0, ID_AA64ISAR0, FHM) != 0; } +static inline bool isar_feature_aa64_condm_4(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64isar0, ID_AA64ISAR0, TS) != 0; +} + static inline bool isar_feature_aa64_jscvt(const ARMISARegisters *id) { return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, JSCVT) != 0; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 6cfebe1446..6e8762b40d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -605,6 +605,7 @@ static uint32_t get_elf_hwcap(void) GET_FEATURE_ID(aa64_fhm, ARM_HWCAP_A64_ASIMDFHM); GET_FEATURE_ID(aa64_jscvt, ARM_HWCAP_A64_JSCVT); GET_FEATURE_ID(aa64_sb, ARM_HWCAP_A64_SB); + GET_FEATURE_ID(aa64_condm_4, ARM_HWCAP_A64_FLAGM); #undef GET_FEATURE_ID diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 87337b6385..fcf79321e2 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -309,6 +309,7 @@ static void aarch64_max_initfn(Object *obj) t = FIELD_DP64(t, ID_AA64ISAR0, SM4, 1); t = FIELD_DP64(t, ID_AA64ISAR0, DP, 1); t = FIELD_DP64(t, ID_AA64ISAR0, FHM, 1); + t = FIELD_DP64(t, ID_AA64ISAR0, TS, 1); cpu->isar.id_aa64isar0 = t; t = cpu->isar.id_aa64isar1; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 12d2649c20..49a09b58e3 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1657,6 +1657,14 @@ static void handle_msr_i(DisasContext *s, uint32_t insn, s->base.is_jmp = DISAS_TOO_MANY; switch (op) { + case 0x00: /* CFINV */ + if (crm != 0 || !dc_isar_feature(aa64_condm_4, s)) { + goto do_unallocated; + } + tcg_gen_xori_i32(cpu_CF, cpu_CF, 1); + s->base.is_jmp = DISAS_NEXT; + break; + case 0x05: /* SPSel */ if (s->current_el == 0) { goto do_unallocated; @@ -1710,7 +1718,6 @@ static void gen_get_nzcv(TCGv_i64 tcg_rt) } static void gen_set_nzcv(TCGv_i64 tcg_rt) - { TCGv_i32 nzcv = tcg_temp_new_i32(); @@ -4529,6 +4536,82 @@ static void disas_adc_sbc(DisasContext *s, uint32_t insn) } } +/* Rotate right into flags + * 31 30 29 21 15 10 5 4 0 + * +--+--+--+-----------------+--------+-----------+------+--+------+ + * |sf|op| S| 1 1 0 1 0 0 0 0 | imm6 | 0 0 0 0 1 | Rn |o2| mask | + * +--+--+--+-----------------+--------+-----------+------+--+------+ + */ +static void disas_rotate_right_into_flags(DisasContext *s, uint32_t insn) +{ + int mask = extract32(insn, 0, 4); + int o2 = extract32(insn, 4, 1); + int rn = extract32(insn, 5, 5); + int imm6 = extract32(insn, 15, 6); + int sf_op_s = extract32(insn, 29, 3); + TCGv_i64 tcg_rn; + TCGv_i32 nzcv; + + if (sf_op_s != 5 || o2 != 0 || !dc_isar_feature(aa64_condm_4, s)) { + unallocated_encoding(s); + return; + } + + tcg_rn = read_cpu_reg(s, rn, 1); + tcg_gen_rotri_i64(tcg_rn, tcg_rn, imm6); + + nzcv = tcg_temp_new_i32(); + tcg_gen_extrl_i64_i32(nzcv, tcg_rn); + + if (mask & 8) { /* N */ + tcg_gen_shli_i32(cpu_NF, nzcv, 31 - 3); + } + if (mask & 4) { /* Z */ + tcg_gen_not_i32(cpu_ZF, nzcv); + tcg_gen_andi_i32(cpu_ZF, cpu_ZF, 4); + } + if (mask & 2) { /* C */ + tcg_gen_extract_i32(cpu_CF, nzcv, 1, 1); + } + if (mask & 1) { /* V */ + tcg_gen_shli_i32(cpu_VF, nzcv, 31 - 0); + } + + tcg_temp_free_i32(nzcv); +} + +/* Evaluate into flags + * 31 30 29 21 15 14 10 5 4 0 + * +--+--+--+-----------------+---------+----+---------+------+--+------+ + * |sf|op| S| 1 1 0 1 0 0 0 0 | opcode2 | sz | 0 0 1 0 | Rn |o3| mask | + * +--+--+--+-----------------+---------+----+---------+------+--+------+ + */ +static void disas_evaluate_into_flags(DisasContext *s, uint32_t insn) +{ + int o3_mask = extract32(insn, 0, 5); + int rn = extract32(insn, 5, 5); + int o2 = extract32(insn, 15, 6); + int sz = extract32(insn, 14, 1); + int sf_op_s = extract32(insn, 29, 3); + TCGv_i32 tmp; + int shift; + + if (sf_op_s != 1 || o2 != 0 || o3_mask != 0xd || + !dc_isar_feature(aa64_condm_4, s)) { + unallocated_encoding(s); + return; + } + shift = sz ? 16 : 24; /* SETF16 or SETF8 */ + + tmp = tcg_temp_new_i32(); + tcg_gen_extrl_i64_i32(tmp, cpu_reg(s, rn)); + tcg_gen_shli_i32(cpu_NF, tmp, shift); + tcg_gen_shli_i32(cpu_VF, tmp, shift - 1); + tcg_gen_mov_i32(cpu_ZF, cpu_NF); + tcg_gen_xor_i32(cpu_VF, cpu_VF, cpu_NF); + tcg_temp_free_i32(tmp); +} + /* Conditional compare (immediate / register) * 31 30 29 28 27 26 25 24 23 22 21 20 16 15 12 11 10 9 5 4 3 0 * +--+--+--+------------------------+--------+------+----+--+------+--+-----+ @@ -5195,6 +5278,18 @@ static void disas_data_proc_reg(DisasContext *s, uint32_t insn) disas_adc_sbc(s, insn); break; + case 0x01: /* Rotate right into flags */ + case 0x21: + disas_rotate_right_into_flags(s, insn); + break; + + case 0x02: /* Evaluate into flags */ + case 0x12: + case 0x22: + case 0x32: + disas_evaluate_into_flags(s, insn); + break; + default: goto do_unallocated; } From patchwork Fri Mar 1 20:04:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159515 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1147843jad; Fri, 1 Mar 2019 12:12:36 -0800 (PST) X-Google-Smtp-Source: APXvYqxSCg0X8SmJabHLkTpTM7tne4A801qKIatIhtfe+gmWNWWlZtcK2xzPPlWDF1z39MsaicKT X-Received: by 2002:a81:142:: with SMTP id 63mr5361634ywb.119.1551471156787; Fri, 01 Mar 2019 12:12:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551471156; cv=none; d=google.com; s=arc-20160816; b=0IqWuW7jow3rfuHGDrAcR5sSqD/wyFVZ0YalWHQhf2M6NkK/h4dEX0tAy1sMyXRf9v C0XLeBT82VFeZlfWmQCcHOnYAlv4j2F6QMSVtbEwUZ61/oXiAi+CJkfFSUXE617Ocr9Y bvkePtkdYwKvqk+q9h/105gAPn1HG1NVL8RVuy0VRh7FW+hUDLRmzyIypUJT46xSdcno PjnTesr6afARqV1QBzdAdmKnCCFYwMOWy7UECrX3efwxIe/pGKzn2H4/dj0f3hHuXxaa OVwMOi17PYa/A2JC4cuUK3GbPonPhpB/A++6mWb1Ia/yXPMxfygqktkxaxZMh5WVKJCr xRLw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=eOEqjwU+gxLJhyhEjN31Tao3yE+OznWOjc56kznMM8E=; b=L+lSLctOXZAdxjFkuw6ioZxXYZfQUJfTd1uE54lukOYDL6XmlAzUKwri9TA1Ye7mtJ rInpr8o++7DyGj78YBiHToSO7EmTS0NtArHRbILS3Ygfp7z4qN1LBlmPkA1pTwNl0RJh vMvx1k9C/7bE+C4TrQwS6R6C7pNmfT05piErtfqqk6EelXw80MOlO9PP8HnPY7dznpPw fwhZ229teHJQUQBAlKLsMA0Otu8cwLx7h+q8CLvqB1AL5rZPZXf8R9cucLT0iZFEP/xE y3tNbKhBk23qYJi8MtCFS6pzwztRjJGCOWelUZ2/3oHYWaAjPgShuNVXAMFkCz6uBniP PSeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Jwaroq/u"; 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 g143si14111898ywe.337.2019.03.01.12.12.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:12:36 -0800 (PST) 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="Jwaroq/u"; 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 ([127.0.0.1]:43547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoWK-0004i3-Ax for patch@linaro.org; Fri, 01 Mar 2019 15:12:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPM-0004Ic-Dn for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPJ-0001nm-TP for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:23 -0500 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:40799) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoPH-0001iJ-Pe for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:20 -0500 Received: by mail-pg1-x542.google.com with SMTP id u9so11929339pgo.7 for ; Fri, 01 Mar 2019 12:05:17 -0800 (PST) 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; bh=eOEqjwU+gxLJhyhEjN31Tao3yE+OznWOjc56kznMM8E=; b=Jwaroq/uHmzHxhc6ANXzjlrxwhGbSaNvkLoS6aHu/mEJWhAC+HZAR2v+/4tTgvDJv0 /93uZWRTBB77Kv0S7LMR38isXa6sfjq11tcV2znGZl4yotEH7zxjt/s4Rhxf48qN8Rrv Qt7yjaQ3IIOoPL1NIyfwtrkOEulWzC2YcAkuqqwJkURUkHNhVNB0VhKgOXLxnfud3a9U 3AOohqQ2d0dGA+RI+QR9U0/id1wsa1GiGVgu2e7kboDDMgnrVVPo7g+GBFk3mdunhPvt L02deU23duLFK2dsDmb1qApFASkokMnYeWK1t5s8z1kGwTyqoP4ibArguBl+KoEgSwnq 92uw== 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; bh=eOEqjwU+gxLJhyhEjN31Tao3yE+OznWOjc56kznMM8E=; b=ORwkBhU9O/EZE65HM9OwvNfdgJc9iIwiN2534FVSxeU9R2uWFlEEA9T4SONsvD5QE7 K8mZaywGYl0NUH3J6Pe8VPJqzJOB6HgOIQ5dN/XJnpzYVuEnENZujrAxAvlDFnepJUBS 3m9BVADMexh2YI/IOe1sa6C4L5iJdGVFXMJ0MQw4cA32FEIfGQFxc9PcRDDU38jIPwTo iVLO+BrcL3OTbmL3aW5uDBI0PucrA4Pb5aTdlaJY/uNjMNQiXxxa7bsUSnRgIjQBIpGP dYA8UnJl0K1wDt+ZQ3gO3mhE3rN/xgOQZnc13bhvDO+eE3yuWC4FFiL9Iw8YrzWwoMEc yB/Q== X-Gm-Message-State: APjAAAVJp/MPT+HdwKGfn1PGwz8Nwmv9W6mvorvNAsZlrqQzWFLduRc3 fp8yXajl26Oi7yFHYr185XYRuTw2MP4= X-Received: by 2002:a63:e553:: with SMTP id z19mr6509309pgj.331.1551470716244; Fri, 01 Mar 2019 12:05:16 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:15 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:04:59 -0800 Message-Id: <20190301200501.16533-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 Subject: [Qemu-devel] [PATCH v3 08/10] target/arm: Implement ARMv8.5-CondM 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Tested-by: Laurent Desnogues Signed-off-by: Richard Henderson --- v2: Update ID_AA64ISAR0.TS. --- target/arm/cpu.h | 5 ++++ target/arm/cpu64.c | 2 +- target/arm/translate-a64.c | 58 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index fc2909ea6d..a7aaec63d7 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3436,6 +3436,11 @@ static inline bool isar_feature_aa64_condm_4(const ARMISARegisters *id) return FIELD_EX64(id->id_aa64isar0, ID_AA64ISAR0, TS) != 0; } +static inline bool isar_feature_aa64_condm_5(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64isar0, ID_AA64ISAR0, TS) >= 2; +} + static inline bool isar_feature_aa64_jscvt(const ARMISARegisters *id) { return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, JSCVT) != 0; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index fcf79321e2..9fe0844a82 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -309,7 +309,7 @@ static void aarch64_max_initfn(Object *obj) t = FIELD_DP64(t, ID_AA64ISAR0, SM4, 1); t = FIELD_DP64(t, ID_AA64ISAR0, DP, 1); t = FIELD_DP64(t, ID_AA64ISAR0, FHM, 1); - t = FIELD_DP64(t, ID_AA64ISAR0, TS, 1); + t = FIELD_DP64(t, ID_AA64ISAR0, TS, 2); /* v8.5-CondM */ cpu->isar.id_aa64isar0 = t; t = cpu->isar.id_aa64isar1; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 49a09b58e3..c2b9e800c8 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1646,6 +1646,48 @@ static void handle_sync(DisasContext *s, uint32_t insn, } } +static void gen_xaflag(void) +{ + TCGv_i32 z = tcg_temp_new_i32(); + + tcg_gen_setcondi_i32(TCG_COND_EQ, z, cpu_ZF, 0); + + /* + * (!C & !Z) << 31 + * (!(C | Z)) << 31 + * ~((C | Z) << 31) + * ~-(C | Z) + * (C | Z) - 1 + */ + tcg_gen_or_i32(cpu_NF, cpu_CF, z); + tcg_gen_subi_i32(cpu_NF, cpu_NF, 1); + + /* !(Z & C) */ + tcg_gen_and_i32(cpu_ZF, z, cpu_CF); + tcg_gen_xori_i32(cpu_ZF, cpu_ZF, 1); + + /* (!C & Z) << 31 -> -(Z & ~C) */ + tcg_gen_andc_i32(cpu_VF, z, cpu_CF); + tcg_gen_neg_i32(cpu_VF, cpu_VF); + + /* C | Z */ + tcg_gen_or_i32(cpu_CF, cpu_CF, z); + + tcg_temp_free_i32(z); +} + +static void gen_axflag(void) +{ + tcg_gen_sari_i32(cpu_VF, cpu_VF, 31); /* V ? -1 : 0 */ + tcg_gen_andc_i32(cpu_CF, cpu_CF, cpu_VF); /* C & !V */ + + /* !(Z | V) -> !(!ZF | V) -> ZF & !V -> ZF & ~VF */ + tcg_gen_andc_i32(cpu_ZF, cpu_ZF, cpu_VF); + + tcg_gen_movi_i32(cpu_NF, 0); + tcg_gen_movi_i32(cpu_VF, 0); +} + /* MSR (immediate) - move immediate to processor state field */ static void handle_msr_i(DisasContext *s, uint32_t insn, unsigned int op1, unsigned int op2, unsigned int crm) @@ -1665,6 +1707,22 @@ static void handle_msr_i(DisasContext *s, uint32_t insn, s->base.is_jmp = DISAS_NEXT; break; + case 0x01: /* XAFlag */ + if (crm != 0 || !dc_isar_feature(aa64_condm_5, s)) { + goto do_unallocated; + } + gen_xaflag(); + s->base.is_jmp = DISAS_NEXT; + break; + + case 0x02: /* AXFlag */ + if (crm != 0 || !dc_isar_feature(aa64_condm_5, s)) { + goto do_unallocated; + } + gen_axflag(); + s->base.is_jmp = DISAS_NEXT; + break; + case 0x05: /* SPSel */ if (s->current_el == 0) { goto do_unallocated; From patchwork Fri Mar 1 20:05:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159512 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1146017jad; Fri, 1 Mar 2019 12:10:43 -0800 (PST) X-Google-Smtp-Source: APXvYqy5oAJlgnQByySqbD0e9w/qLZmfHprYXOkagbvX3/y8JDLjAjdDSaCeLX2Wu9m65FNAvO2r X-Received: by 2002:a81:4ed6:: with SMTP id c205mr5149202ywb.13.1551471043885; Fri, 01 Mar 2019 12:10:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551471043; cv=none; d=google.com; s=arc-20160816; b=wTj5XFPkkHx1ojqXbVRP9SPn0etTK8JFxP12oLOknrR5owBPLFbHGRvlW/j5iEJON3 UQh76epcxWd+rAVHrsDbuzPmeVvEV9XfQiuusImhmSdeNswK8YrYy+PgiE3A2JsBfA7E 4srYoESWXeTLGVlb2CBKAKp2ZL2MSqk7mhS+iFiXsdo2MLPpaj3oWAlp9zDKEX/qS9Ag CQFSRf6qPvF1uw7HgG/lEKAfIcNmEu6XvBF7B2M3NSzChfbxwqi/SxJphNtcOBQ9OODe vCGCefln+fV9j9QbxsdZyFqF2FLwjFzbe/PB7lSAhuGsKWloTaV04Dowddh+MknkAh7l Y34w== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=tUyLPFYqwpjAIVN/Lq+PNWoyDi0ukBwdF+if0JEltxc=; b=N56SJsIK+aZ8OrPaY+VPqQAMbWh+G4KTTbsXbUlTW0joZbHbm/12DI99A4+iTWeFdY HOjQArR+hC1uLxQ2JDLdeaOqEJl5R0F0sJNSLYNYMhbJaOwDtw3/VGcQa6GHsBexkNPP ARXlKRj9YNfsWDLlGZ2no3mHXB2iOrq9BsgJAHDLBS+B01DYJMDdQBsBMfmLwm4C7j/a iJWVZeE3PPCVdWruIgjkpr2ppO0/nJs0fA0AIR+d3nBZjP9pDgt+0p29y3DZc6IpOMIl QkpFl/FkEafx+9unW0T3mLyY13jze2HSlLIKh/YEjW7NcRb979sqDvF398mywZBg9T+i d3nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=M0j7hOzD; 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 d185si13463501ywe.27.2019.03.01.12.10.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:10:43 -0800 (PST) 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=M0j7hOzD; 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 ([127.0.0.1]:43486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoUV-0002Ap-AU for patch@linaro.org; Fri, 01 Mar 2019 15:10:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPd-0004kO-JL for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPM-0001rz-H6 for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:29 -0500 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:45111) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoPJ-0001lJ-RT for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:23 -0500 Received: by mail-pg1-x52a.google.com with SMTP id y4so11905105pgc.12 for ; Fri, 01 Mar 2019 12:05:19 -0800 (PST) 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; bh=tUyLPFYqwpjAIVN/Lq+PNWoyDi0ukBwdF+if0JEltxc=; b=M0j7hOzDI/Fi8wWVeYBBJgnfFzTuxhPgVNo8jCiFMfnl6sIPovfBCGz82abnluic1x 1zkX3HZhjxQ770OcHWifaeuAD5CVOjxAVhg/gAskNZeRPKW8Xq5SgdvqOANOmRK+MN8n eE5Ahkj9Yf8IDwDlQATNG7sZpDzsxGfYoxHHlPz8xkDexBwVX4Wowl3slqwIPgWhIUyt ihRAmfHJ5PnBpROO8tiS9bqDinWqINVS7JoWP5D/eRQvEC07W2RrPK4AiKHaUsYT79PQ LfDRAuwwKOuykHZ5Mp/dL2RRF4ESpcSTEJz9NnIIC5RZllX8zVswk15cXPaxYXBO/aui 9ojg== 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; bh=tUyLPFYqwpjAIVN/Lq+PNWoyDi0ukBwdF+if0JEltxc=; b=fBQFZcVXcuXWIW4XgAuhrObF0n7ceSvGoeFiBg4JWZn2cFuHAhm4iXwXqzdVkLKJPL B+swLKtMSqVTNVeMTBR+QVrxsWOHI2sTuoLk3dOy8NnyVglgFf+d7UbFaH8XbFaBxmfQ j8AUKxxFnuHW267ONQDyxzuDUz2dQTk25Jy/dI62Pg247qtfXB0M3M6sAeav7OwwAVLN ECaVTgjzvwRR2MRE7Sn6lYCE78WclxWqfmh05ZMHHfY3h5GSlJV8w7FpSJDOTPTQoqNd RGQuJYvTgF0pXYeFqC5Op3//RS/qed5h7Kx2ubRYzUrpTSZiH+qDunSeir+EGgYfM7vn f2dQ== X-Gm-Message-State: APjAAAWKgL3HwOLA5A63LAYCE5ejQdBuZBzTwx4WojjLdQ0nrQUFZk7r YuLd1E4yxzkumbWpT8KNjNkjXkjCGB0= X-Received: by 2002:a65:520a:: with SMTP id o10mr6736883pgp.276.1551470718125; Fri, 01 Mar 2019 12:05:18 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:17 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:05:00 -0800 Message-Id: <20190301200501.16533-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::52a Subject: [Qemu-devel] [PATCH v3 09/10] target/arm: Restructure handle_fp_1src_{single, double} 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will allow sharing code that adjusts rmode beyond the existing users. Tested-by: Laurent Desnogues Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 90 +++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 41 deletions(-) -- 2.17.2 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index c2b9e800c8..94184ea5af 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -5686,55 +5686,59 @@ static void handle_fp_1src_half(DisasContext *s, int opcode, int rd, int rn) /* Floating-point data-processing (1 source) - single precision */ static void handle_fp_1src_single(DisasContext *s, int opcode, int rd, int rn) { + void (*gen_fpst)(TCGv_i32, TCGv_i32, TCGv_ptr); + TCGv_i32 tcg_op, tcg_res; TCGv_ptr fpst; - TCGv_i32 tcg_op; - TCGv_i32 tcg_res; + int rmode = -1; - fpst = get_fpstatus_ptr(false); tcg_op = read_fp_sreg(s, rn); tcg_res = tcg_temp_new_i32(); switch (opcode) { case 0x0: /* FMOV */ tcg_gen_mov_i32(tcg_res, tcg_op); - break; + goto done; case 0x1: /* FABS */ gen_helper_vfp_abss(tcg_res, tcg_op); - break; + goto done; case 0x2: /* FNEG */ gen_helper_vfp_negs(tcg_res, tcg_op); - break; + goto done; case 0x3: /* FSQRT */ gen_helper_vfp_sqrts(tcg_res, tcg_op, cpu_env); - break; + goto done; case 0x8: /* FRINTN */ case 0x9: /* FRINTP */ case 0xa: /* FRINTM */ case 0xb: /* FRINTZ */ case 0xc: /* FRINTA */ - { - TCGv_i32 tcg_rmode = tcg_const_i32(arm_rmode_to_sf(opcode & 7)); - - gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); - gen_helper_rints(tcg_res, tcg_op, fpst); - - gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); - tcg_temp_free_i32(tcg_rmode); + rmode = arm_rmode_to_sf(opcode & 7); + gen_fpst = gen_helper_rints; break; - } case 0xe: /* FRINTX */ - gen_helper_rints_exact(tcg_res, tcg_op, fpst); + gen_fpst = gen_helper_rints_exact; break; case 0xf: /* FRINTI */ - gen_helper_rints(tcg_res, tcg_op, fpst); + gen_fpst = gen_helper_rints; break; default: - abort(); + g_assert_not_reached(); } - write_fp_sreg(s, rd, tcg_res); - + fpst = get_fpstatus_ptr(false); + if (rmode >= 0) { + TCGv_i32 tcg_rmode = tcg_const_i32(rmode); + gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); + gen_fpst(tcg_res, tcg_op, fpst); + gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); + tcg_temp_free_i32(tcg_rmode); + } else { + gen_fpst(tcg_res, tcg_op, fpst); + } tcg_temp_free_ptr(fpst); + + done: + write_fp_sreg(s, rd, tcg_res); tcg_temp_free_i32(tcg_op); tcg_temp_free_i32(tcg_res); } @@ -5742,9 +5746,10 @@ static void handle_fp_1src_single(DisasContext *s, int opcode, int rd, int rn) /* Floating-point data-processing (1 source) - double precision */ static void handle_fp_1src_double(DisasContext *s, int opcode, int rd, int rn) { + void (*gen_fpst)(TCGv_i64, TCGv_i64, TCGv_ptr); + TCGv_i64 tcg_op, tcg_res; TCGv_ptr fpst; - TCGv_i64 tcg_op; - TCGv_i64 tcg_res; + int rmode = -1; switch (opcode) { case 0x0: /* FMOV */ @@ -5752,48 +5757,51 @@ static void handle_fp_1src_double(DisasContext *s, int opcode, int rd, int rn) return; } - fpst = get_fpstatus_ptr(false); tcg_op = read_fp_dreg(s, rn); tcg_res = tcg_temp_new_i64(); switch (opcode) { case 0x1: /* FABS */ gen_helper_vfp_absd(tcg_res, tcg_op); - break; + goto done; case 0x2: /* FNEG */ gen_helper_vfp_negd(tcg_res, tcg_op); - break; + goto done; case 0x3: /* FSQRT */ gen_helper_vfp_sqrtd(tcg_res, tcg_op, cpu_env); - break; + goto done; case 0x8: /* FRINTN */ case 0x9: /* FRINTP */ case 0xa: /* FRINTM */ case 0xb: /* FRINTZ */ case 0xc: /* FRINTA */ - { - TCGv_i32 tcg_rmode = tcg_const_i32(arm_rmode_to_sf(opcode & 7)); - - gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); - gen_helper_rintd(tcg_res, tcg_op, fpst); - - gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); - tcg_temp_free_i32(tcg_rmode); + rmode = arm_rmode_to_sf(opcode & 7); + gen_fpst = gen_helper_rintd; break; - } case 0xe: /* FRINTX */ - gen_helper_rintd_exact(tcg_res, tcg_op, fpst); + gen_fpst = gen_helper_rintd_exact; break; case 0xf: /* FRINTI */ - gen_helper_rintd(tcg_res, tcg_op, fpst); + gen_fpst = gen_helper_rintd; break; default: - abort(); + g_assert_not_reached(); } - write_fp_dreg(s, rd, tcg_res); - + fpst = get_fpstatus_ptr(false); + if (rmode >= 0) { + TCGv_i32 tcg_rmode = tcg_const_i32(rmode); + gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); + gen_fpst(tcg_res, tcg_op, fpst); + gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); + tcg_temp_free_i32(tcg_rmode); + } else { + gen_fpst(tcg_res, tcg_op, fpst); + } tcg_temp_free_ptr(fpst); + + done: + write_fp_dreg(s, rd, tcg_res); tcg_temp_free_i64(tcg_op); tcg_temp_free_i64(tcg_res); } From patchwork Fri Mar 1 20:05:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159511 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1143880jad; Fri, 1 Mar 2019 12:08:51 -0800 (PST) X-Google-Smtp-Source: APXvYqxIcZ9aaJSLrhgYsePQGbRHDAFmcMqa2Y/8kMDcYr92D/MpZlxp0TtNBLJe9E/y2t5Ll5ru X-Received: by 2002:a81:3c0b:: with SMTP id j11mr4948462ywa.437.1551470931772; Fri, 01 Mar 2019 12:08:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551470931; cv=none; d=google.com; s=arc-20160816; b=pIRmD+Bz5eA5Z8hyzWRFIXfd7HGUktwTa/karmfr2j2wDAYdMIs3LWF/7ilULon8kd kqvY8g5Mrt4W6zxi0tPhYyA/lK2fMt/uRyP+3CscPk+JxW4+6efMdd2jYTGWz484FM85 0QXIR0UEhIl0vJIgCnpQTcfBGCtOaCUhLMTHA6llxOhG7m8Y7I8DOYwGBU01LcG67dFu cMp8rX0KciKJ+be33f+uc7rLAL7InzmI7P1ta2cxUbbnp8+k4oHJju4YOOrTTC9WL00E fN/m7JV9H9PFZcYU3PnrHmC58kpt/w8DwNNApXDW2yiWPx6D1+x2P7nE0rOhmTpzk+sl U2+w== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=GafLDqNAv1anJDaQUiHVFlVMz+oIDUkfEJC6k0M99LM=; b=CKCfaZ4fM9wRGg+EDQUw4XWV9gcYWFOkWTHcDVmfUmXdP8NBoQxIGhaSAKSya1/ZyD niAe4Lj6apnqIrjuS/d2Ysp07IGjSxr8z39ffCQVBn+NTxCo0wnEGuq9yWSm4PA/pa9e PymrG/i5Ka4GpcPbtXAWe8hNSTj6VztAs8MwZb055ahVhMmtxws3Rl2g/N+XD4D8fPyF mabCuX9nOqkr0Hn0MwDgJtHEaCD7ecwzrhegYC8tORpv74jYen5vdqp3sH9zDkYECoo8 1jWd/EHEid9XhfTlmzCGgRy0sr3yMkSnr9moZIWZTYHFzbaMQpmf7HI6XETQbg0erjfE ztIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zdkI3hCp; 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 e188si11348145yba.120.2019.03.01.12.08.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:08:51 -0800 (PST) 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=zdkI3hCp; 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 ([127.0.0.1]:43484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoSh-0000sG-74 for patch@linaro.org; Fri, 01 Mar 2019 15:08:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPq-00058G-3r for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPm-0002Dx-0j for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:51 -0500 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:41349) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoPj-0001mu-JK for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:48 -0500 Received: by mail-pf1-x435.google.com with SMTP id d25so11902426pfn.8 for ; Fri, 01 Mar 2019 12:05:21 -0800 (PST) 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; bh=GafLDqNAv1anJDaQUiHVFlVMz+oIDUkfEJC6k0M99LM=; b=zdkI3hCpUrSYz4wdRBWKILSmY6SDy7NNGhNWjF0CgNzwQxxrJnHF1vTScc69b7VhvE GoO8Q1zYmP4PRnIm+8KY3tT06qw2u7cCdvHv6HE+L9iSsJINTDqkLsWecbg0exQ3mBkU 1sfhZkUu9AgNHhGwBu26Ce5KO2+v1FpQ7M1Spc0TP4ECl5SeIM0I20fDBhHw66ZjWekk eqQuWxZxZMinaKzfDjHlVfFAc9+0tfhZ01O0yiVEFMXBECXN/Tifq/nswgc7SxicoERr 3zq0EPPMU4D30kWNkXFx5HhL+v5xAiquySXJDuUjsKfpXWs5TrQfdyy9b6qkpEZ9faef lVpA== 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; bh=GafLDqNAv1anJDaQUiHVFlVMz+oIDUkfEJC6k0M99LM=; b=mby5usvfWmmw1kB6Z6nCdPjX1GEMYIWpJKpZPAPLx2EOIl11lj/k6OM3ByiYUP9pU+ V2WidQ/vf2ezzczCq6VUIScsg/o3CjxwYdE23s+tS21hJ8Eo3AwlnYmc8N1XBApRNd6b pjkE0SCNlJ4qd2+LmglqxfLWjMQst4zJPnqVNdvE/i9Ume2YUADwNLwKs6xHly8asfWO l7kYZEQu5co+QmlZksOI6G8ko0KfyHPl20YVjoaV04PBf8z6scO5d0m0mTe+xSeybp0q 5GR/VrALeN+9Otfjd1s3wvH9OXASLuu08kgYfGS0MhpAFo1WGr53ro7cC5Jh9cMqh5qF jj2Q== X-Gm-Message-State: APjAAAXf6NBcYpcNhYeWlQDE9mIFlRVC0oYtGWSKcjnvfRpHgBv/Jtke ktKktMmBgZrxFAnUS3pi/2F8wfd6Nkk= X-Received: by 2002:a63:4a0a:: with SMTP id x10mr6559779pga.325.1551470719717; Fri, 01 Mar 2019 12:05:19 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:05:01 -0800 Message-Id: <20190301200501.16533-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::435 Subject: [Qemu-devel] [PATCH v3 10/10] target/arm: Implement ARMv8.5-FRINT 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Tested-by: Laurent Desnogues Signed-off-by: Richard Henderson --- target/arm/cpu.h | 5 ++ target/arm/helper.h | 5 ++ target/arm/cpu64.c | 1 + target/arm/translate-a64.c | 71 ++++++++++++++++++++++++++-- target/arm/vfp_helper.c | 96 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 173 insertions(+), 5 deletions(-) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index a7aaec63d7..5f23c62132 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3476,6 +3476,11 @@ static inline bool isar_feature_aa64_predinv(const ARMISARegisters *id) return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, SPECRES) != 0; } +static inline bool isar_feature_aa64_frint(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, FRINTTS) != 0; +} + static inline bool isar_feature_aa64_fp16(const ARMISARegisters *id) { /* We always set the AdvSIMD and FP fields identically wrt FP16. */ diff --git a/target/arm/helper.h b/target/arm/helper.h index 583adba9b0..a09566f795 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -683,6 +683,11 @@ DEF_HELPER_FLAGS_5(gvec_fmlal_idx_a32, TCG_CALL_NO_RWG, DEF_HELPER_FLAGS_5(gvec_fmlal_idx_a64, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_2(frint32_s, TCG_CALL_NO_RWG, f32, f32, ptr) +DEF_HELPER_FLAGS_2(frint64_s, TCG_CALL_NO_RWG, f32, f32, ptr) +DEF_HELPER_FLAGS_2(frint32_d, TCG_CALL_NO_RWG, f64, f64, ptr) +DEF_HELPER_FLAGS_2(frint64_d, TCG_CALL_NO_RWG, f64, f64, ptr) + #ifdef TARGET_AARCH64 #include "helper-a64.h" #include "helper-sve.h" diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 9fe0844a82..228906f267 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -321,6 +321,7 @@ static void aarch64_max_initfn(Object *obj) t = FIELD_DP64(t, ID_AA64ISAR1, GPI, 0); t = FIELD_DP64(t, ID_AA64ISAR1, SB, 1); t = FIELD_DP64(t, ID_AA64ISAR1, SPECRES, 1); + t = FIELD_DP64(t, ID_AA64ISAR1, FRINTTS, 1); cpu->isar.id_aa64isar1 = t; t = cpu->isar.id_aa64pfr0; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 94184ea5af..8907cc950a 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -5721,6 +5721,20 @@ static void handle_fp_1src_single(DisasContext *s, int opcode, int rd, int rn) case 0xf: /* FRINTI */ gen_fpst = gen_helper_rints; break; + case 0x10: /* FRINT32Z */ + rmode = float_round_to_zero; + gen_fpst = gen_helper_frint32_s; + break; + case 0x11: /* FRINT32X */ + gen_fpst = gen_helper_frint32_s; + break; + case 0x12: /* FRINT64Z */ + rmode = float_round_to_zero; + gen_fpst = gen_helper_frint64_s; + break; + case 0x13: /* FRINT64X */ + gen_fpst = gen_helper_frint64_s; + break; default: g_assert_not_reached(); } @@ -5784,6 +5798,20 @@ static void handle_fp_1src_double(DisasContext *s, int opcode, int rd, int rn) case 0xf: /* FRINTI */ gen_fpst = gen_helper_rintd; break; + case 0x10: /* FRINT32Z */ + rmode = float_round_to_zero; + gen_fpst = gen_helper_frint32_d; + break; + case 0x11: /* FRINT32X */ + gen_fpst = gen_helper_frint32_d; + break; + case 0x12: /* FRINT64Z */ + rmode = float_round_to_zero; + gen_fpst = gen_helper_frint64_d; + break; + case 0x13: /* FRINT64X */ + gen_fpst = gen_helper_frint64_d; + break; default: g_assert_not_reached(); } @@ -5920,6 +5948,13 @@ static void disas_fp_1src(DisasContext *s, uint32_t insn) handle_fp_fcvt(s, opcode, rd, rn, dtype, type); break; } + + case 0x10 ... 0x13: /* FRINT{32,64}{X,Z} */ + if (type > 1 || !dc_isar_feature(aa64_frint, s)) { + unallocated_encoding(s); + return; + } + /* fall through */ case 0x0 ... 0x3: case 0x8 ... 0xc: case 0xe ... 0xf: @@ -5929,14 +5964,12 @@ static void disas_fp_1src(DisasContext *s, uint32_t insn) if (!fp_access_check(s)) { return; } - handle_fp_1src_single(s, opcode, rd, rn); break; case 1: if (!fp_access_check(s)) { return; } - handle_fp_1src_double(s, opcode, rd, rn); break; case 3: @@ -5948,13 +5981,13 @@ static void disas_fp_1src(DisasContext *s, uint32_t insn) if (!fp_access_check(s)) { return; } - handle_fp_1src_half(s, opcode, rd, rn); break; default: unallocated_encoding(s); } break; + default: unallocated_encoding(s); break; @@ -9482,6 +9515,14 @@ static void handle_2misc_64(DisasContext *s, int opcode, bool u, case 0x59: /* FRINTX */ gen_helper_rintd_exact(tcg_rd, tcg_rn, tcg_fpstatus); break; + case 0x1e: /* FRINT32Z */ + case 0x5e: /* FRINT32X */ + gen_helper_frint32_d(tcg_rd, tcg_rn, tcg_fpstatus); + break; + case 0x1f: /* FRINT64Z */ + case 0x5f: /* FRINT64X */ + gen_helper_frint64_d(tcg_rd, tcg_rn, tcg_fpstatus); + break; default: g_assert_not_reached(); } @@ -12132,8 +12173,7 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn) } break; case 0xc ... 0xf: - case 0x16 ... 0x1d: - case 0x1f: + case 0x16 ... 0x1f: { /* Floating point: U, size[1] and opcode indicate operation; * size[0] indicates single or double precision. @@ -12276,6 +12316,19 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn) } need_fpstatus = true; break; + case 0x1e: /* FRINT32Z */ + case 0x1f: /* FRINT64Z */ + need_rmode = true; + rmode = FPROUNDING_ZERO; + /* fall through */ + case 0x5e: /* FRINT32X */ + case 0x5f: /* FRINT64X */ + need_fpstatus = true; + if ((size == 3 && !is_q) || !dc_isar_feature(aa64_frint, s)) { + unallocated_encoding(s); + return; + } + break; default: unallocated_encoding(s); return; @@ -12441,6 +12494,14 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn) case 0x7c: /* URSQRTE */ gen_helper_rsqrte_u32(tcg_res, tcg_op, tcg_fpstatus); break; + case 0x1e: /* FRINT32Z */ + case 0x5e: /* FRINT32X */ + gen_helper_frint32_s(tcg_res, tcg_op, tcg_fpstatus); + break; + case 0x1f: /* FRINT64Z */ + case 0x5f: /* FRINT64X */ + gen_helper_frint64_s(tcg_res, tcg_op, tcg_fpstatus); + break; default: g_assert_not_reached(); } diff --git a/target/arm/vfp_helper.c b/target/arm/vfp_helper.c index cc7f9f5cb1..2468fc1629 100644 --- a/target/arm/vfp_helper.c +++ b/target/arm/vfp_helper.c @@ -1174,3 +1174,99 @@ uint32_t HELPER(vjcvt)(float64 value, CPUARMState *env) return result; } + +/* Round a float32 to an integer that fits in int32_t or int64_t. */ +static float32 frint_s(float32 f, float_status *fpst, int intsize) +{ + int old_flags = get_float_exception_flags(fpst); + uint32_t exp = extract32(f, 23, 8); + + if (unlikely(exp == 0xff)) { + /* NaN or Inf. */ + goto overflow; + } + + /* Round and re-extract the exponent. */ + f = float32_round_to_int(f, fpst); + exp = extract32(f, 23, 8); + + /* Validate the range of the result. */ + if (exp < 126 + intsize) { + /* abs(F) <= INT{N}_MAX */ + return f; + } + if (exp == 126 + intsize) { + uint32_t sign = extract32(f, 31, 1); + uint32_t frac = extract32(f, 0, 23); + if (sign && frac == 0) { + /* F == INT{N}_MIN */ + return f; + } + } + + overflow: + /* + * Raise Invalid and return INT{N}_MIN as a float. Revert any + * inexact exception float32_round_to_int may have raised. + */ + set_float_exception_flags(old_flags | float_flag_invalid, fpst); + return (0x100u + 126u + intsize) << 23; +} + +float32 HELPER(frint32_s)(float32 f, void *fpst) +{ + return frint_s(f, fpst, 32); +} + +float32 HELPER(frint64_s)(float32 f, void *fpst) +{ + return frint_s(f, fpst, 64); +} + +/* Round a float64 to an integer that fits in int32_t or int64_t. */ +static float64 frint_d(float64 f, float_status *fpst, int intsize) +{ + int old_flags = get_float_exception_flags(fpst); + uint32_t exp = extract64(f, 52, 11); + + if (unlikely(exp == 0x7ff)) { + /* NaN or Inf. */ + goto overflow; + } + + /* Round and re-extract the exponent. */ + f = float64_round_to_int(f, fpst); + exp = extract64(f, 52, 11); + + /* Validate the range of the result. */ + if (exp < 1022 + intsize) { + /* abs(F) <= INT{N}_MAX */ + return f; + } + if (exp == 1022 + intsize) { + uint64_t sign = extract64(f, 63, 1); + uint64_t frac = extract64(f, 0, 52); + if (sign && frac == 0) { + /* F == INT{N}_MIN */ + return f; + } + } + + overflow: + /* + * Raise Invalid and return INT{N}_MIN as a float. Revert any + * inexact exception float64_round_to_int may have raised. + */ + set_float_exception_flags(old_flags | float_flag_invalid, fpst); + return (uint64_t)(0x800 + 1022 + intsize) << 52; +} + +float64 HELPER(frint32_d)(float64 f, void *fpst) +{ + return frint_d(f, fpst, 32); +} + +float64 HELPER(frint64_d)(float64 f, void *fpst) +{ + return frint_d(f, fpst, 64); +}