mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/arm: Unify unallocated path in disas_fp_1src

Browse Source 
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210525225817.400336-3-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2021-05-25 15:58:07 -07:00 committed by Peter Maydell
parent c0b9e8a489
commit fc5200ee45
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6501,8 +6501,7 @@ static void disas_fp_1src(DisasContext *s, uint32_t insn)
int rd = extract32(insn, 0, 5); int rd = extract32(insn, 0, 5);
if (mos) { if (mos) {
unallocated_encoding(s); goto do_unallocated;
return;
} }
switch (opcode) { switch (opcode) {
@ -6511,8 +6510,7 @@ static void disas_fp_1src(DisasContext *s, uint32_t insn)
/* FCVT between half, single and double precision */ /* FCVT between half, single and double precision */
int dtype = extract32(opcode, 0, 2); int dtype = extract32(opcode, 0, 2);
if (type == 2 || dtype == type) { if (type == 2 || dtype == type) {
unallocated_encoding(s); goto do_unallocated;
return;
} }
if (!fp_access_check(s)) { if (!fp_access_check(s)) {
return; return;
@ -6524,8 +6522,7 @@ static void disas_fp_1src(DisasContext *s, uint32_t insn)
case 0x10 ... 0x13: /* FRINT{32,64}{X,Z} */ case 0x10 ... 0x13: /* FRINT{32,64}{X,Z} */
if (type > 1 || !dc_isar_feature(aa64_frint, s)) { if (type > 1 || !dc_isar_feature(aa64_frint, s)) {
unallocated_encoding(s); goto do_unallocated;
return;
} }
/* fall through */ /* fall through */
case 0x0 ... 0x3: case 0x0 ... 0x3:
@ -6547,8 +6544,7 @@ static void disas_fp_1src(DisasContext *s, uint32_t insn)
break; break;
case 3: case 3:
if (!dc_isar_feature(aa64_fp16, s)) { if (!dc_isar_feature(aa64_fp16, s)) {
unallocated_encoding(s); goto do_unallocated;
return;
} }
if (!fp_access_check(s)) { if (!fp_access_check(s)) {
@ -6557,11 +6553,12 @@ static void disas_fp_1src(DisasContext *s, uint32_t insn)
handle_fp_1src_half(s, opcode, rd, rn); handle_fp_1src_half(s, opcode, rd, rn);
break; break;
default: default:
unallocated_encoding(s); goto do_unallocated;
} }
break; break;
default: default:
do_unallocated:
unallocated_encoding(s); unallocated_encoding(s);
break; break;
} }