From patchwork Mon Oct 27 15:11:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 403626 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 AAB48140077 for ; Tue, 28 Oct 2014 02:12:42 +1100 (AEDT) Received: from localhost ([::1]:34187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XilyI-00039Z-OL for incoming@patchwork.ozlabs.org; Mon, 27 Oct 2014 11:12:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XilxX-0002NN-01 for qemu-devel@nongnu.org; Mon, 27 Oct 2014 11:11:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XilxW-0000VV-3P for qemu-devel@nongnu.org; Mon, 27 Oct 2014 11:11:50 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:101::1]:40838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XilxV-0000Uy-Th; Mon, 27 Oct 2014 11:11:50 -0400 Received: from farad.rr44.fr ([2001:470:d4ed:0:7e05:7ff:fe0d:f152]) by hall.aurel32.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XilxK-0007uI-Ov; Mon, 27 Oct 2014 16:11:38 +0100 Received: from weber.rr44.fr ([2001:470:d4ed:0:216:3eff:fe00:1106]) by farad.rr44.fr with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84) (envelope-from ) id 1XilxJ-0000pe-3N; Mon, 27 Oct 2014 16:11:37 +0100 Received: from aurel32 by weber.rr44.fr with local (Exim 4.84) (envelope-from ) id 1XilxI-0008JX-Q5; Mon, 27 Oct 2014 16:11:36 +0100 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Mon, 27 Oct 2014 16:11:33 +0100 Message-Id: <1414422693-31924-1-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 2.1.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:bc8:30d7:101::1 Cc: Paolo Bonzini , qemu-stable@nongnu.org, Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH] tcg/mips: fix store softmmu slow path 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 Commit 9d8bf2d1 moved the softmmu slow path out of line and introduce a regression at the same time by always calling tcg_out_tlb_load with is_load=1. This makes impossible to run any significant code under qemu-system-mips*. Cc: Paolo Bonzini Cc: Richard Henderson Cc: qemu-stable@nongnu.org Signed-off-by: Aurelien Jarno Reviewed-by: Richard Henderson --- tcg/mips/tcg-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c index 9cce356..b7f4d67 100644 --- a/tcg/mips/tcg-target.c +++ b/tcg/mips/tcg-target.c @@ -1302,7 +1302,7 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is_64) so we can reuse that for the base. */ base = (TARGET_LONG_BITS == 32 ? TCG_REG_A1 : TCG_REG_A2); tcg_out_tlb_load(s, base, addr_regl, addr_regh, mem_index, - s_bits, label_ptr, 1); + s_bits, label_ptr, 0); tcg_out_qemu_st_direct(s, data_regl, data_regh, base, opc); add_qemu_ldst_label(s, 0, opc, data_regl, data_regh, addr_regl, addr_regh, mem_index, s->code_ptr, label_ptr);