From patchwork Wed Feb 20 05:04:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 158764 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4497958jaa; Tue, 19 Feb 2019 21:08:16 -0800 (PST) X-Google-Smtp-Source: AHgI3IaGKELH7T664CcEHOEaOwoH0IbOFF/r4tIBxZaVEnSFxsSQEDrhBobdztfi1JRSSiQsGx2u X-Received: by 2002:a5b:98c:: with SMTP id c12mr26051821ybq.280.1550639296863; Tue, 19 Feb 2019 21:08:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550639296; cv=none; d=google.com; s=arc-20160816; b=wGCQ2e5OEIPrilLWeo76+z4PbvlynTvSjIPiR63wtFZaGKT8CIOD6f0iMom/WLLnX1 bNRtXINB6y3IR8RyU6vxCBtvBk5XU08A0FAjgUc3FaPb6cKwfv3KptbZ93vDD0pMw8Xn sXgBArdV4KsvW9AzikvRWZPl9wXWcBm5OpiGCxCsf+MCRrq5nzsP9VVDh6uOz+qoog0e O0PD3US274VChOU/4duwiw8CK7V27CFBj4BL9O/uZG5V7kXuX7k4SMnKahq2PPvKd70D 7xZ/W4W9G63AkPZjQ70hDE5SQLizmSj9ZeZcHnOFe3N32iGDoDWBjhyxxSaE9rmfZF2v xfWg== 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=FhCW0wNKpM5l2LxvA6dXiW7IbYc+zV/iAYzSXtJqiPg=; b=ZRUukfR6HeG94wKwGkpbe5vj/OJDRVtlJ6Yais/Uw5NMgV8NwiPh7XZoNtAJp/1oUX bBlxGtiT2h5m/Da0minuzDgW08ucu39Lu9NlQCGGQ4vX1p4lH/Ist3Vw5wT8n1Du2Wvm w1FykamXCwVJ0kwxp/tSUtlaDZHSmwmg1hKDFoA5QEDmOTai8p01XRYOi95R44oURJhQ P8PESYp0/kRma2CPkmv/BE5KULv9Dw91FPuWQmHuelk+CNvnBITLHFU6HcWkvN/R2Ty7 oIzasCIJxKuMZkXiH7Wk1HtkD4Ly2QosfW/q/G3xg3xG6ZVdKuQ5o3Xr4FPK5F1yBP8l fgwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="hycl7/P6"; 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 b65si2271922ywc.333.2019.02.19.21.08.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Feb 2019 21:08:16 -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="hycl7/P6"; 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]:33997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwK7E-0005tl-Db for patch@linaro.org; Wed, 20 Feb 2019 00:08:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwK45-0003tV-FB for qemu-devel@nongnu.org; Wed, 20 Feb 2019 00:05:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwK44-0004zl-1A for qemu-devel@nongnu.org; Wed, 20 Feb 2019 00:05:01 -0500 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:45806) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gwK43-0004xX-K1 for qemu-devel@nongnu.org; Wed, 20 Feb 2019 00:04:59 -0500 Received: by mail-pg1-x542.google.com with SMTP id y4so11231762pgc.12 for ; Tue, 19 Feb 2019 21:04:59 -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=FhCW0wNKpM5l2LxvA6dXiW7IbYc+zV/iAYzSXtJqiPg=; b=hycl7/P6FlltOY+heCIuQADGUxcpBYICsPQWKM4hns85e45Jx4xWJ6M8kpbeZjuwn2 kPvjrsnkieDPHinPUdxAwMC/YlSLMP0Ec7DKxsa/rIja0vr+imhmfOU9esed08foauf8 lhya1UsTta9Cvb/4Px//aQXAPdJ3q4w4+H7TFQg6i+I5bDscLgmW0XjSNXboWTESL7xb d+H58G71ZYGs3lG35pjEifXMLvy9rEPZIWAQbd7xgLSW03t3NRqAtBSKI+mMHIRneCBz cXNA2pieEQTXshHISUS13+bTXnUflq+SztW0dgP9zOG3Lhf5TTH461WE9H568FhDWF4/ sLiQ== 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=FhCW0wNKpM5l2LxvA6dXiW7IbYc+zV/iAYzSXtJqiPg=; b=PYiIr7Krj1w7r+M3ImqFcRZWnogAsl8sZ7MeS8mrXVyatpLdJSa7yPYq3zivHTqo6L U3cpZWjtwjp5isHjc3i5EDmu8jTLZmRW0JHiVEwTT+3bJWXeFceHx2OAmeCdbzUKYZQY 7UoQDmx27vGIRi/U8xF9Hl1nZptOnDNnoMdAGIVq84iNH4REgzts/q6skgFRlk7hunf0 HSLcb5UHav53Fas17TLEnXCphCrOEF0WOz4G6XOlnvv5QRhKX5Xh3i/nqiSr31z78G+E zsC/c2xo8dQ/05G2ui06AHGbVaE15ASTHWswnsHBIaA+j3pJTMIKSMyj4jHiauWGV9PM QhmQ== X-Gm-Message-State: AHQUAub9wC4FSVggVJB+BmfbKLjGnSFsImRdGmi0+kndnpRqrVJD8HU0 vk0BnVEhrKJGt/L/tNJfII1deJZmug8= X-Received: by 2002:a63:9402:: with SMTP id m2mr26529889pge.93.1550639097927; Tue, 19 Feb 2019 21:04:57 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id w10sm25228143pge.8.2019.02.19.21.04.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Feb 2019 21:04:57 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Feb 2019 21:04:51 -0800 Message-Id: <20190220050451.10939-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190220050451.10939-1-richard.henderson@linaro.org> References: <20190220050451.10939-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 3/3] 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" Signed-off-by: Richard Henderson --- target/arm/cpu.h | 5 ++++ target/arm/translate-a64.c | 58 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 000e778619..0480f9baba 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3380,6 +3380,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_fcma(const ARMISARegisters *id) { return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, FCMA) != 0; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index b88eccef53..1d9bf81c0e 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1644,6 +1644,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) @@ -1663,6 +1705,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;