From patchwork Tue Nov 6 04:41:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 197402 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B66652C0091 for ; Tue, 6 Nov 2012 15:42:24 +1100 (EST) Received: from localhost ([::1]:41538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TVazW-0005Oj-Qy for incoming@patchwork.ozlabs.org; Mon, 05 Nov 2012 23:42:22 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TVazG-0005I8-91 for qemu-devel@nongnu.org; Mon, 05 Nov 2012 23:42:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TVazD-000338-6e for qemu-devel@nongnu.org; Mon, 05 Nov 2012 23:42:06 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:48003) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TVazD-00032u-1P for qemu-devel@nongnu.org; Mon, 05 Nov 2012 23:42:03 -0500 Received: from eusync1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MD100M83UEM4B10@mailout1.w1.samsung.com> for qemu-devel@nongnu.org; Tue, 06 Nov 2012 04:42:22 +0000 (GMT) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.8.15]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MD1001FDUD3QL00@eusync1.samsung.com> for qemu-devel@nongnu.org; Tue, 06 Nov 2012 04:42:01 +0000 (GMT) From: Evgeny Voevodin To: qemu-devel@nongnu.org Date: Tue, 06 Nov 2012 08:41:24 +0400 Message-id: <1352176885-13324-7-git-send-email-e.voevodin@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1352176885-13324-1-git-send-email-e.voevodin@samsung.com> References: <1352176885-13324-1-git-send-email-e.voevodin@samsung.com> X-TM-AS-MML: No X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 210.118.77.11 Cc: Evgeny Voevodin , blauwirbel@gmail.com, kyungmin.park@samsung.com, edgar.iglesias@gmail.com, aurelien@aurel32.net, rth@twiddle.net Subject: [Qemu-devel] [PATCH v5 6/7] TCG: Use gen_opparam_buf from context instead of global variable. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 ea27bd4..d281af9 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(;;) {