From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXqJL-0004bY-As for qemu-devel@nongnu.org; Mon, 12 Nov 2012 04:28:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TXqJI-0006cz-8F for qemu-devel@nongnu.org; Mon, 12 Nov 2012 04:28:07 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:29830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXqJI-0006cu-2s for qemu-devel@nongnu.org; Mon, 12 Nov 2012 04:28:04 -0500 Received: from eusync4.samsung.com (mailout3.w1.samsung.com [210.118.77.13]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MDD004CUBNH7B60@mailout3.w1.samsung.com> for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:28:29 +0000 (GMT) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.8.15]) by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MDD00AS6BMG4350@eusync4.samsung.com> for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:28:03 +0000 (GMT) From: Evgeny Voevodin Date: Mon, 12 Nov 2012 13:27:48 +0400 Message-id: <1352712469-27974-7-git-send-email-e.voevodin@samsung.com> In-reply-to: <1352712469-27974-1-git-send-email-e.voevodin@samsung.com> References: <1352712469-27974-1-git-send-email-e.voevodin@samsung.com> Subject: [Qemu-devel] [PATCH v6 6/7] TCG: Use gen_opparam_buf from context instead of global variable. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Evgeny Voevodin , blauwirbel@gmail.com, kyungmin.park@samsung.com, edgar.iglesias@gmail.com, aurelien@aurel32.net, rth@twiddle.net Signed-off-by: Evgeny Voevodin Reviewed-by: Richard Henderson --- tcg/tcg.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index a039001..ea0bd3a 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -298,7 +298,7 @@ void tcg_func_start(TCGContext *s) #endif 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) /* 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; opc_ptr = s->gen_opc_buf; - args = gen_opparam_buf; + args = s->gen_opparam_buf; while (opc_ptr < s->gen_opc_ptr) { c = *opc_ptr++; def = &tcg_op_defs[c]; @@ -1440,8 +1440,9 @@ static void tcg_liveness_analysis(TCGContext *s) op_index--; } - if (args != gen_opparam_buf) + if (args != s->gen_opparam_buf) { tcg_abort(); + } } #else /* 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 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 #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_ptr = gen_code_buf; - args = gen_opparam_buf; + args = s->gen_opparam_buf; op_index = 0; for(;;) { -- 1.7.9.5