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

target-arm: introduce disas flag for endianness 

Introduce a disas flag for setting the CPU data endianness. This allows
control of the endianness from the CPU state rather than hard-coding it
to TARGET_WORDS_BIGENDIAN.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
[ PC changes:
  * Split off as new patch from original:
        "target-arm: introduce tbflag for CPSR.E"
  * Wrote commit message from scratch
]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Paolo Bonzini 2016-03-04 11:30:20 +00:00 committed by Peter Maydell
parent 12dcc3217d
commit dacf0a2ff7
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11032,6 +11032,7 @@ void gen_intermediate_code_a64(ARMCPU *cpu, TranslationBlock *tb)
!arm_el_is_aa64(env, 3); !arm_el_is_aa64(env, 3);
dc->thumb = 0; dc->thumb = 0;
dc->sctlr_b = 0; dc->sctlr_b = 0;
dc->be_data = MO_TE;
dc->condexec_mask = 0; dc->condexec_mask = 0;
dc->condexec_cond = 0; dc->condexec_cond = 0;
dc->mmu_idx = ARM_TBFLAG_MMUIDX(tb->flags); dc->mmu_idx = ARM_TBFLAG_MMUIDX(tb->flags);

39
target-arm/translate.c
View File

@ -924,26 +924,30 @@ static inline void store_reg_from_load(DisasContext *s, int reg, TCGv_i32 var)
static inline void gen_aa32_ld##SUFF(DisasContext *s, TCGv_i32 val, \ static inline void gen_aa32_ld##SUFF(DisasContext *s, TCGv_i32 val, \
TCGv_i32 addr, int index) \ TCGv_i32 addr, int index) \
{ \ { \
tcg_gen_qemu_ld_i32(val, addr, index, (OPC)); \ TCGMemOp opc = (OPC) | s->be_data; \
tcg_gen_qemu_ld_i32(val, addr, index, opc); \
} }
#define DO_GEN_ST(SUFF, OPC) \ #define DO_GEN_ST(SUFF, OPC) \
static inline void gen_aa32_st##SUFF(DisasContext *s, TCGv_i32 val, \ static inline void gen_aa32_st##SUFF(DisasContext *s, TCGv_i32 val, \
TCGv_i32 addr, int index) \ TCGv_i32 addr, int index) \
{ \ { \
tcg_gen_qemu_st_i32(val, addr, index, (OPC)); \ TCGMemOp opc = (OPC) | s->be_data; \
tcg_gen_qemu_st_i32(val, addr, index, opc); \
} }
static inline void gen_aa32_ld64(DisasContext *s, TCGv_i64 val, static inline void gen_aa32_ld64(DisasContext *s, TCGv_i64 val,
TCGv_i32 addr, int index) TCGv_i32 addr, int index)
{ {
tcg_gen_qemu_ld_i64(val, addr, index, MO_TEQ); TCGMemOp opc = MO_Q | s->be_data;
tcg_gen_qemu_ld_i64(val, addr, index, opc);
} }
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 addr, int index)
{ {
tcg_gen_qemu_st_i64(val, addr, index, MO_TEQ); TCGMemOp opc = MO_Q | s->be_data;
tcg_gen_qemu_st_i64(val, addr, index, opc);
} }
#else #else
@ -952,9 +956,10 @@ static inline void gen_aa32_st64(DisasContext *s, TCGv_i64 val,
static inline void gen_aa32_ld##SUFF(DisasContext *s, TCGv_i32 val, \ static inline void gen_aa32_ld##SUFF(DisasContext *s, TCGv_i32 val, \
TCGv_i32 addr, int index) \ TCGv_i32 addr, int index) \
{ \ { \
TCGMemOp opc = (OPC) | s->be_data; \
TCGv addr64 = tcg_temp_new(); \ TCGv addr64 = tcg_temp_new(); \
tcg_gen_extu_i32_i64(addr64, addr); \ tcg_gen_extu_i32_i64(addr64, addr); \
tcg_gen_qemu_ld_i32(val, addr64, index, OPC); \ tcg_gen_qemu_ld_i32(val, addr64, index, opc); \
tcg_temp_free(addr64); \ tcg_temp_free(addr64); \
} }
@ -962,27 +967,30 @@ static inline void gen_aa32_ld##SUFF(DisasContext *s, TCGv_i32 val, \
static inline void gen_aa32_st##SUFF(DisasContext *s, TCGv_i32 val, \ static inline void gen_aa32_st##SUFF(DisasContext *s, TCGv_i32 val, \
TCGv_i32 addr, int index) \ TCGv_i32 addr, int index) \
{ \ { \
TCGMemOp opc = (OPC) | s->be_data; \
TCGv addr64 = tcg_temp_new(); \ TCGv addr64 = tcg_temp_new(); \
tcg_gen_extu_i32_i64(addr64, addr); \ tcg_gen_extu_i32_i64(addr64, addr); \
tcg_gen_qemu_st_i32(val, addr64, index, OPC); \ tcg_gen_qemu_st_i32(val, addr64, index, opc); \
tcg_temp_free(addr64); \ tcg_temp_free(addr64); \
} }
static inline void gen_aa32_ld64(DisasContext *s, TCGv_i64 val, static inline void gen_aa32_ld64(DisasContext *s, TCGv_i64 val,
TCGv_i32 addr, int index) TCGv_i32 addr, int index)
{ {
TCGMemOp opc = MO_Q | s->be_data;
TCGv addr64 = tcg_temp_new(); TCGv addr64 = tcg_temp_new();
tcg_gen_extu_i32_i64(addr64, addr); tcg_gen_extu_i32_i64(addr64, addr);
tcg_gen_qemu_ld_i64(val, addr64, index, MO_TEQ); tcg_gen_qemu_ld_i64(val, addr64, index, opc);
tcg_temp_free(addr64); 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 addr, int index)
{ {
TCGMemOp opc = MO_Q | s->be_data;
TCGv addr64 = tcg_temp_new(); TCGv addr64 = tcg_temp_new();
tcg_gen_extu_i32_i64(addr64, addr); tcg_gen_extu_i32_i64(addr64, addr);
tcg_gen_qemu_st_i64(val, addr64, index, MO_TEQ); tcg_gen_qemu_st_i64(val, addr64, index, opc);
tcg_temp_free(addr64); tcg_temp_free(addr64);
} }
@ -990,15 +998,15 @@ static inline void gen_aa32_st64(DisasContext *s, TCGv_i64 val,
DO_GEN_LD(8s, MO_SB) DO_GEN_LD(8s, MO_SB)
DO_GEN_LD(8u, MO_UB) DO_GEN_LD(8u, MO_UB)
DO_GEN_LD(16s, MO_TESW) DO_GEN_LD(16s, MO_SW)
DO_GEN_LD(16u, MO_TEUW) DO_GEN_LD(16u, MO_UW)
DO_GEN_LD(32u, MO_TEUL) DO_GEN_LD(32u, MO_UL)
/* 'a' variants include an alignment check */ /* 'a' variants include an alignment check */
DO_GEN_LD(16ua, MO_TEUW | MO_ALIGN) DO_GEN_LD(16ua, MO_UW | MO_ALIGN)
DO_GEN_LD(32ua, MO_TEUL | MO_ALIGN) DO_GEN_LD(32ua, MO_UL | MO_ALIGN)
DO_GEN_ST(8, MO_UB) DO_GEN_ST(8, MO_UB)
DO_GEN_ST(16, MO_TEUW) DO_GEN_ST(16, MO_UW)
DO_GEN_ST(32, MO_TEUL) 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)
{ {
@ -11322,6 +11330,7 @@ void gen_intermediate_code(CPUARMState *env, TranslationBlock *tb)
!arm_el_is_aa64(env, 3); !arm_el_is_aa64(env, 3);
dc->thumb = ARM_TBFLAG_THUMB(tb->flags); dc->thumb = ARM_TBFLAG_THUMB(tb->flags);
dc->sctlr_b = ARM_TBFLAG_SCTLR_B(tb->flags); dc->sctlr_b = ARM_TBFLAG_SCTLR_B(tb->flags);
dc->be_data = MO_TE;
dc->condexec_mask = (ARM_TBFLAG_CONDEXEC(tb->flags) & 0xf) << 1; dc->condexec_mask = (ARM_TBFLAG_CONDEXEC(tb->flags) & 0xf) << 1;
dc->condexec_cond = ARM_TBFLAG_CONDEXEC(tb->flags) >> 4; dc->condexec_cond = ARM_TBFLAG_CONDEXEC(tb->flags) >> 4;
dc->mmu_idx = ARM_TBFLAG_MMUIDX(tb->flags); dc->mmu_idx = ARM_TBFLAG_MMUIDX(tb->flags);

1
target-arm/translate.h
View File

@ -17,6 +17,7 @@ typedef struct DisasContext {
int singlestep_enabled; int singlestep_enabled;
int thumb; int thumb;
int sctlr_b; int sctlr_b;
TCGMemOp be_data;
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
int user; int user;
#endif #endif