From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9eix-0006Xw-LD for qemu-devel@nongnu.org; Thu, 17 Dec 2015 15:00:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9eiv-0000Gp-Vy for qemu-devel@nongnu.org; Thu, 17 Dec 2015 15:00:27 -0500 Received: from mail-ob0-x22c.google.com ([2607:f8b0:4003:c01::22c]:33357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9eiv-0000Gl-FL for qemu-devel@nongnu.org; Thu, 17 Dec 2015 15:00:25 -0500 Received: by mail-ob0-x22c.google.com with SMTP id sd4so65813417obb.0 for ; Thu, 17 Dec 2015 12:00:25 -0800 (PST) Sender: Richard Henderson From: Richard Henderson Date: Thu, 17 Dec 2015 12:00:23 -0800 Message-Id: <1450382423-5881-1-git-send-email-rth@twiddle.net> In-Reply-To: <1450382320-5383-1-git-send-email-rth@twiddle.net> References: <1450382320-5383-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v2 08/14] tcg: Change temp_sync argument to TCGTemp List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, aurelien@aurel32.net Signed-off-by: Richard Henderson --- tcg/tcg.c | 55 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index d19bb45..8edf582 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1726,29 +1726,28 @@ static inline void temp_dead(TCGContext *s, TCGTemp *ts) /* sync a temporary to memory. 'allocated_regs' is used in case a temporary registers needs to be allocated to store a constant. */ -static inline void temp_sync(TCGContext *s, int temp, TCGRegSet allocated_regs) +static void temp_sync(TCGContext *s, TCGTemp *ts, TCGRegSet allocated_regs) { - TCGTemp *ts = &s->temps[temp]; - - if (!ts->fixed_reg) { - switch(ts->val_type) { - case TEMP_VAL_CONST: - ts->reg = tcg_reg_alloc(s, tcg_target_available_regs[ts->type], - allocated_regs); - ts->val_type = TEMP_VAL_REG; - s->reg_to_temp[ts->reg] = ts; - ts->mem_coherent = 0; - tcg_out_movi(s, ts->type, ts->reg, ts->val); - /* fallthrough*/ - case TEMP_VAL_REG: - tcg_reg_sync(s, ts->reg); - break; - case TEMP_VAL_DEAD: - case TEMP_VAL_MEM: - break; - default: - tcg_abort(); - } + if (ts->fixed_reg) { + return; + } + switch (ts->val_type) { + case TEMP_VAL_CONST: + ts->reg = tcg_reg_alloc(s, tcg_target_available_regs[ts->type], + allocated_regs); + ts->val_type = TEMP_VAL_REG; + s->reg_to_temp[ts->reg] = ts; + ts->mem_coherent = 0; + tcg_out_movi(s, ts->type, ts->reg, ts->val); + /* fallthrough*/ + case TEMP_VAL_REG: + tcg_reg_sync(s, ts->reg); + break; + case TEMP_VAL_DEAD: + case TEMP_VAL_MEM: + break; + default: + tcg_abort(); } } @@ -1763,7 +1762,7 @@ static inline void temp_save(TCGContext *s, int temp, TCGRegSet allocated_regs) in memory. Keep an assert for safety. */ tcg_debug_assert(ts->val_type == TEMP_VAL_MEM || ts->fixed_reg); #else - temp_sync(s, temp, allocated_regs); + temp_sync(s, ts, allocated_regs); temp_dead(s, ts); #endif } @@ -1788,11 +1787,13 @@ static void sync_globals(TCGContext *s, TCGRegSet allocated_regs) int i; for (i = 0; i < s->nb_globals; i++) { + TCGTemp *ts = &s->temps[i]; #ifdef USE_LIVENESS_ANALYSIS - assert(s->temps[i].val_type != TEMP_VAL_REG || s->temps[i].fixed_reg || - s->temps[i].mem_coherent); + tcg_debug_assert(ts->val_type != TEMP_VAL_REG + || ts->fixed_reg + || ts->mem_coherent); #else - temp_sync(s, i, allocated_regs); + temp_sync(s, ts, allocated_regs); #endif } } @@ -1847,7 +1848,7 @@ static void tcg_reg_alloc_movi(TCGContext *s, const TCGArg *args, ots->val = val; } if (NEED_SYNC_ARG(0)) { - temp_sync(s, args[0], s->reserved_regs); + temp_sync(s, ots, s->reserved_regs); } if (IS_DEAD_ARG(0)) { temp_dead(s, ots); -- 2.5.0