[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 02/29] cpu-exec: Avoid global variables in icoun
From: |
Lluís Vilanova |
Subject: |
[Qemu-devel] [PATCH v11 02/29] cpu-exec: Avoid global variables in icount-related functions |
Date: |
Wed, 28 Jun 2017 15:24:44 +0300 |
User-agent: |
StGit/0.17.1-dirty |
Signed-off-by: Lluís Vilanova <address@hidden>
---
include/exec/gen-icount.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h
index 62d462e494..3fb17d435a 100644
--- a/include/exec/gen-icount.h
+++ b/include/exec/gen-icount.h
@@ -19,7 +19,7 @@ static inline void gen_tb_start(TranslationBlock *tb)
count = tcg_temp_new_i32();
}
- tcg_gen_ld_i32(count, cpu_env,
+ tcg_gen_ld_i32(count, tcg_ctx.tcg_env,
-ENV_OFFSET + offsetof(CPUState, icount_decr.u32));
if (tb->cflags & CF_USE_ICOUNT) {
@@ -37,7 +37,7 @@ static inline void gen_tb_start(TranslationBlock *tb)
tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, exitreq_label);
if (tb->cflags & CF_USE_ICOUNT) {
- tcg_gen_st16_i32(count, cpu_env,
+ tcg_gen_st16_i32(count, tcg_ctx.tcg_env,
-ENV_OFFSET + offsetof(CPUState,
icount_decr.u16.low));
}
@@ -62,14 +62,14 @@ static void gen_tb_end(TranslationBlock *tb, int num_insns)
static inline void gen_io_start(void)
{
TCGv_i32 tmp = tcg_const_i32(1);
- tcg_gen_st_i32(tmp, cpu_env, -ENV_OFFSET + offsetof(CPUState, can_do_io));
+ tcg_gen_st_i32(tmp, tcg_ctx.tcg_env, -ENV_OFFSET + offsetof(CPUState,
can_do_io));
tcg_temp_free_i32(tmp);
}
static inline void gen_io_end(void)
{
TCGv_i32 tmp = tcg_const_i32(0);
- tcg_gen_st_i32(tmp, cpu_env, -ENV_OFFSET + offsetof(CPUState, can_do_io));
+ tcg_gen_st_i32(tmp, tcg_ctx.tcg_env, -ENV_OFFSET + offsetof(CPUState,
can_do_io));
tcg_temp_free_i32(tmp);
}
- [Qemu-devel] [PATCH v11 00/29] translate: [tcg] Generic translation framework, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 01/29] Pass generic CPUState to gen_intermediate_code(), Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 02/29] cpu-exec: Avoid global variables in icount-related functions,
Lluís Vilanova <=
- [Qemu-devel] [PATCH v11 03/29] target: [tcg] Use a generic enum for DISAS_ values, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 04/29] target: [tcg] Add generic translation framework, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 05/29] target/i386: [tcg] Port to DisasContextBase, Lluís Vilanova, 2017/06/28
- [Qemu-devel] [PATCH v11 06/29] target/i386: [tcg] Refactor init_disas_context, Lluís Vilanova, 2017/06/28