From patchwork Tue Oct 22 13:31:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 177191 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp4905472ill; Tue, 22 Oct 2019 07:01:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqz10cgX45og93h+Xu3RWxWj9QOU3/++mTj32vd4u4pWBS6zvzXo0IKbYbIMCrHCciqZgFP7 X-Received: by 2002:a05:620a:2099:: with SMTP id e25mr3154382qka.84.1571752870408; Tue, 22 Oct 2019 07:01:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571752870; cv=none; d=google.com; s=arc-20160816; b=RCwNKn2rk9c0HVTeYeD8mnsLwuV0zrmH8fW+UrDvk3TJV63XBHTqs1oEoZ8UkZhpVT Bcey+PPvUnhwP6dky/jr4mv3pEc7Jz0G39kq9WCxyJYM88GtpzXKTlcwoYz8F5fY8HbS JAk/15jJpdPGc+fVBmXn10oEMyxSFybcbq0WZhlLzPMSFwpIK9eqTtbaUpFXSaNuOGxP A5zyP9c1EVjsElZi/1IgM2v5j7zzqvfujnRhNKl6L9r4t9VL1CxXoIp0HStA89aY+Kxg LbHiMEGuDOBmoBDET6ekl2uFuA3UJ0T1ONqx7QD78nCQXoa32ucKbeVAhIoBtfaTW2hr q+3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=wnRZsm7NhaxxnhkKjePsOV7gMBnf+WiZW/Dfozs982c=; b=jwgXBE82LgWMzfCZLaD99OAjtMimkevfZh5paBvk0b9/+u6NAYDYQZ881ZB5fxPIH6 97/6HuUghsLL/kzo3MAGD0LKIBfNT6n3MOei4zP1NCr14RSztDfPsEB8P1l4b8NcsyvH YkaAoLFNmBuXYL4vEof8tGWyZD9LuDJ5IqGz1RBtCEyasWgtLevkI8u4syssI9jEs1H2 3UPb7zYaz+V56T05tjHYdsBiaLbFRfz2aYqrvMR9NGTn2CZLpjWa1w6iKhjkg5yV9Y2J irY5KLYUXq7VBHgOe8PNDHpc5Lol6dCQeZy/IVS9ObzvW3nVj9YYVWEqYIsw5HMwSxMS PWFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y4VqBYqD; 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=pass (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 h3si7442467qvz.207.2019.10.22.07.01.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2019 07:01:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y4VqBYqD; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuij-0002GG-6a for patch@linaro.org; Tue, 22 Oct 2019 10:01:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37009) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuH9-00039W-Ms for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMuH7-0001Qz-W5 for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:39 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:44022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMuH7-0001Qh-Q2 for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:37 -0400 Received: by mail-wr1-x435.google.com with SMTP id c2so12856005wrr.10 for ; Tue, 22 Oct 2019 06:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wnRZsm7NhaxxnhkKjePsOV7gMBnf+WiZW/Dfozs982c=; b=Y4VqBYqDwKVlE+6g3Ie+UcS4074xFHqLbYGA6Y1gzLajVCQ9btyHlmFsLYv8tWkTOc X9XFtKCISt2PYxUXDugPvF+nFyHsJZyS+8NVNmHH0MBz4N74PHdm4nztttWkJFhqCIcz VhPxvjggPkp9SffsjP56xWLaMhsy36xF8BwmG+dzxCDhV7gn7H+r+0QlCBVhLDN0iXDl SNxjtoMTt12dyCi/lRrU/roKLfTwikI18uNSho6fBllgC73j0/hq+96H6JbTaqU317Lo ffLhbV6QlIKF8unQTl2H//Y8E1Gw3szqPijrHD9Y3qON6Cz1OCcQxnlspr59s39/+nYS rZmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wnRZsm7NhaxxnhkKjePsOV7gMBnf+WiZW/Dfozs982c=; b=IXKiKyGJvQgu2eGOdzqfOSOxwUcnhDwK4Qa9a3fjmpQx/uxcfDCrqbx+SkBm0LzhyL /ohHOnu2bvVh5jwmqZeAXjC6p98Xg/F4c7ahAXjnliGvdAi/j8FbfpxztE3j7q3qdU4Y 3KqblPcs8FpuzLnpwjH1ZyU4S5nddKcv2+vABXU6qOtScFlfoqRkYA4NuYUv/X5kmLr2 Qc1uhUgRV917/LNDDY/kd3DbBKDTx7hB1vIWWjeSSCc1/IySAUV4ke5evqk9MHVwytW4 Lfzx2XOihG9YBRkP2v4akxXlWUwPpGF2c+FUjxt6vFlPDLi1D8T4ILd0ZHw6Z3krDb+/ pWbw== X-Gm-Message-State: APjAAAXtw0QQCd9tN3meDpJI23Wa9OXTNUS+UAXSD68+c6i6ki2a1q7A blvWlmGiYMuQ6tO86I/0VOI+3nd9YVo= X-Received: by 2002:a5d:540c:: with SMTP id g12mr3561086wrv.335.1571751156292; Tue, 22 Oct 2019 06:32:36 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r2sm20263856wma.1.2019.10.22.06.32.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:32:34 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 25/41] target/arm: Add HELPER(rebuild_hflags_{a32, a64, m32}) Date: Tue, 22 Oct 2019 14:31:18 +0100 Message-Id: <20191022133134.14487-26-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022133134.14487-1-peter.maydell@linaro.org> References: <20191022133134.14487-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This functions are given the mode and el state of the cpu and writes the computed value to env->hflags. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson Message-id: 20191018174431.1784-16-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.h | 4 ++++ target/arm/helper.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) -- 2.20.1 diff --git a/target/arm/helper.h b/target/arm/helper.h index 1fb2cb5a777..3d4ec267a2c 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -90,6 +90,10 @@ DEF_HELPER_4(msr_banked, void, env, i32, i32, i32) DEF_HELPER_2(get_user_reg, i32, env, i32) DEF_HELPER_3(set_user_reg, void, env, i32, i32) +DEF_HELPER_FLAGS_2(rebuild_hflags_m32, TCG_CALL_NO_RWG, void, env, int) +DEF_HELPER_FLAGS_2(rebuild_hflags_a32, TCG_CALL_NO_RWG, void, env, int) +DEF_HELPER_FLAGS_2(rebuild_hflags_a64, TCG_CALL_NO_RWG, void, env, int) + DEF_HELPER_1(vfp_get_fpscr, i32, env) DEF_HELPER_2(vfp_set_fpscr, void, env, i32) diff --git a/target/arm/helper.c b/target/arm/helper.c index 37424e3d4dd..b2d701cf004 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11220,6 +11220,30 @@ void arm_rebuild_hflags(CPUARMState *env) env->hflags = rebuild_hflags_internal(env); } +void HELPER(rebuild_hflags_m32)(CPUARMState *env, int el) +{ + int fp_el = fp_exception_el(env, el); + ARMMMUIdx mmu_idx = arm_mmu_idx_el(env, el); + + env->hflags = rebuild_hflags_m32(env, fp_el, mmu_idx); +} + +void HELPER(rebuild_hflags_a32)(CPUARMState *env, int el) +{ + int fp_el = fp_exception_el(env, el); + ARMMMUIdx mmu_idx = arm_mmu_idx_el(env, el); + + env->hflags = rebuild_hflags_a32(env, fp_el, mmu_idx); +} + +void HELPER(rebuild_hflags_a64)(CPUARMState *env, int el) +{ + int fp_el = fp_exception_el(env, el); + ARMMMUIdx mmu_idx = arm_mmu_idx_el(env, el); + + env->hflags = rebuild_hflags_a64(env, el, fp_el, mmu_idx); +} + void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, target_ulong *cs_base, uint32_t *pflags) {