diff options
| -rw-r--r-- | target/hexagon/gen_tcg.h | 4 | ||||
| -rw-r--r-- | target/hexagon/genptr.c | 16 | ||||
| -rw-r--r-- | target/hexagon/macros.h | 3 |
3 files changed, 7 insertions, 16 deletions
diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index a375d6a7c5..ee94c903db 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -424,9 +424,9 @@ #define fGEN_TCG_L4_loadd_locked(SHORTCODE) \ SHORTCODE #define fGEN_TCG_S2_storew_locked(SHORTCODE) \ - do { SHORTCODE; READ_PREG(PdV, PdN); } while (0) + SHORTCODE #define fGEN_TCG_S4_stored_locked(SHORTCODE) \ - do { SHORTCODE; READ_PREG(PdV, PdN); } while (0) + SHORTCODE #define fGEN_TCG_STORE(SHORTCODE) \ do { \ diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 797a6c0cc9..fba5ec6012 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -27,12 +27,6 @@ #undef QEMU_GENERATE #include "gen_tcg.h" -static inline TCGv gen_read_preg(TCGv pred, uint8_t num) -{ - tcg_gen_mov_tl(pred, hex_pred[num]); - return pred; -} - static inline void gen_log_predicated_reg_write(int rnum, TCGv val, int slot) { TCGv zero = tcg_const_tl(0); @@ -334,8 +328,7 @@ static inline void gen_load_locked8u(TCGv_i64 dest, TCGv vaddr, int mem_index) tcg_gen_mov_i64(hex_llsc_val_i64, dest); } -static inline void gen_store_conditional4(CPUHexagonState *env, - DisasContext *ctx, int prednum, +static inline void gen_store_conditional4(DisasContext *ctx, TCGv pred, TCGv vaddr, TCGv src) { TCGLabel *fail = gen_new_label(); @@ -349,7 +342,7 @@ static inline void gen_store_conditional4(CPUHexagonState *env, tmp = tcg_temp_new(); tcg_gen_atomic_cmpxchg_tl(tmp, hex_llsc_addr, hex_llsc_val, src, ctx->mem_idx, MO_32); - tcg_gen_movcond_tl(TCG_COND_EQ, hex_pred[prednum], tmp, hex_llsc_val, + tcg_gen_movcond_tl(TCG_COND_EQ, pred, tmp, hex_llsc_val, one, zero); tcg_temp_free(one); tcg_temp_free(zero); @@ -363,8 +356,7 @@ static inline void gen_store_conditional4(CPUHexagonState *env, tcg_gen_movi_tl(hex_llsc_addr, ~0); } -static inline void gen_store_conditional8(CPUHexagonState *env, - DisasContext *ctx, int prednum, +static inline void gen_store_conditional8(DisasContext *ctx, TCGv pred, TCGv vaddr, TCGv_i64 src) { TCGLabel *fail = gen_new_label(); @@ -380,7 +372,7 @@ static inline void gen_store_conditional8(CPUHexagonState *env, ctx->mem_idx, MO_64); tcg_gen_movcond_i64(TCG_COND_EQ, tmp, tmp, hex_llsc_val_i64, one, zero); - tcg_gen_extrl_i64_i32(hex_pred[prednum], tmp); + tcg_gen_extrl_i64_i32(pred, tmp); tcg_temp_free_i64(one); tcg_temp_free_i64(zero); tcg_temp_free_i64(tmp); diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index 2b208f3a21..094b8dabb5 100644 --- a/target/hexagon/macros.h +++ b/target/hexagon/macros.h @@ -24,7 +24,6 @@ #ifdef QEMU_GENERATE #define READ_REG(dest, NUM) gen_read_reg(dest, NUM) -#define READ_PREG(dest, NUM) gen_read_preg(dest, (NUM)) #else #define READ_REG(NUM) (env->gpr[(NUM)]) #define READ_PREG(NUM) (env->pred[NUM]) @@ -591,7 +590,7 @@ static inline TCGv gen_read_ireg(TCGv result, TCGv val, int shift) #ifdef QEMU_GENERATE #define fSTORE_LOCKED(NUM, SIZE, EA, SRC, PRED) \ - gen_store_conditional##SIZE(env, ctx, PdN, PRED, EA, SRC); + gen_store_conditional##SIZE(ctx, PRED, EA, SRC); #endif #ifdef QEMU_GENERATE |