From patchwork Thu Oct 24 16:26:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 177563 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp2420715ocf; Thu, 24 Oct 2019 09:58:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqzkrjC/gPCBxm8/9SEXFlGDvUfYNMik2d7RGIoa5YfQ2h56XX/n0V4i5Z0oyUYcZ3ik4QWJ X-Received: by 2002:a17:906:6899:: with SMTP id n25mr3808233ejr.176.1571936317309; Thu, 24 Oct 2019 09:58:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571936317; cv=none; d=google.com; s=arc-20160816; b=EepRVwY/16rw6KJ+dup99JU3c9WHll7F6Al9+jTmoykxcszvVhUqBuZCjrinTe8QlU XpWsdbnPQSQfibIA/9LfwA6bJcO81f2UqYsYSjaIPLMDNHjfdPvL5m/YP81U8Y3Sr/Oj JCXXc5V+W6EwusSEuzGod9iu2mVaoaCvFdPIh9+iP0MKTQfKuqfah7Aw7jv8M32+YM4I hjb1EjV0UfhbMppFte0eSCQ7KMxWBm+g4ECVPqVf0zLibSLe4ZfCEJ4CE2PDKYqWFZhC g7YwDchdMxeJIfsbBZ9o/LGiJGEBWxTGJR53gP79hkLy9uWno9dc29ziQ1VimiPaLHSf HHIQ== 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=HFxRD9cQcWniuYeniFsehWwir7VzmPqYaumnJ4Y7pcY=; b=lwrM9reKQOVva+EF7FD4Jqasc9xcHiRgaNRCzjE3JjHLhJoIIojQgrB3KFn37seN/R Zv7XsmNgnVMp1ksgModRXroj6bdd05SEIuZLdy8k6NJN46KwhY1L2/F0gogPklg78o+5 3JR+JichM0EdyDTTOUAJWk5BdsbOYm8sxXlJFTgKfzuRHzdca/GdjAEq3HhafspnaXI2 Enw5BteS1aH08X/ZKj3qOJVbLGdTQost2pDb0dbRid+ceP64kFRiYVEj38gx8uIGHFAq RuOquKlrUG83NOSKHksv4aK5ZTFTj86fs2BKoG2uXBEFe9NSy44istkhk04UBuC52u7y yzsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yCg1sKpr; 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 y6si7107669ejo.397.2019.10.24.09.58.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Oct 2019 09:58:37 -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=yCg1sKpr; 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]:48148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNgRX-0004IS-JX for patch@linaro.org; Thu, 24 Oct 2019 12:58:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57749) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNfxe-00076g-7e for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:27:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNfxc-0000i9-3C for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:27:42 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:52274) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNfxb-0000hr-TK for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:27:40 -0400 Received: by mail-wm1-x330.google.com with SMTP id p21so2099009wmg.2 for ; Thu, 24 Oct 2019 09:27:39 -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=HFxRD9cQcWniuYeniFsehWwir7VzmPqYaumnJ4Y7pcY=; b=yCg1sKprtJlTwGko3Fgo0RZR29KzFptM/pmjw6ikqFGl3q+0y6wha6Qzp1D2U+zqYJ UKGzBz47sgJv6/kMh0TCuwyTWl31hmmq1I7jbG1FNiSsjAzwB61ai8R+nKb8pZ6kOVmn V+5WQY6ODMVzAdqKbLfx7VxottE7EJXXLTZx5yUHWYqoeT0TsFdvkrHGegmc8rkCY6v3 qIWLWDphHz+viE5NZPSlbuhB/9vO9NqV59EanvWIJho0217hdZGwBijnX6iPR/zf+TrF pwFnzqXBis0NuTMmH0mwHPKpI2vdzNXvZs/MEzvR178gUw8hduUmUwpsNtoIy+DKYtrm dymg== 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=HFxRD9cQcWniuYeniFsehWwir7VzmPqYaumnJ4Y7pcY=; b=p4RLNrLYSwluilE+uGRK5Sn4CNoYOFtwNlbmBoZ1ThC+XJF347lFxIt0/xo4MLnUSF Xj8utHLPUNaDXeLcV6nO1aLdVPcHuiGrW4qS+7jHv+CxlJiqaxBox8qnZmVUZ/WLJIVH U2qSguDD7NVJ+ggis2xQGpKmzo8Dlokx5ZWr0wtsB/Xhku7Zj2GCtWXbkj0CoIYhXSgU u9DX4wknQnN6GsbVqL/YWCsx8p+vwSZuXsmw7XghoIbCINdrvwR8J5Xxl2qYH/LnC6Ax NZtjBZAm8ek/tu78GlvgyBzJrOt4UOCyZSrTnyv2Pv1Ii591qemmKqU3yNmG+1iTItC3 BmmQ== X-Gm-Message-State: APjAAAXht3tSkkbeBl9eTg9dayVJ5Ci+H8qE03OWbe1A/6M4h0wSeQuI Rmty8Lairlp5Qasql55TvtSL/lgOae4= X-Received: by 2002:a1c:1b07:: with SMTP id b7mr5674323wmb.111.1571934458406; Thu, 24 Oct 2019 09:27:38 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r27sm42606124wrc.55.2019.10.24.09.27.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 09:27:37 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/51] target/arm: Split out rebuild_hflags_a32 Date: Thu, 24 Oct 2019 17:26:42 +0100 Message-Id: <20191024162724.31675-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191024162724.31675-1-peter.maydell@linaro.org> References: <20191024162724.31675-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::330 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 Currently a trivial wrapper for rebuild_hflags_common_32. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson Message-id: 20191023150057.25731-8-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index 296a4b2232c..d1cd54cc931 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11106,6 +11106,12 @@ static uint32_t rebuild_hflags_m32(CPUARMState *env, int fp_el, return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); } +static uint32_t rebuild_hflags_a32(CPUARMState *env, int fp_el, + ARMMMUIdx mmu_idx) +{ + return rebuild_hflags_common_32(env, fp_el, mmu_idx, 0); +} + static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, ARMMMUIdx mmu_idx) { @@ -11218,7 +11224,7 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, flags = FIELD_DP32(flags, TBFLAG_A32, LSPACT, 1); } } else { - flags = rebuild_hflags_common_32(env, fp_el, mmu_idx, 0); + flags = rebuild_hflags_a32(env, fp_el, mmu_idx); } flags = FIELD_DP32(flags, TBFLAG_A32, THUMB, env->thumb);