From patchwork Tue Feb 9 10:39:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 8259581 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 6058C9F319 for ; Tue, 9 Feb 2016 10:40:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A75212022D for ; Tue, 9 Feb 2016 10:40:46 +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 044DB20268 for ; Tue, 9 Feb 2016 10:40:46 +0000 (UTC) Received: from localhost ([::1]:54060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT5iv-0006OV-DI for patchwork-qemu-devel@patchwork.kernel.org; Tue, 09 Feb 2016 05:40:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT5iZ-0006In-TZ for qemu-devel@nongnu.org; Tue, 09 Feb 2016 05:40:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT5iZ-0005O0-50 for qemu-devel@nongnu.org; Tue, 09 Feb 2016 05:40:23 -0500 Received: from mail-pa0-x243.google.com ([2607:f8b0:400e:c03::243]:33781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT5iY-0005NU-UE for qemu-devel@nongnu.org; Tue, 09 Feb 2016 05:40:23 -0500 Received: by mail-pa0-x243.google.com with SMTP id gc2so113789pab.0 for ; Tue, 09 Feb 2016 02:40:22 -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=LZp0pCbsLuxFLMT4EQmqY5Oi6RpU3tPIWWlxt2RT7gQ=; b=eEYv4dzAPSiE9oZ2VPBo+GA9ZVHIMukaYkEd2A+vtQCnkzu/j4P5bg1amtVaT7i/2z 1HEc2fDDk5o9Rrj7ymZmeKuiObbnu9pyaybDW7JcG/wNmuDeqsuF0fxvg7cao9BiQUKC yrhtA66WuvT1ZWe4RwwP+QeiL0nHft1Q1Wtq99YAjy0WTjcOQ4ABcBuQEeydo1JKOMNa NCsq9hrm5Oz9RRmOr51pAlK9QUHCPTiEdq0y1Mmb1dtLAOmKLc8HlmTCdW9ku6DcP/Fu BIjyQigb9VjrJOiHnCiLZwYofQIrVjdqceZb9E+nvH63+8wxSVCzubsxlZj/MvrcMxww OG4g== 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=LZp0pCbsLuxFLMT4EQmqY5Oi6RpU3tPIWWlxt2RT7gQ=; b=C+qJs7K6jY373L+1BClGqTFCH3O5jPCJVW1b6+jONDIICx8o9lBCyhvf9yr9Fc+k70 QeAkKR3V38Iq0EqHsF/dr3RpNGRT3DfsaGVOjLcMT9Zt02pzefEN/WMtVD5eLWq5CIoD d+DS+8BhnqftuO7C8FxbyVSncTdfLyl07nb4YNTKGWFydslt3LNjdxoIQOSOzVIOaTPS inEaAoNJrc8V7pomSRi46RhYzEAt6n+T22WUVITXZ+Q6OeWTWbGtMxozmOypb1JRsDdo JvNpEKNXzB/DOFvUnVMrIed7g+j4sS45GLPwxiJUKB7ui+LjaGEtXAglOTc5mnGznaTN 3UXg== X-Gm-Message-State: AG10YOTCiUvs9WDirD0Pi5c7rzs3Ut6Jel2knVujv8zockEsvO1LAUMwy8garHG5sn0CmA== X-Received: by 10.66.148.35 with SMTP id tp3mr15142323pab.88.1455014422086; Tue, 09 Feb 2016 02:40:22 -0800 (PST) Received: from bigtime.gateway (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id 1sm49669183pfm.10.2016.02.09.02.40.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2016 02:40:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 9 Feb 2016 21:39:52 +1100 Message-Id: <1455014403-10742-5-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455014403-10742-1-git-send-email-rth@twiddle.net> References: <1455014403-10742-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:c03::243 Cc: james.hogan@imgtec.com, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 04/15] tcg-mips: Adjust load/store functions for mips64 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 Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c index 43210c5..8f90360 100644 --- a/tcg/mips/tcg-target.c +++ b/tcg/mips/tcg-target.c @@ -733,7 +733,7 @@ static void tcg_out_ldst(TCGContext *s, MIPSInsn opc, TCGReg data, if (ofs != lo) { tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, ofs - lo); if (addr != TCG_REG_ZERO) { - tcg_out_opc_reg(s, OPC_ADDU, TCG_TMP0, TCG_TMP0, addr); + tcg_out_opc_reg(s, ALIAS_PADD, TCG_TMP0, TCG_TMP0, addr); } addr = TCG_TMP0; } @@ -743,13 +743,21 @@ static void tcg_out_ldst(TCGContext *s, MIPSInsn opc, TCGReg data, static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, intptr_t arg2) { - tcg_out_ldst(s, OPC_LW, arg, arg1, arg2); + MIPSInsn opc = OPC_LD; + if (TCG_TARGET_REG_BITS == 32 || type == TCG_TYPE_I32) { + opc = OPC_LW; + } + tcg_out_ldst(s, opc, arg, arg1, arg2); } static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, intptr_t arg2) { - tcg_out_ldst(s, OPC_SW, arg, arg1, arg2); + MIPSInsn opc = OPC_SD; + if (TCG_TARGET_REG_BITS == 32 || type == TCG_TYPE_I32) { + opc = OPC_SW; + } + tcg_out_ldst(s, opc, arg, arg1, arg2); } static inline void tcg_out_addi(TCGContext *s, TCGReg reg, TCGArg val)