[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/14] ARM: Fix decoding of VFP forms of VCVT betwee
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 05/14] ARM: Fix decoding of VFP forms of VCVT between float and int/fixed |
Date: |
Tue, 7 Dec 2010 15:43:34 +0000 |
Correct the decoding of source and destination registers
for the VFP forms of the VCVT instructions which convert
between floating point and integer or fixed-point.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Nathan Froyd <address@hidden>
---
target-arm/translate.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 7ee5375..69a424a 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -2870,16 +2870,18 @@ static int disas_vfp_insn(CPUState * env, DisasContext
*s, uint32_t insn)
VFP_DREG_N(rn, insn);
}
- if (op == 15 && (rn == 15 || rn > 17)) {
+ if (op == 15 && (rn == 15 || ((rn & 0x1c) == 0x18))) {
/* Integer or single precision destination. */
rd = VFP_SREG_D(insn);
} else {
VFP_DREG_D(rd, insn);
}
-
- if (op == 15 && (rn == 16 || rn == 17)) {
- /* Integer source. */
- rm = ((insn << 1) & 0x1e) | ((insn >> 5) & 1);
+ if (op == 15 &&
+ (((rn & 0x1c) == 0x10) || ((rn & 0x14) == 0x14))) {
+ /* VCVT from int is always from S reg regardless of dp bit.
+ * VCVT with immediate frac_bits has same format as SREG_M
+ */
+ rm = VFP_SREG_M(insn);
} else {
VFP_DREG_M(rm, insn);
}
@@ -2891,6 +2893,9 @@ static int disas_vfp_insn(CPUState * env, DisasContext
*s, uint32_t insn)
} else {
rd = VFP_SREG_D(insn);
}
+ /* NB that we implicitly rely on the encoding for the frac_bits
+ * in VCVT of fixed to float being the same as that of an
SREG_M
+ */
rm = VFP_SREG_M(insn);
}
@@ -3179,8 +3184,8 @@ static int disas_vfp_insn(CPUState * env, DisasContext
*s, uint32_t insn)
/* Write back the result. */
if (op == 15 && (rn >= 8 && rn <= 11))
; /* Comparison, do nothing. */
- else if (op == 15 && rn > 17)
- /* Integer result. */
+ else if (op == 15 && dp && ((rn & 0x1c) == 0x18))
+ /* VCVT double to int: always integer result. */
gen_mov_vreg_F0(0, rd);
else if (op == 15 && rn == 15)
/* conversion */
--
1.6.3.3
- [Qemu-devel] [PATCH 00/14] [PULL] ARM fixes, v2, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 04/14] ARM: fix ldrexd/strexd, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 11/14] ARM: Return correct result for single<->double conversion of NaN, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 14/14] ARM: Implement VCVT to 16 bit integer using new softfloat routines, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 05/14] ARM: Fix decoding of VFP forms of VCVT between float and int/fixed,
Peter Maydell <=
- [Qemu-devel] [PATCH 13/14] softfloat: Add float/double to 16 bit integer conversion functions, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 10/14] softfloat: Add float*_maybe_silence_nan() functions, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 03/14] target-arm: Handle 'smc' as an undefined instruction, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 02/14] target-arm: Fix mixup in decoding of saturating add and sub, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 12/14] ARM: Ignore top 16 bits when doing VCVT from 16 bit fixed point, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 08/14] softfloat: Add float*_is_any_nan() functions, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 01/14] target-arm: Add support for PKHxx in thumb2, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 07/14] ARM: Fix sense of to_integer bit in Neon VCVT float/int conversion, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 06/14] ARM: Fix decoding of Neon forms of VCVT between float and fixed point, Peter Maydell, 2010/12/07
- [Qemu-devel] [PATCH 09/14] ARM: Return correct result for float-to-integer conversion of NaN, Peter Maydell, 2010/12/07