yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-04-27 03:36:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-arm: implement setend

Browse source 
Since this is not a high-performance path, just use a helper to
flip the E bit and force a lookup in the hash table since the
flags have changed.

Backports commit 9886ecdf31165de2d4b8bccc1a220bd6ac8bc192 from qemu
This commit is contained in:
Paolo Bonzini 2018-02-21 02:38:42 -05:00 committed by Lioncash
parent 902170741a
commit aa5be4d6ca
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
17 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/aarch64.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_aarch64
#define gen_helper_set_rmode gen_helper_set_rmode_aarch64
#define gen_helper_set_user_reg gen_helper_set_user_reg_aarch64
#define gen_helper_setend gen_helper_setend_aarch64
#define gen_helper_shadd16 gen_helper_shadd16_aarch64
#define gen_helper_shadd8 gen_helper_shadd8_aarch64
#define gen_helper_shaddsubx gen_helper_shaddsubx_aarch64
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_aarch64
#define helper_set_rmode helper_set_rmode_aarch64
#define helper_set_user_reg helper_set_user_reg_aarch64
#define helper_setend helper_setend_aarch64
#define helper_shadd16 helper_shadd16_aarch64
#define helper_shadd8 helper_shadd8_aarch64
#define helper_shaddsubx helper_shaddsubx_aarch64

2
qemu/aarch64eb.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_aarch64eb
#define gen_helper_set_rmode gen_helper_set_rmode_aarch64eb
#define gen_helper_set_user_reg gen_helper_set_user_reg_aarch64eb
#define gen_helper_setend gen_helper_setend_aarch64eb
#define gen_helper_shadd16 gen_helper_shadd16_aarch64eb
#define gen_helper_shadd8 gen_helper_shadd8_aarch64eb
#define gen_helper_shaddsubx gen_helper_shaddsubx_aarch64eb
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_aarch64eb
#define helper_set_rmode helper_set_rmode_aarch64eb
#define helper_set_user_reg helper_set_user_reg_aarch64eb
#define helper_setend helper_setend_aarch64eb
#define helper_shadd16 helper_shadd16_aarch64eb
#define helper_shadd8 helper_shadd8_aarch64eb
#define helper_shaddsubx helper_shaddsubx_aarch64eb

2
qemu/arm.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_arm
#define gen_helper_set_rmode gen_helper_set_rmode_arm
#define gen_helper_set_user_reg gen_helper_set_user_reg_arm
#define gen_helper_setend gen_helper_setend_arm
#define gen_helper_shadd16 gen_helper_shadd16_arm
#define gen_helper_shadd8 gen_helper_shadd8_arm
#define gen_helper_shaddsubx gen_helper_shaddsubx_arm
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_arm
#define helper_set_rmode helper_set_rmode_arm
#define helper_set_user_reg helper_set_user_reg_arm
#define helper_setend helper_setend_arm
#define helper_shadd16 helper_shadd16_arm
#define helper_shadd8 helper_shadd8_arm
#define helper_shaddsubx helper_shaddsubx_arm

2
qemu/armeb.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_armeb
#define gen_helper_set_rmode gen_helper_set_rmode_armeb
#define gen_helper_set_user_reg gen_helper_set_user_reg_armeb
#define gen_helper_setend gen_helper_setend_armeb
#define gen_helper_shadd16 gen_helper_shadd16_armeb
#define gen_helper_shadd8 gen_helper_shadd8_armeb
#define gen_helper_shaddsubx gen_helper_shaddsubx_armeb
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_armeb
#define helper_set_rmode helper_set_rmode_armeb
#define helper_set_user_reg helper_set_user_reg_armeb
#define helper_setend helper_setend_armeb
#define helper_shadd16 helper_shadd16_armeb
#define helper_shadd8 helper_shadd8_armeb
#define helper_shaddsubx helper_shaddsubx_armeb

2
qemu/header_gen.py
View file

