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

target-arm: Rearrange aa32 load and store functions

Browse Source 
Stop specializing on TARGET_LONG_BITS == 32; unconditionally allocate
a temp and expand with tcg_gen_extu_i32_tl.  Split out gen_aa32_addr,
gen_aa32_frob64, gen_aa32_ld_i32 and gen_aa32_st_i32 as separate interfaces.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2016-06-30 11:44:14 -07:00
parent 070e3edcea
commit 7f5616f538
1 changed files with 77 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
target-arm/translate.c
View File

@ -932,145 +932,106 @@ static inline void store_reg_from_load(DisasContext *s, int reg, TCGv_i32 var)
* These functions work like tcg_gen_qemu_{ld,st}* except * These functions work like tcg_gen_qemu_{ld,st}* except
* that the address argument is TCGv_i32 rather than TCGv. * that the address argument is TCGv_i32 rather than TCGv.
*/ */
#if TARGET_LONG_BITS == 32
#define DO_GEN_LD(SUFF, OPC, BE32_XOR) \ static inline TCGv gen_aa32_addr(DisasContext *s, TCGv_i32 a32, TCGMemOp op)
static inline void gen_aa32_ld##SUFF(DisasContext *s, TCGv_i32 val, \ {
TCGv_i32 addr, int index) \ TCGv addr = tcg_temp_new();
{ \ tcg_gen_extu_i32_tl(addr, a32);
TCGMemOp opc = (OPC) | s->be_data; \
/* Not needed for user-mode BE32, where we use MO_BE instead. */ \ /* Not needed for user-mode BE32, where we use MO_BE instead. */
if (!IS_USER_ONLY && s->sctlr_b && BE32_XOR) { \ if (!IS_USER_ONLY && s->sctlr_b && (op & MO_SIZE) < MO_32) {
TCGv addr_be = tcg_temp_new(); \ tcg_gen_xori_tl(addr, addr, 4 - (1 << (op & MO_SIZE)));
tcg_gen_xori_i32(addr_be, addr, BE32_XOR); \ }
tcg_gen_qemu_ld_i32(val, addr_be, index, opc); \ return addr;
tcg_temp_free(addr_be); \ }
return; \
} \ static void gen_aa32_ld_i32(DisasContext *s, TCGv_i32 val, TCGv_i32 a32,
tcg_gen_qemu_ld_i32(val, addr, index, opc); \ int index, TCGMemOp opc)
} {
TCGv addr = gen_aa32_addr(s, a32, opc);
#define DO_GEN_ST(SUFF, OPC, BE32_XOR) \ tcg_gen_qemu_ld_i32(val, addr, index, opc);
static inline void gen_aa32_st##SUFF(DisasContext *s, TCGv_i32 val, \ tcg_temp_free(addr);
TCGv_i32 addr, int index) \ }
{ \
TCGMemOp opc = (OPC) | s->be_data; \ static void gen_aa32_st_i32(DisasContext *s, TCGv_i32 val, TCGv_i32 a32,
/* Not needed for user-mode BE32, where we use MO_BE instead. */ \ int index, TCGMemOp opc)
if (!IS_USER_ONLY && s->sctlr_b && BE32_XOR) { \ {
TCGv addr_be = tcg_temp_new(); \ TCGv addr = gen_aa32_addr(s, a32, opc);
tcg_gen_xori_i32(addr_be, addr, BE32_XOR); \ tcg_gen_qemu_st_i32(val, addr, index, opc);
tcg_gen_qemu_st_i32(val, addr_be, index, opc); \ tcg_temp_free(addr);
tcg_temp_free(addr_be); \ }
return; \
} \ #define DO_GEN_LD(SUFF, OPC) \
tcg_gen_qemu_st_i32(val, addr, index, opc); \ static inline void gen_aa32_ld##SUFF(DisasContext *s, TCGv_i32 val, \
} TCGv_i32 a32, int index) \
{ \
static inline void gen_aa32_ld64(DisasContext *s, TCGv_i64 val, gen_aa32_ld_i32(s, val, a32, index, OPC | s->be_data); \
TCGv_i32 addr, int index) }
#define DO_GEN_ST(SUFF, OPC) \
static inline void gen_aa32_st##SUFF(DisasContext *s, TCGv_i32 val, \
TCGv_i32 a32, int index) \
{ \
gen_aa32_st_i32(s, val, a32, index, OPC | s->be_data); \
}
static inline void gen_aa32_frob64(DisasContext *s, TCGv_i64 val)
{ {
TCGMemOp opc = MO_Q | s->be_data;
tcg_gen_qemu_ld_i64(val, addr, index, opc);
/* Not needed for user-mode BE32, where we use MO_BE instead. */ /* Not needed for user-mode BE32, where we use MO_BE instead. */
if (!IS_USER_ONLY && s->sctlr_b) { if (!IS_USER_ONLY && s->sctlr_b) {
tcg_gen_rotri_i64(val, val, 32); tcg_gen_rotri_i64(val, val, 32);
} }
} }
static inline void gen_aa32_st64(DisasContext *s, TCGv_i64 val, static void gen_aa32_ld_i64(DisasContext *s, TCGv_i64 val, TCGv_i32 a32,
TCGv_i32 addr, int index) int index, TCGMemOp opc)
{ {
TCGMemOp opc = MO_Q | s->be_data; TCGv addr = gen_aa32_addr(s, a32, opc);
tcg_gen_qemu_ld_i64(val, addr, index, opc);
gen_aa32_frob64(s, val);
tcg_temp_free(addr);
}
static inline void gen_aa32_ld64(DisasContext *s, TCGv_i64 val,
TCGv_i32 a32, int index)
{
gen_aa32_ld_i64(s, val, a32, index, MO_Q | s->be_data);
}
static void gen_aa32_st_i64(DisasContext *s, TCGv_i64 val, TCGv_i32 a32,
int index, TCGMemOp opc)
{
TCGv addr = gen_aa32_addr(s, a32, opc);
/* Not needed for user-mode BE32, where we use MO_BE instead. */ /* Not needed for user-mode BE32, where we use MO_BE instead. */
if (!IS_USER_ONLY && s->sctlr_b) { if (!IS_USER_ONLY && s->sctlr_b) {
TCGv_i64 tmp = tcg_temp_new_i64(); TCGv_i64 tmp = tcg_temp_new_i64();
tcg_gen_rotri_i64(tmp, val, 32); tcg_gen_rotri_i64(tmp, val, 32);
tcg_gen_qemu_st_i64(tmp, addr, index, opc); tcg_gen_qemu_st_i64(tmp, addr, index, opc);
tcg_temp_free_i64(tmp); tcg_temp_free_i64(tmp);
return; } else {
}
tcg_gen_qemu_st_i64(val, addr, index, opc); tcg_gen_qemu_st_i64(val, addr, index, opc);
} }
tcg_temp_free(addr);
#else
#define DO_GEN_LD(SUFF, OPC, BE32_XOR) \
static inline void gen_aa32_ld##SUFF(DisasContext *s, TCGv_i32 val, \
TCGv_i32 addr, int index) \
{ \
TCGMemOp opc = (OPC) | s->be_data; \
TCGv addr64 = tcg_temp_new(); \
tcg_gen_extu_i32_i64(addr64, addr); \
/* Not needed for user-mode BE32, where we use MO_BE instead. */ \
if (!IS_USER_ONLY && s->sctlr_b && BE32_XOR) { \
tcg_gen_xori_i64(addr64, addr64, BE32_XOR); \
} \
tcg_gen_qemu_ld_i32(val, addr64, index, opc); \
tcg_temp_free(addr64); \
}
#define DO_GEN_ST(SUFF, OPC, BE32_XOR) \
static inline void gen_aa32_st##SUFF(DisasContext *s, TCGv_i32 val, \
TCGv_i32 addr, int index) \
{ \
TCGMemOp opc = (OPC) | s->be_data; \
TCGv addr64 = tcg_temp_new(); \
tcg_gen_extu_i32_i64(addr64, addr); \
/* Not needed for user-mode BE32, where we use MO_BE instead. */ \
if (!IS_USER_ONLY && s->sctlr_b && BE32_XOR) { \
tcg_gen_xori_i64(addr64, addr64, BE32_XOR); \
} \
tcg_gen_qemu_st_i32(val, addr64, index, opc); \
tcg_temp_free(addr64); \
}
static inline void gen_aa32_ld64(DisasContext *s, TCGv_i64 val,
TCGv_i32 addr, int index)
{
TCGMemOp opc = MO_Q | s->be_data;
TCGv addr64 = tcg_temp_new();
tcg_gen_extu_i32_i64(addr64, addr);
tcg_gen_qemu_ld_i64(val, addr64, index, opc);
/* Not needed for user-mode BE32, where we use MO_BE instead. */
if (!IS_USER_ONLY && s->sctlr_b) {
tcg_gen_rotri_i64(val, val, 32);
}
tcg_temp_free(addr64);
} }
static inline void gen_aa32_st64(DisasContext *s, TCGv_i64 val, static inline void gen_aa32_st64(DisasContext *s, TCGv_i64 val,
TCGv_i32 addr, int index) TCGv_i32 a32, int index)
{ {
TCGMemOp opc = MO_Q | s->be_data; gen_aa32_st_i64(s, val, a32, index, MO_Q | s->be_data);
TCGv addr64 = tcg_temp_new();
tcg_gen_extu_i32_i64(addr64, addr);
/* Not needed for user-mode BE32, where we use MO_BE instead. */
if (!IS_USER_ONLY && s->sctlr_b) {
TCGv tmp = tcg_temp_new();
tcg_gen_rotri_i64(tmp, val, 32);
tcg_gen_qemu_st_i64(tmp, addr64, index, opc);
tcg_temp_free(tmp);
} else {
tcg_gen_qemu_st_i64(val, addr64, index, opc);
}
tcg_temp_free(addr64);
} }
#endif DO_GEN_LD(8s, MO_SB)
DO_GEN_LD(8u, MO_UB)
DO_GEN_LD(8s, MO_SB, 3) DO_GEN_LD(16s, MO_SW)
DO_GEN_LD(8u, MO_UB, 3) DO_GEN_LD(16u, MO_UW)
DO_GEN_LD(16s, MO_SW, 2) DO_GEN_LD(32u, MO_UL)
DO_GEN_LD(16u, MO_UW, 2)
DO_GEN_LD(32u, MO_UL, 0)
/* 'a' variants include an alignment check */ /* 'a' variants include an alignment check */
DO_GEN_LD(16ua, MO_UW | MO_ALIGN, 2) DO_GEN_LD(16ua, MO_UW | MO_ALIGN)
DO_GEN_LD(32ua, MO_UL | MO_ALIGN, 0) DO_GEN_LD(32ua, MO_UL | MO_ALIGN)
DO_GEN_ST(8, MO_UB, 3) DO_GEN_ST(8, MO_UB)
DO_GEN_ST(16, MO_UW, 2) DO_GEN_ST(16, MO_UW)
DO_GEN_ST(32, MO_UL, 0) DO_GEN_ST(32, MO_UL)
static inline void gen_set_pc_im(DisasContext *s, target_ulong val) static inline void gen_set_pc_im(DisasContext *s, target_ulong val)
{ {