From fa19f96e8c22d3da95defb87154459783b4c3431 Mon Sep 17 00:00:00 2001 From: Peter Maydell <peter.maydell@linaro.org> Date: Tue, 25 Jun 2019 18:56:32 -0500 Subject: [PATCH] target/arm: Check for dp support for dp VFM, not sp In commit 1120827fa182f0e7622 we accidentally put the "UNDEF unless FPU has double-precision support" check in the single-precision VFM function. Put it in the dp function where it belongs. Backports commit 34bea4edb9bbe8edf4b8606276482acdff5ca58b from qemu --- qemu/target/arm/translate-vfp.inc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu/target/arm/translate-vfp.inc.c b/qemu/target/arm/translate-vfp.inc.c index c57e5c85..fffea452 100644 --- a/qemu/target/arm/translate-vfp.inc.c +++ b/qemu/target/arm/translate-vfp.inc.c @@ -1793,10 +1793,6 @@ static bool trans_VFM_sp(DisasContext *s, arg_VFM_sp *a) return false; } - if (!dc_isar_feature(aa32_fpdp, s)) { - return false; - } - if (!vfp_access_check(s)) { return true; } @@ -1861,6 +1857,10 @@ static bool trans_VFM_dp(DisasContext *s, arg_VFM_dp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; }