From patchwork Thu Nov 28 17:07:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 294971 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 99DD12C00A3 for ; Fri, 29 Nov 2013 04:07:51 +1100 (EST) Received: from localhost ([::1]:43178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm547-0000MB-MX for incoming@patchwork.ozlabs.org; Thu, 28 Nov 2013 12:07:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm53m-0000Is-BO for qemu-devel@nongnu.org; Thu, 28 Nov 2013 12:07:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vm53g-0008KD-1f for qemu-devel@nongnu.org; Thu, 28 Nov 2013 12:07:25 -0500 Received: from mail-ea0-f175.google.com ([209.85.215.175]:37021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm53f-0008K8-HT for qemu-devel@nongnu.org; Thu, 28 Nov 2013 12:07:19 -0500 Received: by mail-ea0-f175.google.com with SMTP id z10so5968206ead.20 for ; Thu, 28 Nov 2013 09:07:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding; bh=uuw/Tt+rOW5M1j3x/XTEEXS0AgqgWowhjZqGhLrPua0=; b=CHRFFboz6KXMwXYztnd+1Jl7zg1ZVqttRRGUww+6kBhqtR2HQ/wbnNlmcJ1btziCrk gwj8RIhFGQpZxaHJ+DZCJF7EQsaEDhHf1zCpNcfipjLAVTOPufF5ZMJ2X5GcJ7Q35jYB DPHXrdcRntlZ2oEim1UnavmLI8r5KAeFb3n3MfwAW8RwpjGB27uoaW3e/tOAlQewn8h2 ba8BC7DO2s/a405rP0tXyBMWVdZGmUlblVgnKwsCxOsY6+NAorm7FwJ5igxt/kiAOuti cccYOiqKdi9M6UYm9/Cvt1+lCT/npYxSIiI9s5ijwFvw/5w0zLFpJNwDaCxoCMjjm/tJ B/vw== X-Gm-Message-State: ALoCoQm1kT825vFw8Wys75SOi+t25zRdVu+Y9QjmGD1NZNfNU/+qjDPRvsHnwcnJqWCwzodhm0+l X-Received: by 10.14.111.129 with SMTP id w1mr416837eeg.83.1385658438577; Thu, 28 Nov 2013 09:07:18 -0800 (PST) Received: from localhost.localdomain (cpc6-seac21-2-0-cust453.7-2.cable.virginm.net. [82.1.113.198]) by mx.google.com with ESMTPSA id o47sm31935277eem.21.2013.11.28.09.07.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 Nov 2013 09:07:17 -0800 (PST) Message-ID: <52977844.4040202@linaro.org> Date: Thu, 28 Nov 2013 17:07:16 +0000 From: Will Newton User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.215.175 Cc: Patch Tracking Subject: [Qemu-devel] [PATCH v6 1/4] target-arm: Move call to disas_vfp_insn out of disas_coproc_insn. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Floating point is an extension to the instruction set rather than a coprocessor, so call it directly from the ARM and Thumb decode functions. Signed-off-by: Will Newton --- target-arm/translate.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) Changes in v6: - Add return after disas_vfp_insn call in disas_arm_insn diff --git a/target-arm/translate.c b/target-arm/translate.c index 5f003e7..5a6c1ea 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -2636,6 +2636,13 @@ static int disas_vfp_insn(CPUARMState * env, DisasContext *s, uint32_t insn) && rn != ARM_VFP_MVFR1 && rn != ARM_VFP_MVFR0) return 1; } + + if (extract32(insn, 28, 4) == 0xf) { + /* Encodings with T=1 (Thumb) or unconditional (ARM): + only used in v8 and above. */ + return 1; + } + dp = ((insn & 0xf00) == 0xb00); switch ((insn >> 24) & 0xf) { case 0xe: @@ -6296,9 +6303,6 @@ static int disas_coproc_insn(CPUARMState * env, DisasContext *s, uint32_t insn) return disas_dsp_insn(env, s, insn); } return 1; - case 10: - case 11: - return disas_vfp_insn (env, s, insn); default: break; } @@ -6753,6 +6757,12 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) goto illegal_op; return; } + if ((insn & 0x0f000e10) == 0x0e000a00) { + /* VFP. */ + if (disas_vfp_insn(env, s, insn)) + goto illegal_op; + return; + } if (((insn & 0x0f30f000) == 0x0510f000) || ((insn & 0x0f30f010) == 0x0710f000)) { if ((insn & (1 << 22)) == 0) { @@ -8033,9 +8043,15 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) case 0xc: case 0xd: case 0xe: - /* Coprocessor. */ - if (disas_coproc_insn(env, s, insn)) + if (((insn >> 8) & 0xe) == 10) { + /* VFP. */ + if (disas_vfp_insn(env, s, insn)) { + goto illegal_op; + } + } else if (disas_coproc_insn(env, s, insn)) { + /* Coprocessor. */ goto illegal_op; + } break; case 0xf: /* swi */ @@ -8765,6 +8781,10 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hw insn = (insn & 0xe2ffffff) | ((insn & (1 << 28)) >> 4) | (1 << 28); if (disas_neon_data_insn(env, s, insn)) goto illegal_op; + } else if (((insn >> 8) & 0xe) == 10) { + if (disas_vfp_insn(env, s, insn)) { + goto illegal_op; + } } else { if (insn & (1 << 28)) goto illegal_op;