mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TCG: Use gen_opparam_buf from context instead of global variable.

Browse Source 
Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Evgeny Voevodin 2012-11-12 13:27:48 +04:00 committed by Blue Swirl
parent 92414b31e7
commit 1ff0a2c594
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tcg/tcg.c
View File

@ -298,7 +298,7 @@ void tcg_func_start(TCGContext *s)
#endif #endif
s->gen_opc_ptr = s->gen_opc_buf; s->gen_opc_ptr = s->gen_opc_buf;
s->gen_opparam_ptr = gen_opparam_buf; s->gen_opparam_ptr = s->gen_opparam_buf;
#if defined(CONFIG_QEMU_LDST_OPTIMIZATION) && defined(CONFIG_SOFTMMU) #if defined(CONFIG_QEMU_LDST_OPTIMIZATION) && defined(CONFIG_SOFTMMU)
/* Initialize qemu_ld/st labels to assist code generation at the end of TB /* Initialize qemu_ld/st labels to assist code generation at the end of TB
@ -897,7 +897,7 @@ void tcg_dump_ops(TCGContext *s)
first_insn = 1; first_insn = 1;
opc_ptr = s->gen_opc_buf; opc_ptr = s->gen_opc_buf;
args = gen_opparam_buf; args = s->gen_opparam_buf;
while (opc_ptr < s->gen_opc_ptr) { while (opc_ptr < s->gen_opc_ptr) {
c = *opc_ptr++; c = *opc_ptr++;
def = &tcg_op_defs[c]; def = &tcg_op_defs[c];
@ -1440,8 +1440,9 @@ static void tcg_liveness_analysis(TCGContext *s)
op_index--; op_index--;
} }
if (args != gen_opparam_buf) if (args != s->gen_opparam_buf) {
tcg_abort(); tcg_abort();
}
} }
#else #else
/* dummy liveness analysis */ /* dummy liveness analysis */
@ -2222,7 +2223,7 @@ static inline int tcg_gen_code_common(TCGContext *s, uint8_t *gen_code_buf,
#ifdef USE_TCG_OPTIMIZATIONS #ifdef USE_TCG_OPTIMIZATIONS
s->gen_opparam_ptr = s->gen_opparam_ptr =
tcg_optimize(s, s->gen_opc_ptr, gen_opparam_buf, tcg_op_defs); tcg_optimize(s, s->gen_opc_ptr, s->gen_opparam_buf, tcg_op_defs);
#endif #endif
#ifdef CONFIG_PROFILER #ifdef CONFIG_PROFILER
@ -2249,7 +2250,7 @@ static inline int tcg_gen_code_common(TCGContext *s, uint8_t *gen_code_buf,
s->code_buf = gen_code_buf; s->code_buf = gen_code_buf;
s->code_ptr = gen_code_buf; s->code_ptr = gen_code_buf;
args = gen_opparam_buf; args = s->gen_opparam_buf;
op_index = 0; op_index = 0;
for(;;) { for(;;) {