yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 02:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Remove ARCH macro

Browse source 
The ARCH() macro was used a lot in the legacy decoder, but
there are now just two uses of it left. Since a macro which
expands out to a goto is liable to be confusing when reading
code, replace the last two uses with a simple open-coded
qeuivalent.

Backports ce51c7f522ca488c795c3510413e338021141c96
This commit is contained in:
Peter Maydell 2021-02-26 11:21:19 -05:00 committed by Lioncash
parent 5d9c0addcf
commit 368323b03f
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qemu/target/arm/translate.c
View file

@ -48,8 +48,6 @@
#define ENABLE_ARCH_7 arm_dc_feature(s, ARM_FEATURE_V7)
#define ENABLE_ARCH_8 arm_dc_feature(s, ARM_FEATURE_V8)
#define ARCH(x) do { if (!ENABLE_ARCH_##x) goto illegal_op; } while(0)
#include "translate.h"
#if defined(CONFIG_USER_ONLY)
@ -8163,7 +8161,7 @@ static bool trans_BLX_i(DisasContext *s, arg_BLX_i *a)
TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv_i32 tmp;
/* For A32, ARCH(5) is checked near the start of the uncond block. */
/* For A32, ARM_FEATURE_V5 is checked near the start of the uncond block. */
if (s->thumb && (a->imm & 2)) {
return false;
}
@ -8533,7 +8531,10 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn)
* choose to UNDEF. In ARMv5 and above the space is used
* for miscellaneous unconditional instructions.
*/
ARCH(5);
if (!arm_dc_feature(s, ARM_FEATURE_V5)) {
unallocated_encoding(s);
return;
}
/* Unconditional instructions. */
/* TODO: Perhaps merge these into one decodetree output file. */
@ -8659,7 +8660,10 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn)
goto illegal_op;
}
} else if ((insn & 0xf800e800) != 0xf000e800) {
ARCH(6T2);
if (!arm_dc_feature(s, ARM_FEATURE_THUMB2)) {
unallocated_encoding(s);
return;
}
}
if (arm_dc_feature(s, ARM_FEATURE_M)) {