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: 21844 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4F00F20299 for ; Thu, 28 Nov 2013 17:07:20 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 5sf20079632qeb.7 for ; Thu, 28 Nov 2013 09:07:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:cc:subject:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=uuw/Tt+rOW5M1j3x/XTEEXS0AgqgWowhjZqGhLrPua0=; b=CkH1SDWLyEDFKr0Bpg8gUN04kCILqtgm8s493EpO8UeuYSZbGl8wzSY6pQp78gP3KG QEQIkz3psRKhaTJhjCOWPzZqSzc6j/IxvXitxJ/LslREjhZah1hozYCrAGLD+vtK4lpS VklnMKHatl0AV+WueQa/HQ9Z8e74v+Jtb1W+zS9ZXrhYiuuVGpybSk59AM6daG53N/Zj jebJZ3oKPHVkfuTGhV+TufO3S+Ib7cAWMC22bahP9v9T73bQhDmyTmFEXOaF6cqduhRu NKogaZyfAhWH27aFog8nPU2amyI2MK7hEZjsgt/gssj2/hliPVWuCvSnfRcGtj+p/JOq UUEw== X-Gm-Message-State: ALoCoQnV+W1+fu/tEwSliQ9yvzYv/mg6j5tYq2poQIA3XEMGzQ8fimxQvUWJiMJ5ukfh+L4LV652 X-Received: by 10.236.52.7 with SMTP id d7mr20239816yhc.32.1385658440583; Thu, 28 Nov 2013 09:07:20 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.82.226 with SMTP id l2ls3431787qey.33.gmail; Thu, 28 Nov 2013 09:07:20 -0800 (PST) X-Received: by 10.53.5.196 with SMTP id co4mr11398428vdd.9.1385658440514; Thu, 28 Nov 2013 09:07:20 -0800 (PST) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id gq10si23182326vdc.30.2013.11.28.09.07.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Nov 2013 09:07:20 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id jw12so6226504veb.38 for ; Thu, 28 Nov 2013 09:07:20 -0800 (PST) X-Received: by 10.52.52.137 with SMTP id t9mr20108105vdo.22.1385658440387; Thu, 28 Nov 2013 09:07:20 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp29414vcz; Thu, 28 Nov 2013 09:07:19 -0800 (PST) X-Received: by 10.15.10.7 with SMTP id f7mr6478457eet.51.1385658439018; Thu, 28 Nov 2013 09:07:19 -0800 (PST) Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by mx.google.com with ESMTPS id j44si19019913eep.268.2013.11.28.09.07.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Nov 2013 09:07:19 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.171 is neither permitted nor denied by best guess record for domain of will.newton@linaro.org) client-ip=209.85.215.171; Received: by mail-ea0-f171.google.com with SMTP id h10so6086415eak.30 for ; Thu, 28 Nov 2013 09:07:18 -0800 (PST) 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 CC: Patch Tracking Subject: [PATCH v6 1/4] target-arm: Move call to disas_vfp_insn out of disas_coproc_insn. X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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;