From patchwork Fri Jul 24 16:30:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 499808 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2BEFB140A98 for ; Sat, 25 Jul 2015 02:31:38 +1000 (AEST) Received: from localhost ([::1]:46014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIfsm-0002rI-1u for incoming@patchwork.ozlabs.org; Fri, 24 Jul 2015 12:31:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIfs8-0001aL-9l for qemu-devel@nongnu.org; Fri, 24 Jul 2015 12:30:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZIfs3-0004Tb-Qs for qemu-devel@nongnu.org; Fri, 24 Jul 2015 12:30:56 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:100::1]:53329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIfs3-0004SR-Jk for qemu-devel@nongnu.org; Fri, 24 Jul 2015 12:30:51 -0400 Received: from weber.rr44.fr ([2001:bc8:30d7:120:7e05:7ff:fe0d:f152]) by hall.aurel32.net with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84) (envelope-from ) id 1ZIfs1-0001yo-7P; Fri, 24 Jul 2015 18:30:49 +0200 Received: from aurel32 by weber.rr44.fr with local (Exim 4.85) (envelope-from ) id 1ZIfs0-0002lE-Fe; Fri, 24 Jul 2015 18:30:48 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Fri, 24 Jul 2015 18:30:40 +0200 Message-Id: <1437755447-10537-4-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437755447-10537-1-git-send-email-aurelien@aurel32.net> References: <1437755447-10537-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:bc8:30d7:100::1 Cc: Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH for-2.5 03/10] tcg/optimize: track const/copy status separately 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 Use two bools to track constants and copies instead of an enum. Cc: Richard Henderson Signed-off-by: Aurelien Jarno --- tcg/optimize.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index d2b63a4..f16eb1e 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -35,14 +35,9 @@ glue(glue(case INDEX_op_, x), _i32): \ glue(glue(case INDEX_op_, x), _i64) -typedef enum { - TCG_TEMP_UNDEF = 0, - TCG_TEMP_CONST, - TCG_TEMP_COPY, -} tcg_temp_state; - struct tcg_temp_info { - tcg_temp_state state; + bool is_const; + bool is_copy; uint16_t prev_copy; uint16_t next_copy; tcg_target_ulong val; @@ -54,12 +49,12 @@ static TCGTempSet temps_used; static inline bool temp_is_const(TCGArg arg) { - return temps[arg].state == TCG_TEMP_CONST; + return temps[arg].is_const; } static inline bool temp_is_copy(TCGArg arg) { - return temps[arg].state == TCG_TEMP_COPY; + return temps[arg].is_copy; } /* Reset TEMP's state to TCG_TEMP_UNDEF. If TEMP only had one copy, remove @@ -68,13 +63,14 @@ static void reset_temp(TCGArg temp) { if (temp_is_copy(temp)) { if (temps[temp].prev_copy == temps[temp].next_copy) { - temps[temps[temp].next_copy].state = TCG_TEMP_UNDEF; + temps[temps[temp].next_copy].is_copy = false; } else { temps[temps[temp].next_copy].prev_copy = temps[temp].prev_copy; temps[temps[temp].prev_copy].next_copy = temps[temp].next_copy; } } - temps[temp].state = TCG_TEMP_UNDEF; + temps[temp].is_const = false; + temps[temp].is_copy = false; temps[temp].mask = -1; } @@ -88,7 +84,8 @@ static void reset_all_temps(int nb_temps) static void init_temp_info(TCGArg temp) { if (!test_bit(temp, temps_used.l)) { - temps[temp].state = TCG_TEMP_UNDEF; + temps[temp].is_const = false; + temps[temp].is_copy = false; temps[temp].mask = -1; set_bit(temp, temps_used.l); } @@ -218,7 +215,8 @@ static void tcg_opt_gen_movi(TCGContext *s, TCGOp *op, TCGArg *args, op->opc = new_op; reset_temp(dst); - temps[dst].state = TCG_TEMP_CONST; + temps[dst].is_const = true; + temps[dst].is_copy = false; temps[dst].val = val; mask = val; if (TCG_TARGET_REG_BITS > 32 && new_op == INDEX_op_movi_i32) { @@ -261,11 +259,13 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg *args, if (s->temps[src].type == s->temps[dst].type) { if (!temp_is_copy(src)) { - temps[src].state = TCG_TEMP_COPY; + temps[src].is_const = false; + temps[src].is_copy = true; temps[src].next_copy = src; temps[src].prev_copy = src; } - temps[dst].state = TCG_TEMP_COPY; + temps[dst].is_const = false; + temps[dst].is_copy = true; temps[dst].next_copy = temps[src].next_copy; temps[dst].prev_copy = src; temps[temps[dst].next_copy].prev_copy = dst;