From owner-svn-src-head@freebsd.org Fri Jun 5 08:47:01 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 31360344DB9; Fri, 5 Jun 2020 08:47:01 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49dbqN6wbcz4TKg; Fri, 5 Jun 2020 08:46:56 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 25899E1E1; Fri, 5 Jun 2020 08:46:56 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0558ktna028860; Fri, 5 Jun 2020 08:46:55 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0558ktdP028859; Fri, 5 Jun 2020 08:46:55 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <202006050846.0558ktdP028859@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Fri, 5 Jun 2020 08:46:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361830 - head/lib/csu/mips X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/lib/csu/mips X-SVN-Commit-Revision: 361830 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2020 08:47:01 -0000 Author: arichardson Date: Fri Jun 5 08:46:55 2020 New Revision: 361830 URL: https://svnweb.freebsd.org/changeset/base/361830 Log: csu: Avoid additional nops in the MIPS INIT_CALL_SEQ macro Since we had a .set reorder, the nop after the "jal" was being placed after the delay slot, resulting in two nops. While changing this code also guard the .set noreorder with .set push/pop and use $zero as the cpsetup save register since we don't need to save $gp. Reviewed By: jhb Differential Revision: https://reviews.freebsd.org/D25025 Modified: head/lib/csu/mips/crt.h Modified: head/lib/csu/mips/crt.h ============================================================================== --- head/lib/csu/mips/crt.h Fri Jun 5 08:46:50 2020 (r361829) +++ head/lib/csu/mips/crt.h Fri Jun 5 08:46:55 2020 (r361830) @@ -30,29 +30,31 @@ #define CTORS_CONSTRUCTORS #ifdef __mips_o32 #define INIT_CALL_SEQ(func) \ + ".set push \n" \ ".set noreorder \n" \ "bal 1f \n" \ "nop \n" \ "1: \n" \ ".cpload $ra \n" \ "addu $sp, $sp, -8 \n" \ - ".set reorder \n" \ ".cprestore 4 \n" \ ".local " __STRING(func) "\n" \ "jal " __STRING(func) "\n" \ "nop \n" \ - "addu $sp, $sp, 8 \n" + "addu $sp, $sp, 8 \n" \ + ".set pop\n" #else #define INIT_CALL_SEQ(func) \ + ".set push \n" \ ".set noreorder \n" \ "bal 1f \n" \ "nop \n" \ "1: \n" \ - ".set reorder \n" \ - ".cpsetup $ra, $v0, 1b \n" \ + ".cpsetup $ra, $zero, 1b \n" \ ".local " __STRING(func) "\n" \ "jal " __STRING(func) "\n" \ - "nop \n" + "nop \n" \ + ".set pop\n" #endif #endif