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

tcg-arm: Rename use_armv5_instructions to use_armvt5_instructions 

As it really controls the availability of a thumb interworking
instruction on armv5t.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2013-07-04 11:20:26 -07:00
parent 72e1ccfc0c
commit fb82273851
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tcg/arm/tcg-target.c
View File

@ -43,13 +43,13 @@
defined(__ARM_ARCH_5T__) || \ defined(__ARM_ARCH_5T__) || \
defined(__ARM_ARCH_5TE__) || \ defined(__ARM_ARCH_5TE__) || \
defined(__ARM_ARCH_5TEJ__) defined(__ARM_ARCH_5TEJ__)
#define USE_ARMV5_INSTRUCTIONS #define USE_ARMV5T_INSTRUCTIONS
#endif #endif
#ifdef USE_ARMV5_INSTRUCTIONS #ifdef USE_ARMV5T_INSTRUCTIONS
static const int use_armv5_instructions = 1; static const int use_armv5t_instructions = 1;
#else #else
static const int use_armv5_instructions = 0; static const int use_armv5t_instructions = 0;
#endif #endif
#undef USE_ARMV5_INSTRUCTIONS #undef USE_ARMV5_INSTRUCTIONS
@ -1030,7 +1030,7 @@ static inline void tcg_out_call(TCGContext *s, uint32_t addr)
if (val - 8 < 0x02000000 && val - 8 >= -0x02000000) { if (val - 8 < 0x02000000 && val - 8 >= -0x02000000) {
if (addr & 1) { if (addr & 1) {
/* Use BLX if the target is in Thumb mode */ /* Use BLX if the target is in Thumb mode */
if (!use_armv5_instructions) { if (!use_armv5t_instructions) {
tcg_abort(); tcg_abort();
} }
tcg_out_blx_imm(s, val); tcg_out_blx_imm(s, val);
@ -1049,7 +1049,7 @@ static inline void tcg_out_call(TCGContext *s, uint32_t addr)
static inline void tcg_out_callr(TCGContext *s, int cond, int arg) static inline void tcg_out_callr(TCGContext *s, int cond, int arg)
{ {
if (use_armv5_instructions) { if (use_armv5t_instructions) {
tcg_out_blx(s, cond, arg); tcg_out_blx(s, cond, arg);
} else { } else {
tcg_out_dat_reg(s, cond, ARITH_MOV, TCG_REG_R14, 0, tcg_out_dat_reg(s, cond, ARITH_MOV, TCG_REG_R14, 0,