@ -1045,6 +1045,7 @@ symbols = (
'gen_helper_set_r13_banked',
'gen_helper_set_rmode',
'gen_helper_set_user_reg',
'gen_helper_setend',
'gen_helper_shadd16',
'gen_helper_shadd8',
'gen_helper_shaddsubx',
@ -1814,6 +1815,7 @@ symbols = (
'helper_set_r13_banked',
'helper_set_rmode',
'helper_set_user_reg',
'helper_setend',
'helper_shadd16',
'helper_shadd8',
'helper_shaddsubx',

2
qemu/m68k.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_m68k
#define gen_helper_set_rmode gen_helper_set_rmode_m68k
#define gen_helper_set_user_reg gen_helper_set_user_reg_m68k
#define gen_helper_setend gen_helper_setend_m68k
#define gen_helper_shadd16 gen_helper_shadd16_m68k
#define gen_helper_shadd8 gen_helper_shadd8_m68k
#define gen_helper_shaddsubx gen_helper_shaddsubx_m68k
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_m68k
#define helper_set_rmode helper_set_rmode_m68k
#define helper_set_user_reg helper_set_user_reg_m68k
#define helper_setend helper_setend_m68k
#define helper_shadd16 helper_shadd16_m68k
#define helper_shadd8 helper_shadd8_m68k
#define helper_shaddsubx helper_shaddsubx_m68k

2
qemu/mips.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_mips
#define gen_helper_set_rmode gen_helper_set_rmode_mips
#define gen_helper_set_user_reg gen_helper_set_user_reg_mips
#define gen_helper_setend gen_helper_setend_mips
#define gen_helper_shadd16 gen_helper_shadd16_mips
#define gen_helper_shadd8 gen_helper_shadd8_mips
#define gen_helper_shaddsubx gen_helper_shaddsubx_mips
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_mips
#define helper_set_rmode helper_set_rmode_mips
#define helper_set_user_reg helper_set_user_reg_mips
#define helper_setend helper_setend_mips
#define helper_shadd16 helper_shadd16_mips
#define helper_shadd8 helper_shadd8_mips
#define helper_shaddsubx helper_shaddsubx_mips

2
qemu/mips64.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_mips64
#define gen_helper_set_rmode gen_helper_set_rmode_mips64
#define gen_helper_set_user_reg gen_helper_set_user_reg_mips64
#define gen_helper_setend gen_helper_setend_mips64
#define gen_helper_shadd16 gen_helper_shadd16_mips64
#define gen_helper_shadd8 gen_helper_shadd8_mips64
#define gen_helper_shaddsubx gen_helper_shaddsubx_mips64
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_mips64
#define helper_set_rmode helper_set_rmode_mips64
#define helper_set_user_reg helper_set_user_reg_mips64
#define helper_setend helper_setend_mips64
#define helper_shadd16 helper_shadd16_mips64
#define helper_shadd8 helper_shadd8_mips64
#define helper_shaddsubx helper_shaddsubx_mips64

2
qemu/mips64el.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_mips64el
#define gen_helper_set_rmode gen_helper_set_rmode_mips64el
#define gen_helper_set_user_reg gen_helper_set_user_reg_mips64el
#define gen_helper_setend gen_helper_setend_mips64el
#define gen_helper_shadd16 gen_helper_shadd16_mips64el
#define gen_helper_shadd8 gen_helper_shadd8_mips64el
#define gen_helper_shaddsubx gen_helper_shaddsubx_mips64el
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_mips64el
#define helper_set_rmode helper_set_rmode_mips64el
#define helper_set_user_reg helper_set_user_reg_mips64el
#define helper_setend helper_setend_mips64el
#define helper_shadd16 helper_shadd16_mips64el
#define helper_shadd8 helper_shadd8_mips64el
#define helper_shaddsubx helper_shaddsubx_mips64el

2
qemu/mipsel.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_mipsel
#define gen_helper_set_rmode gen_helper_set_rmode_mipsel
#define gen_helper_set_user_reg gen_helper_set_user_reg_mipsel
#define gen_helper_setend gen_helper_setend_mipsel
#define gen_helper_shadd16 gen_helper_shadd16_mipsel
#define gen_helper_shadd8 gen_helper_shadd8_mipsel
#define gen_helper_shaddsubx gen_helper_shaddsubx_mipsel
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_mipsel
#define helper_set_rmode helper_set_rmode_mipsel
#define helper_set_user_reg helper_set_user_reg_mipsel
#define helper_setend helper_setend_mipsel
#define helper_shadd16 helper_shadd16_mipsel
#define helper_shadd8 helper_shadd8_mipsel
#define helper_shaddsubx helper_shaddsubx_mipsel

2
qemu/powerpc.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_powerpc
#define gen_helper_set_rmode gen_helper_set_rmode_powerpc
#define gen_helper_set_user_reg gen_helper_set_user_reg_powerpc
#define gen_helper_setend gen_helper_setend_powerpc
#define gen_helper_shadd16 gen_helper_shadd16_powerpc
#define gen_helper_shadd8 gen_helper_shadd8_powerpc
#define gen_helper_shaddsubx gen_helper_shaddsubx_powerpc
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_powerpc
#define helper_set_rmode helper_set_rmode_powerpc
#define helper_set_user_reg helper_set_user_reg_powerpc
#define helper_setend helper_setend_powerpc
#define helper_shadd16 helper_shadd16_powerpc
#define helper_shadd8 helper_shadd8_powerpc
#define helper_shaddsubx helper_shaddsubx_powerpc

2
qemu/sparc.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_sparc
#define gen_helper_set_rmode gen_helper_set_rmode_sparc
#define gen_helper_set_user_reg gen_helper_set_user_reg_sparc
#define gen_helper_setend gen_helper_setend_sparc
#define gen_helper_shadd16 gen_helper_shadd16_sparc
#define gen_helper_shadd8 gen_helper_shadd8_sparc
#define gen_helper_shaddsubx gen_helper_shaddsubx_sparc
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_sparc
#define helper_set_rmode helper_set_rmode_sparc
#define helper_set_user_reg helper_set_user_reg_sparc
#define helper_setend helper_setend_sparc
#define helper_shadd16 helper_shadd16_sparc
#define helper_shadd8 helper_shadd8_sparc
#define helper_shaddsubx helper_shaddsubx_sparc

2
qemu/sparc64.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_sparc64
#define gen_helper_set_rmode gen_helper_set_rmode_sparc64
#define gen_helper_set_user_reg gen_helper_set_user_reg_sparc64
#define gen_helper_setend gen_helper_setend_sparc64
#define gen_helper_shadd16 gen_helper_shadd16_sparc64
#define gen_helper_shadd8 gen_helper_shadd8_sparc64
#define gen_helper_shaddsubx gen_helper_shaddsubx_sparc64
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_sparc64
#define helper_set_rmode helper_set_rmode_sparc64
#define helper_set_user_reg helper_set_user_reg_sparc64
#define helper_setend helper_setend_sparc64
#define helper_shadd16 helper_shadd16_sparc64
#define helper_shadd8 helper_shadd8_sparc64
#define helper_shaddsubx helper_shaddsubx_sparc64

1
qemu/target-arm/helper.h
View file

@ -51,6 +51,7 @@ DEF_HELPER_FLAGS_3(sel_flags, TCG_CALL_NO_RWG_SE,
i32, i32, i32, i32)
DEF_HELPER_2(exception_internal, void, env, i32)
DEF_HELPER_4(exception_with_syndrome, void, env, i32, i32, i32)
DEF_HELPER_1(setend, void, env)
DEF_HELPER_1(wfi, void, env)
DEF_HELPER_1(wfe, void, env)
DEF_HELPER_1(yield, void, env)

5
qemu/target-arm/op_helper.c
View file

@ -296,6 +296,11 @@ uint32_t HELPER(usat16)(CPUARMState *env, uint32_t x, uint32_t shift)
return res;
}
void HELPER(setend)(CPUARMState *env)
{
env->uncached_cpsr ^= CPSR_E;
}
/* Function checks whether WFx (WFI/WFE) instructions are set up to be trapped.
* The function returns the target EL (1-3) if the instruction is to be trapped;
* otherwise it returns 0 indicating it is not trapped.

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

@ -7917,10 +7917,9 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) // qq
if ((insn & 0x0ffffdff) == 0x01010000) {
ARCH(6);
/* setend */
if (((insn >> 9) & 1) != bswap_code(s->sctlr_b)) {
/* Dynamic endianness switching not implemented. */
qemu_log_mask(LOG_UNIMP, "arm: unimplemented setend\n");
goto illegal_op;
if (((insn >> 9) & 1) != !!(s->be_data == MO_BE)) {
gen_helper_setend(tcg_ctx, tcg_ctx->cpu_env);
s->is_jmp = DISAS_UPDATE;
}
return;
} else if ((insn & 0x0fffff00) == 0x057ff000) {
@ -11276,10 +11275,9 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s) // qq
case 2:
/* setend */
ARCH(6);
if (((insn >> 3) & 1) != bswap_code(s->sctlr_b)) {
/* Dynamic endianness switching not implemented. */
qemu_log_mask(LOG_UNIMP, "arm: unimplemented setend\n");
goto illegal_op;
if (((insn >> 3) & 1) != !!(s->be_data == MO_BE)) {
gen_helper_setend(tcg_ctx, tcg_ctx->cpu_env);
s->is_jmp = DISAS_UPDATE;
}
break;
case 3:

2
qemu/x86_64.h
View file

@ -1039,6 +1039,7 @@
#define gen_helper_set_r13_banked gen_helper_set_r13_banked_x86_64
#define gen_helper_set_rmode gen_helper_set_rmode_x86_64
#define gen_helper_set_user_reg gen_helper_set_user_reg_x86_64
#define gen_helper_setend gen_helper_setend_x86_64
#define gen_helper_shadd16 gen_helper_shadd16_x86_64
#define gen_helper_shadd8 gen_helper_shadd8_x86_64
#define gen_helper_shaddsubx gen_helper_shaddsubx_x86_64
@ -1808,6 +1809,7 @@
#define helper_set_r13_banked helper_set_r13_banked_x86_64
#define helper_set_rmode helper_set_rmode_x86_64
#define helper_set_user_reg helper_set_user_reg_x86_64
#define helper_setend helper_setend_x86_64
#define helper_shadd16 helper_shadd16_x86_64
#define helper_shadd8 helper_shadd8_x86_64
#define helper_shaddsubx helper_shaddsubx_x86_64