From patchwork Sat Jun 18 05:03:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9185429 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 461A16075F for ; Sat, 18 Jun 2016 05:04:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F9BA22473 for ; Sat, 18 Jun 2016 05:04:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23F382835E; Sat, 18 Jun 2016 05:04:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 9C80822473 for ; Sat, 18 Jun 2016 05:04:11 +0000 (UTC) Received: from localhost ([::1]:33146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bE8QU-0007dc-Ni for patchwork-qemu-devel@patchwork.kernel.org; Sat, 18 Jun 2016 01:04:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bE8Pz-0007T3-6y for qemu-devel@nongnu.org; Sat, 18 Jun 2016 01:03:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bE8Ps-0007QF-3H for qemu-devel@nongnu.org; Sat, 18 Jun 2016 01:03:38 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:34551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bE8Pr-0007Q8-OX for qemu-devel@nongnu.org; Sat, 18 Jun 2016 01:03:32 -0400 Received: by mail-pf0-x243.google.com with SMTP id 66so7429949pfy.1 for ; Fri, 17 Jun 2016 22:03:31 -0700 (PDT) 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=EBhFcB+Yo1ey9WK0NlLtnipke8B/ro2FXJYPUapmSdk=; b=N9A04IbUkRpVz7cwHLen0OReacmBFsmNtm+3Ldfg9GgjpCi/OfUDh7M0WIkX0P2Fmb LyTDI0wcLCM/w9vWzkPyW3amQYIbN8db4UyjuBjzYYojBK86hOudo4G/7C2KkSXEdGlo jw7XBAcMnosZAcmVfwNpV2uIcGMf46vC+DFJG9QZZ3Dp/YLsX0qSRHLe0k4TVRB5Ho7r cbi8IbU1pbM3KjsN6BJt6IwS1owVK7b8c61pho0tqIudc3NFy/dfKsE4oylJPWsmUyDE mPhlGSvFyV2nrfDtPnf1Nr/0UWvUwLjXmv2fH2mwj774StL8B5QDwqxbGJkcLyT4MHjZ S/lQ== 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=EBhFcB+Yo1ey9WK0NlLtnipke8B/ro2FXJYPUapmSdk=; b=YcyHr2MKeUXfghtzsYqRz4MUYQLRNl3wswnacZR/2Q70hD9zsJ/fVx90bEwhCOe+Yt EUISwrUGOHoXOA70vCVmQuGHSfmgjxJFbczV8RUG40q7aAxaYuckGGICd0To2vw9P2Dx kb+nw84m6nDNxJlL/9G0AYbH12vPpC+bajCPmrmafjP09T0pEym39P/Gukt7q33vz713 oYfyokTUmRrj3pPLFVtzToYbR1yxG3JaUYhw7ENeEoi0d8+8tTdUV5gC/KYso44ymduy Q/9OSwAUkTxtdBuI3ppS78isV8ABWv0suWi+ElgLEnyOSMBySdjiw7a05lu89zNVAB/D IBqQ== X-Gm-Message-State: ALyK8tJSboKBZrKYWONIGrfELbFLXJ092s5AGXtt8jYtbQo6JyGdea9pEsX5T/TNPWKEVg== X-Received: by 10.98.94.135 with SMTP id s129mr6685207pfb.31.1466226210888; Fri, 17 Jun 2016 22:03:30 -0700 (PDT) Received: from bigtime.twiddle.net (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id 64sm44231981pfj.96.2016.06.17.22.03.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jun 2016 22:03:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 17 Jun 2016 22:03:27 -0700 Message-Id: <1466226207-23581-3-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1466226207-23581-1-git-send-email-rth@twiddle.net> References: <1466226207-23581-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:400e:c00::243 Subject: [Qemu-devel] [PATCH 2/2] tcg: Fix allocation of indirect_base registers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, mark.cave-ayland@ilande.co.uk, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP When the number of available registers is low, we need to be prepared for TS to overlap MEM_BASE. This fixes the Sparc64 OpenBIOS boot on i686. Signed-off-by: Richard Henderson --- tcg/tcg.c | 68 +++++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 154ffe8..6c26ee4 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1743,32 +1743,71 @@ static TCGReg tcg_reg_alloc(TCGContext *s, TCGRegSet desired_regs, tcg_abort(); } +/* Mark a temporary as dead. */ +static void temp_dead(TCGContext *s, TCGTemp *ts) +{ + if (ts->fixed_reg) { + return; + } + if (ts->val_type == TEMP_VAL_REG) { + s->reg_to_temp[ts->reg] = NULL; + } + ts->val_type = (temp_idx(s, ts) < s->nb_globals || ts->temp_local + ? TEMP_VAL_MEM : TEMP_VAL_DEAD); +} + /* Make sure the temporary is in a register. If needed, allocate the register from DESIRED while avoiding ALLOCATED. */ static void temp_load(TCGContext *s, TCGTemp *ts, TCGRegSet desired_regs, TCGRegSet allocated_regs) { - TCGReg reg; + TCGReg reg, base_reg; + TCGTemp *base; switch (ts->val_type) { case TEMP_VAL_REG: return; + case TEMP_VAL_CONST: reg = tcg_reg_alloc(s, desired_regs, allocated_regs, ts->indirect_base); tcg_out_movi(s, ts->type, reg, ts->val); ts->mem_coherent = 0; break; + case TEMP_VAL_MEM: - reg = tcg_reg_alloc(s, desired_regs, allocated_regs, ts->indirect_base); - if (ts->indirect_reg) { - tcg_regset_set_reg(allocated_regs, reg); - temp_load(s, ts->mem_base, - tcg_target_available_regs[TCG_TYPE_PTR], - allocated_regs); + base = ts->mem_base; + base_reg = base->reg; + if (ts->indirect_reg && base->val_type != TEMP_VAL_REG) { + TCGRegSet reg_avail = desired_regs & ~allocated_regs; + TCGRegSet base_avail = (tcg_target_available_regs[TCG_TYPE_PTR] + & ~allocated_regs); + if (is_power_of_2(reg_avail)) { + /* There is only one register available for TS. If there are + other available registers for BASE, make sure we pick one + of them. Otherwise BASE and TS will share a reg. */ + TCGRegSet avail = base_avail & ~reg_avail; + if (avail) { + base_avail = avail; + } + temp_load(s, base, base_avail, allocated_regs); + base_reg = base->reg; + } else { + temp_load(s, base, base_avail, allocated_regs); + base_reg = base->reg; + tcg_regset_reset_reg(allocated_regs, base_reg); + } } - tcg_out_ld(s, ts->type, reg, ts->mem_base->reg, ts->mem_offset); + + reg = tcg_reg_alloc(s, desired_regs, allocated_regs, ts->indirect_base); + tcg_out_ld(s, ts->type, reg, base_reg, ts->mem_offset); ts->mem_coherent = 1; + + /* If the registers overlap, zap the info from BASE. */ + if (reg == base_reg) { + temp_dead(s, base); + } break; + case TEMP_VAL_DEAD: default: tcg_abort(); @@ -1778,19 +1817,6 @@ static void temp_load(TCGContext *s, TCGTemp *ts, TCGRegSet desired_regs, s->reg_to_temp[reg] = ts; } -/* mark a temporary as dead. */ -static inline void temp_dead(TCGContext *s, TCGTemp *ts) -{ - if (ts->fixed_reg) { - return; - } - if (ts->val_type == TEMP_VAL_REG) { - s->reg_to_temp[ts->reg] = NULL; - } - ts->val_type = (temp_idx(s, ts) < s->nb_globals || ts->temp_local - ? TEMP_VAL_MEM : TEMP_VAL_DEAD); -} - /* sync a temporary to memory. 'allocated_regs' is used in case a temporary registers needs to be allocated to store a constant. */ static void temp_sync(TCGContext *s, TCGTemp *ts, TCGRegSet allocated_regs)