From patchwork Fri Jan 4 00:37:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1020560 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aisec.fraunhofer.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43W5ZY3w9Kz9s7T for ; Fri, 4 Jan 2019 11:41:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 40E66C21C93; Fri, 4 Jan 2019 00:39:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6EDA0C21C93; Fri, 4 Jan 2019 00:38:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9FE9FC21C93; Fri, 4 Jan 2019 00:38:07 +0000 (UTC) Received: from mail-edgeDD24.fraunhofer.de (mail-edgeDD24.fraunhofer.de [192.102.167.24]) by lists.denx.de (Postfix) with ESMTPS id 1DA28C21DD7 for ; Fri, 4 Jan 2019 00:38:04 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2FbAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZYIEgVY5jG+LHYsUkCkNhGwCg24iOBIBAwEBAgEBAgICaRwMhT4GMgFGEFEhHBoGDgWDIYFqAxQBqHyHdg2CGQkBh1CEK4FXP4Z5gnWFDgKLCJQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFdIoFVMxokT4JshgGKWj4BMgGMDiqCIwEB X-IPAS-Result: A2FbAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZYIEgVY5jG+LHYsUkCkNhGwCg24iOBIBAwEBAgEBAgICaRwMhT4GMgFGEFEhHBoGDgWDIYFqAxQBqHyHdg2CGQkBh1CEK4FXP4Z5gnWFDgKLCJQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFdIoFVMxokT4JshgGKWj4BMgGMDiqCIwEB X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="22609581" Received: from mail-mtaka26.fraunhofer.de ([153.96.1.26]) by mail-edgeDD24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jan 2019 01:38:02 +0100 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0DkAACO3/Jb/xBhWMBiGwEBAQEDAQEBBwMBAQGBZYM5ITmMb5YxkCkNhGwChA84EgEDAQECAQECbRwMhT0GMgFGEFEhHBoGDgWDIYFqAxWodod2DYIZCQGHUIYCP4Z5gnWFDgKLCJQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFdIYFVMxokT4JshgGKWj4DMAGMDiqCIwEB X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="25618105" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP12EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaKA26.fraunhofer.de with ESMTP/TLS/AES256-SHA; 04 Jan 2019 01:38:03 +0100 Received: from localhost.de (10.80.233.51) by FGDEMUCIMP12EXC.ads.fraunhofer.de (10.80.232.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 4 Jan 2019 01:38:03 +0100 From: Lukas Auer To: Date: Fri, 4 Jan 2019 01:37:32 +0100 Message-ID: <20190104003734.28052-6-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> References: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24328.005 X-TM-AS-Result: No--6.197600-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Cc: Greentime Hu Subject: [U-Boot] [PATCH v2 5/7] riscv: replace use of callee-saved register in standalone X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Register x19 (s3) is a callee-saved register. It must not be used to load and jump to exported functions without saving it beforehand. Replace it with t0, a temporary and caller-saved register. Change the code comment to reflect this and fix it to correctly list gp as the register with the pointer to global data. Signed-off-by: Lukas Auer Reviewed-by: Bin Meng Tested-by: Bin Meng --- Changes in v2: None examples/standalone/stubs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c index fadde669fa..f37d209da6 100644 --- a/examples/standalone/stubs.c +++ b/examples/standalone/stubs.c @@ -174,16 +174,16 @@ gd_t *global_data; : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "$r16"); #elif defined(CONFIG_RISCV) /* - * t7 holds the pointer to the global_data. gp is call clobbered. + * gp holds the pointer to the global_data. t0 is call clobbered. */ #define EXPORT_FUNC(f, a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ -" lw x19, %0(gp)\n" \ -" lw x19, %1(x19)\n" \ -" jr x19\n" \ - : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "x19"); +" lw t0, %0(gp)\n" \ +" lw t0, %1(t0)\n" \ +" jr t0\n" \ + : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "t0"); #elif defined(CONFIG_ARC) /* * r25 holds the pointer to the global_data. r10 is call clobbered.