ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-arm: A64: Add floating-point<->integer conversion instructions 

Add support for the AArch64 floating-point <-> integer conversion
instructions to disas_fpintconv. In the process we can rearrange
and simplify the detection of unallocated encodings a little.
We also correct a typo in the instruction encoding diagram for this
instruction group: bit 21 is 1, not 0.

Signed-off-by: Will Newton <will.newton@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Will Newton 2014-01-07 17:19:14 +00:00 committed by Peter Maydell
parent 52a1f6a3ab
commit c436d40614
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
target-arm/translate-a64.c
View File

@ -3904,7 +3904,7 @@ static void handle_fmov(DisasContext *s, int rd, int rn, int type, bool itof)
/* C3.6.30 Floating point <-> integer conversions /* C3.6.30 Floating point <-> integer conversions
* 31 30 29 28 24 23 22 21 20 19 18 16 15 10 9 5 4 0 * 31 30 29 28 24 23 22 21 20 19 18 16 15 10 9 5 4 0
* +----+---+---+-----------+------+---+-------+-----+-------------+----+----+ * +----+---+---+-----------+------+---+-------+-----+-------------+----+----+
* | sf | 0 | S | 1 1 1 1 0 | type | 0 | rmode | opc | 0 0 0 0 0 0 | Rn | Rd | * | sf | 0 | S | 1 1 1 1 0 | type | 1 | rmode | opc | 0 0 0 0 0 0 | Rn | Rd |
* +----+---+---+-----------+------+---+-------+-----+-------------+----+----+ * +----+---+---+-----------+------+---+-------+-----+-------------+----+----+
*/ */
static void disas_fp_int_conv(DisasContext *s, uint32_t insn) static void disas_fp_int_conv(DisasContext *s, uint32_t insn)
@ -3917,10 +3917,20 @@ static void disas_fp_int_conv(DisasContext *s, uint32_t insn)
bool sbit = extract32(insn, 29, 1); bool sbit = extract32(insn, 29, 1);
bool sf = extract32(insn, 31, 1); bool sf = extract32(insn, 31, 1);
if (!sbit && (rmode < 2) && (opcode > 5)) { if (sbit) {
unallocated_encoding(s);
return;
}
if (opcode > 5) {
/* FMOV */ /* FMOV */
bool itof = opcode & 1; bool itof = opcode & 1;
if (rmode >= 2) {
unallocated_encoding(s);
return;
}
switch (sf << 3 | type << 1 | rmode) { switch (sf << 3 | type << 1 | rmode) {
case 0x0: /* 32 bit */ case 0x0: /* 32 bit */
case 0xa: /* 64 bit */ case 0xa: /* 64 bit */
@ -3935,7 +3945,14 @@ static void disas_fp_int_conv(DisasContext *s, uint32_t insn)
handle_fmov(s, rd, rn, type, itof); handle_fmov(s, rd, rn, type, itof);
} else { } else {
/* actual FP conversions */ /* actual FP conversions */
unsupported_encoding(s, insn); bool itof = extract32(opcode, 1, 1);
if (type > 1 || (rmode != 0 && opcode > 1)) {
unallocated_encoding(s);
return;
}
handle_fpfpcvt(s, rd, rn, opcode, itof, rmode, 64, sf, type);
} }
} }