diff options
Diffstat (limited to 'tci.c')
| -rw-r--r-- | tci.c | 47 |
1 files changed, 23 insertions, 24 deletions
@@ -420,35 +420,34 @@ static bool tci_compare64(uint64_t u0, uint64_t u1, TCGCond condition) } #ifdef CONFIG_SOFTMMU -# define mmuidx tci_read_i(&tb_ptr) # define qemu_ld_ub \ - helper_ret_ldub_mmu(env, taddr, mmuidx, (uintptr_t)tb_ptr) + helper_ret_ldub_mmu(env, taddr, oi, (uintptr_t)tb_ptr) # define qemu_ld_leuw \ - helper_le_lduw_mmu(env, taddr, mmuidx, (uintptr_t)tb_ptr) + helper_le_lduw_mmu(env, taddr, oi, (uintptr_t)tb_ptr) # define qemu_ld_leul \ - helper_le_ldul_mmu(env, taddr, mmuidx, (uintptr_t)tb_ptr) + helper_le_ldul_mmu(env, taddr, oi, (uintptr_t)tb_ptr) # define qemu_ld_leq \ - helper_le_ldq_mmu(env, taddr, mmuidx, (uintptr_t)tb_ptr) + helper_le_ldq_mmu(env, taddr, oi, (uintptr_t)tb_ptr) # define qemu_ld_beuw \ - helper_be_lduw_mmu(env, taddr, mmuidx, (uintptr_t)tb_ptr) + helper_be_lduw_mmu(env, taddr, oi, (uintptr_t)tb_ptr) # define qemu_ld_beul \ - helper_be_ldul_mmu(env, taddr, mmuidx, (uintptr_t)tb_ptr) + helper_be_ldul_mmu(env, taddr, oi, (uintptr_t)tb_ptr) # define qemu_ld_beq \ - helper_be_ldq_mmu(env, taddr, mmuidx, (uintptr_t)tb_ptr) + helper_be_ldq_mmu(env, taddr, oi, (uintptr_t)tb_ptr) # define qemu_st_b(X) \ - helper_ret_stb_mmu(env, taddr, X, mmuidx, (uintptr_t)tb_ptr) + helper_ret_stb_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) # define qemu_st_lew(X) \ - helper_le_stw_mmu(env, taddr, X, mmuidx, (uintptr_t)tb_ptr) + helper_le_stw_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) # define qemu_st_lel(X) \ - helper_le_stl_mmu(env, taddr, X, mmuidx, (uintptr_t)tb_ptr) + helper_le_stl_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) # define qemu_st_leq(X) \ - helper_le_stq_mmu(env, taddr, X, mmuidx, (uintptr_t)tb_ptr) + helper_le_stq_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) # define qemu_st_bew(X) \ - helper_be_stw_mmu(env, taddr, X, mmuidx, (uintptr_t)tb_ptr) + helper_be_stw_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) # define qemu_st_bel(X) \ - helper_be_stl_mmu(env, taddr, X, mmuidx, (uintptr_t)tb_ptr) + helper_be_stl_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) # define qemu_st_beq(X) \ - helper_be_stq_mmu(env, taddr, X, mmuidx, (uintptr_t)tb_ptr) + helper_be_stq_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr) #else # define qemu_ld_ub ldub_p(g2h(taddr)) # define qemu_ld_leuw lduw_le_p(g2h(taddr)) @@ -496,7 +495,7 @@ uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) #if TCG_TARGET_REG_BITS == 32 uint64_t v64; #endif - TCGMemOp memop; + TCGMemOpIdx oi; #if defined(GETPC) tci_tb_ptr = (uintptr_t)tb_ptr; @@ -1107,8 +1106,8 @@ uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) case INDEX_op_qemu_ld_i32: t0 = *tb_ptr++; taddr = tci_read_ulong(&tb_ptr); - memop = tci_read_i(&tb_ptr); - switch (memop) { + oi = tci_read_i(&tb_ptr); + switch (get_memop(oi)) { case MO_UB: tmp32 = qemu_ld_ub; break; @@ -1144,8 +1143,8 @@ uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) t1 = *tb_ptr++; } taddr = tci_read_ulong(&tb_ptr); - memop = tci_read_i(&tb_ptr); - switch (memop) { + oi = tci_read_i(&tb_ptr); + switch (get_memop(oi)) { case MO_UB: tmp64 = qemu_ld_ub; break; @@ -1193,8 +1192,8 @@ uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) case INDEX_op_qemu_st_i32: t0 = tci_read_r(&tb_ptr); taddr = tci_read_ulong(&tb_ptr); - memop = tci_read_i(&tb_ptr); - switch (memop) { + oi = tci_read_i(&tb_ptr); + switch (get_memop(oi)) { case MO_UB: qemu_st_b(t0); break; @@ -1217,8 +1216,8 @@ uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) case INDEX_op_qemu_st_i64: tmp64 = tci_read_r64(&tb_ptr); taddr = tci_read_ulong(&tb_ptr); - memop = tci_read_i(&tb_ptr); - switch (memop) { + oi = tci_read_i(&tb_ptr); + switch (get_memop(oi)) { case MO_UB: qemu_st_b(tmp64); break; |