From patchwork Sat Feb 6 00:09:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 8240751 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F38719F37A for ; Sat, 6 Feb 2016 00:16:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4B743203B4 for ; Sat, 6 Feb 2016 00:16:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9AC31203B1 for ; Sat, 6 Feb 2016 00:16:55 +0000 (UTC) Received: from localhost ([::1]:51025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRqYZ-0001t6-0G for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Feb 2016 19:16:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRqSP-0008He-QX for qemu-devel@nongnu.org; Fri, 05 Feb 2016 19:10:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRqSL-0006vg-Dx for qemu-devel@nongnu.org; Fri, 05 Feb 2016 19:10:33 -0500 Received: from mail-qk0-x22c.google.com ([2607:f8b0:400d:c09::22c]:35323) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRqSL-0006vJ-9T for qemu-devel@nongnu.org; Fri, 05 Feb 2016 19:10:29 -0500 Received: by mail-qk0-x22c.google.com with SMTP id o6so40840617qkc.2 for ; Fri, 05 Feb 2016 16:10:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7JOmTdhW8VcUtciCVLmVhOGlHkkO+8RdfmAoVmPYJEc=; b=uxhOqpPt7pbvaIde6kaYsoQf0MPDDGsXXfxf3sp/GywDh7g9IvZxb/V6WzXr7Jlecs SYXpTZLhsWOlmmwtX/L2jy41N+EgcCXTQBcrkPklSOKwaa5/Xvlj7uAPAjpf0AfGQu4e K0sjcdROsgR1wqBdnEJSW49CklI9bfr9LEvV99jVuWrLh07XBGi4tVyt4Uht9R5LQ9+d Zt2atOpBjfAJB0RS8R5d/J4XR4rT5JIx/B5OQlGtX6OeRppzLXMbD8r1GNgQ0rwJNn2M L+SKinfN1LKuHqlACQFyZDe91+09htJn9xPVbIQVQZ1w1ykV3+idxkA93DugOxCw8LjK +c2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=7JOmTdhW8VcUtciCVLmVhOGlHkkO+8RdfmAoVmPYJEc=; b=JslhmkS1ePNNDpnQ5Dq1YMxRwr6RJxeuqeW/hJVWyG7lhvYCvdaRUM6L1/RxVjBfIR 2AmNOKX/ji3op4PBH9rRCW1Cfa7gDWDaxr4P/FVezvyv8CaqbVJ7U0xtQgdVE/ce4ht5 yglJN5+hsZCq53+yROmG2+8f3Qrv1uxps5378kt6UicaBPxnryl9sQzCVBmdGtvQ9DD9 RaxX/qXnnX1usWTJo4omyHDL8VnCDeealTUVEiPx2w+/oxlMN0nrTGNLqECvAWkV3nYj Vz4vYY/Y7I+V58+o2qLTONpIUkImsslJ3zoEb0buPGQvOGm9sFLdh7yHR3dJ8ZRKYkTL fYtg== X-Gm-Message-State: AG10YORR3u0vMZE2O7sYgsxgQrgaTa4jbWCS8+N4Piw+U2AciSHJonOWcKSixVdcepjBZw== X-Received: by 10.55.79.86 with SMTP id d83mr20354696qkb.22.1454717429091; Fri, 05 Feb 2016 16:10:29 -0800 (PST) Received: from bigtime.com ([1.129.57.172]) by smtp.gmail.com with ESMTPSA id w66sm9079564qhc.15.2016.02.05.16.10.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Feb 2016 16:10:28 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 6 Feb 2016 11:09:29 +1100 Message-Id: <1454717370-17516-12-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454717370-17516-1-git-send-email-rth@twiddle.net> References: <1454717370-17516-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::22c Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PULL 11/12] tcg: Change temp_save argument to TCGTemp 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- tcg/tcg.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index ee3e9dd..38b0883 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1749,10 +1749,9 @@ static void temp_sync(TCGContext *s, TCGTemp *ts, TCGRegSet allocated_regs) /* save 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_save(TCGContext *s, int temp, TCGRegSet allocated_regs) +static inline void temp_save(TCGContext *s, TCGTemp *ts, + TCGRegSet allocated_regs) { - TCGTemp *ts = &s->temps[temp]; - #ifdef USE_LIVENESS_ANALYSIS /* The liveness analysis already ensures that globals are back in memory. Keep an assert for safety. */ @@ -1770,8 +1769,8 @@ static void save_globals(TCGContext *s, TCGRegSet allocated_regs) { int i; - for(i = 0; i < s->nb_globals; i++) { - temp_save(s, i, allocated_regs); + for (i = 0; i < s->nb_globals; i++) { + temp_save(s, &s->temps[i], allocated_regs); } } @@ -1798,13 +1797,12 @@ static void sync_globals(TCGContext *s, TCGRegSet allocated_regs) all globals are stored at their canonical location. */ static void tcg_reg_alloc_bb_end(TCGContext *s, TCGRegSet allocated_regs) { - TCGTemp *ts; int i; - for(i = s->nb_globals; i < s->nb_temps; i++) { - ts = &s->temps[i]; + for (i = s->nb_globals; i < s->nb_temps; i++) { + TCGTemp *ts = &s->temps[i]; if (ts->temp_local) { - temp_save(s, i, allocated_regs); + temp_save(s, ts, allocated_regs); } else { #ifdef USE_LIVENESS_ANALYSIS /* The liveness analysis already ensures that temps are dead.