From patchwork Mon Feb 15 03:42: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: 8309111 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 676519F372 for ; Mon, 15 Feb 2016 03:47:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B46E0204EB for ; Mon, 15 Feb 2016 03:47:28 +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 0C088204DE for ; Mon, 15 Feb 2016 03:47:28 +0000 (UTC) Received: from localhost ([::1]:55986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVA8F-0005yA-Fw for patchwork-qemu-devel@patchwork.kernel.org; Sun, 14 Feb 2016 22:47:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVA4c-0007ze-GU for qemu-devel@nongnu.org; Sun, 14 Feb 2016 22:43:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVA4b-0006KL-Fp for qemu-devel@nongnu.org; Sun, 14 Feb 2016 22:43:42 -0500 Received: from mail-qg0-x242.google.com ([2607:f8b0:400d:c04::242]:35409) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVA4b-0006KH-CJ for qemu-devel@nongnu.org; Sun, 14 Feb 2016 22:43:41 -0500 Received: by mail-qg0-x242.google.com with SMTP id b35so9797190qge.2 for ; Sun, 14 Feb 2016 19:43:41 -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=LfFRDPwjR14OO0jQBGTBEYh3oWkeT8Yqi046Cx6WMMc=; b=y4wf7+Zl3S7zbSsIHxhYfHG46GP4z1xg/FmDLXGVoCHrwFAHQx3Q1wmB0JdeHVU97a GupiUGYzr2KdGadXyCZLNIzl7epL8DK68PDXX2tVWGToHj+Fya70asBCV807U6DyQZfC aqoU79TXiqd4wMepEPiAcZRrYx1o9LsuCp2Kr0iYulZBmkzoSOnFLWdLB1naq0Txpszj MimAum4oxmbeavByXtp6GUxvEq4OUOeSZXZdXKHzS/yHz4NgquChTFkNOd5KYqEz31H1 DWEdz+CWLNBkJyFPQEqhEmZm1tZnkVBQ+6uwgWqXsej9bekoqNlg7JseWkwLjetL07M0 3aVQ== 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=LfFRDPwjR14OO0jQBGTBEYh3oWkeT8Yqi046Cx6WMMc=; b=fTpTiANYqQfpO3eoB/B+1HtGvV5/QlhBxm6ph9w4Q27W4Gboi2xenDlVAmo/HvGqwh KvJqr7c14tw8C5yFQj2vjVLIxbqbfSOGgM2gkRmWgoUv1IUAQf4FL1KFOB0WneV/8UaV 3Z+xWN6TQfBnhw4ip7TyYQ/MQ12KVzl0utMXd9YjFX4a2iWurIMwxJ3cIazmjSpUMnc4 j81aqbi6e/2vSvqGqU3FeXeQ0V9CjCrmTEUNwWPO1sbssSktoCK4WSPyJDE9ztyhCO3J HFd8stlYPjmRi2VwYgaHrBhZ/OVuUIWBlE8II6XBUgIcyycIDyHxkTehiUSpR9BTLFwG guFw== X-Gm-Message-State: AG10YOQTVS515m4PBko/F7fl7R9m8sCqzJXmXVZ/3Z3ehhKv1CIjOzl0dtI47DiXSl/Rnw== X-Received: by 10.140.218.149 with SMTP id o143mr9923401qhb.101.1455507821080; Sun, 14 Feb 2016 19:43:41 -0800 (PST) Received: from bigtime.com ([103.226.32.154]) by smtp.gmail.com with ESMTPSA id z132sm10424704qka.14.2016.02.14.19.43.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Feb 2016 19:43:40 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 15 Feb 2016 14:42:29 +1100 Message-Id: <1455507754-8978-12-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455507754-8978-1-git-send-email-rth@twiddle.net> References: <1455507754-8978-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:c04::242 Cc: mark.cave-ayland@ilande.co.uk, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH v2 11/16] tcg-mips: Adjust calling conventions 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 | 21 +++++++++++++++------ tcg/mips/tcg-target.h | 19 +++++++++++++++---- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c index f61d6c7..8fb2ab0 100644 --- a/tcg/mips/tcg-target.c +++ b/tcg/mips/tcg-target.c @@ -98,10 +98,6 @@ static const TCGReg tcg_target_reg_alloc_order[] = { TCG_REG_S8, /* Call clobbered registers. */ - TCG_REG_T0, - TCG_REG_T1, - TCG_REG_T2, - TCG_REG_T3, TCG_REG_T4, TCG_REG_T5, TCG_REG_T6, @@ -112,17 +108,27 @@ static const TCGReg tcg_target_reg_alloc_order[] = { TCG_REG_V0, /* Argument registers, opposite order of allocation. */ + TCG_REG_T3, + TCG_REG_T2, + TCG_REG_T1, + TCG_REG_T0, TCG_REG_A3, TCG_REG_A2, TCG_REG_A1, TCG_REG_A0, }; -static const TCGReg tcg_target_call_iarg_regs[4] = { +static const TCGReg tcg_target_call_iarg_regs[] = { TCG_REG_A0, TCG_REG_A1, TCG_REG_A2, - TCG_REG_A3 + TCG_REG_A3, +#if _MIPS_SIM == _ABIN32 || _MIPS_SIM == _ABI64 + TCG_REG_T0, + TCG_REG_T1, + TCG_REG_T2, + TCG_REG_T3, +#endif }; static const TCGReg tcg_target_call_oarg_regs[2] = { @@ -2453,6 +2459,9 @@ static void tcg_target_init(TCGContext *s) { tcg_target_detect_isa(); tcg_regset_set(tcg_target_available_regs[TCG_TYPE_I32], 0xffffffff); + if (TCG_TARGET_REG_BITS == 64) { + tcg_regset_set(tcg_target_available_regs[TCG_TYPE_I64], 0xffffffff); + } tcg_regset_set(tcg_target_call_clobber_regs, (1 << TCG_REG_V0) | (1 << TCG_REG_V1) | diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h index 1a9e54c..3eb771f 100644 --- a/tcg/mips/tcg-target.h +++ b/tcg/mips/tcg-target.h @@ -26,7 +26,14 @@ #ifndef TCG_TARGET_MIPS #define TCG_TARGET_MIPS 1 -#define TCG_TARGET_REG_BITS 32 +#if _MIPS_SIM == _ABIO32 +# define TCG_TARGET_REG_BITS 32 +#elif _MIPS_SIM == _ABIN32 || _MIPS_SIM == _ABI64 +# define TCG_TARGET_REG_BITS 64 +#else +# error "Unknown ABI" +#endif + #define TCG_TARGET_INSN_UNIT_SIZE 4 #define TCG_TARGET_TLB_DISPLACEMENT_BITS 16 #define TCG_TARGET_NB_REGS 32 @@ -70,9 +77,13 @@ typedef enum { } TCGReg; /* used for function call generation */ -#define TCG_TARGET_STACK_ALIGN 8 -#define TCG_TARGET_CALL_STACK_OFFSET 16 -#define TCG_TARGET_CALL_ALIGN_ARGS 1 +#define TCG_TARGET_STACK_ALIGN 16 +#if _MIPS_SIM == _ABIO32 +# define TCG_TARGET_CALL_STACK_OFFSET 16 +#else +# define TCG_TARGET_CALL_STACK_OFFSET 0 +#endif +#define TCG_TARGET_CALL_ALIGN_ARGS 1 /* MOVN/MOVZ instructions detection */ #if (defined(__mips_isa_rev) && (__mips_isa_rev >= 1)) || \