From mboxrd@z Thu Jan 1 00:00:00 1970 From: olof@lixom.net (Olof Johansson) Date: Tue, 30 Oct 2018 23:47:08 -0700 Subject: [PATCH 2/3] RISC-V: lib: minor asm cleanup In-Reply-To: <20181031064709.30981-1-olof@lixom.net> References: <20181031064709.30981-1-olof@lixom.net> Message-ID: <20181031064709.30981-3-olof@lixom.net> To: linux-riscv@lists.infradead.org List-Id: linux-riscv.lists.infradead.org Fix tab/space conversion and use ENTRY/ENDPROC macros. Signed-off-by: Olof Johansson --- arch/riscv/lib/tishift.S | 59 +++++++++++++++++++++++++----------------------- arch/riscv/lib/udivdi3.S | 42 ++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 48 deletions(-) diff --git a/arch/riscv/lib/tishift.S b/arch/riscv/lib/tishift.S index 69abb1277234..237bc9fd0763 100644 --- a/arch/riscv/lib/tishift.S +++ b/arch/riscv/lib/tishift.S @@ -10,33 +10,36 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ - .globl __lshrti3 -__lshrti3: - beqz a2, .L1 - li a5,64 - sub a5,a5,a2 - addi sp,sp,-16 - sext.w a4,a5 - blez a5, .L2 - sext.w a2,a2 - sll a4,a1,a4 - srl a0,a0,a2 - srl a1,a1,a2 - or a0,a0,a4 - sd a1,8(sp) - sd a0,0(sp) - ld a0,0(sp) - ld a1,8(sp) - addi sp,sp,16 - ret + +#include + +ENTRY(__lshrti3) + beqz a2, .L1 + li a5,64 + sub a5,a5,a2 + addi sp,sp,-16 + sext.w a4,a5 + blez a5, .L2 + sext.w a2,a2 + sll a4,a1,a4 + srl a0,a0,a2 + srl a1,a1,a2 + or a0,a0,a4 + sd a1,8(sp) + sd a0,0(sp) + ld a0,0(sp) + ld a1,8(sp) + addi sp,sp,16 + ret .L1: - ret + ret .L2: - negw a4,a4 - srl a1,a1,a4 - sd a1,0(sp) - sd zero,8(sp) - ld a0,0(sp) - ld a1,8(sp) - addi sp,sp,16 - ret + negw a4,a4 + srl a1,a1,a4 + sd a1,0(sp) + sd zero,8(sp) + ld a0,0(sp) + ld a1,8(sp) + addi sp,sp,16 + ret +ENDPROC(__lshrti3) diff --git a/arch/riscv/lib/udivdi3.S b/arch/riscv/lib/udivdi3.S index cb01ae5b181a..7f1c0af182a3 100644 --- a/arch/riscv/lib/udivdi3.S +++ b/arch/riscv/lib/udivdi3.S @@ -11,28 +11,30 @@ * GNU General Public License for more details. */ - .globl __udivdi3 -__udivdi3: - mv a2, a1 - mv a1, a0 - li a0, -1 - beqz a2, .L5 - li a3, 1 - bgeu a2, a1, .L2 +#include + +ENTRY(__udivdi3) + mv a2, a1 + mv a1, a0 + li a0, -1 + beqz a2, .L5 + li a3, 1 + bgeu a2, a1, .L2 .L1: - blez a2, .L2 - slli a2, a2, 1 - slli a3, a3, 1 - bgtu a1, a2, .L1 + blez a2, .L2 + slli a2, a2, 1 + slli a3, a3, 1 + bgtu a1, a2, .L1 .L2: - li a0, 0 + li a0, 0 .L3: - bltu a1, a2, .L4 - sub a1, a1, a2 - or a0, a0, a3 + bltu a1, a2, .L4 + sub a1, a1, a2 + or a0, a0, a3 .L4: - srli a3, a3, 1 - srli a2, a2, 1 - bnez a3, .L3 + srli a3, a3, 1 + srli a2, a2, 1 + bnez a3, .L3 .L5: - ret + ret +ENDPROC(__udivdi3) -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FD18ECDE44 for ; Wed, 31 Oct 2018 06:47:39 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F32BD20657 for ; Wed, 31 Oct 2018 06:47:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oSNLTEiI"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=lixom-net.20150623.gappssmtp.com header.i=@lixom-net.20150623.gappssmtp.com header.b="meozz6lJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F32BD20657 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lixom.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Abcq53kAywms1CkjP/+gtbLUupJ8RCaqy/+iR3s68kE=; b=oSNLTEiI3Rh0ytIcz8QQjWF71J 7nkc9+7IEiNA1nfMDbtIBoaadlKz0G51pNRYB67Y3rdawnqQfQNZFPCH2cNWJL63QAc2ScSmsBKOs SvlA4t3S3JMo6dcKzqTAYPQ7l4hYIaB2n5cNtGIGLEnW6Y6LfuJzET9u6mdMjqiK/0pmNMwqVYbmj tehfDSN0WPnSFLl750oCcLPSJWO3CCBJsA7CpkzIK4W/oXA31NLhDYHYhOF2vckdXK+Mlqfm2vhtS g44r564ewKv3J2rxVkTmJzsosZ8X6d8r76hIWgd9RL2Y17lF5OEMtc3kcSadQ6+J1HEtkgxzpjvbu G69hSBnw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHkHy-0005l5-9j; Wed, 31 Oct 2018 06:47:38 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHkHu-0005fG-Ls for linux-riscv@lists.infradead.org; Wed, 31 Oct 2018 06:47:36 +0000 Received: by mail-pf1-x444.google.com with SMTP id g21-v6so7123356pfi.7 for ; Tue, 30 Oct 2018 23:47:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lixom-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8JnXO0CmsRANa8vJkrTWMoBBwz9FHTmUizOnZ5jp4Ok=; b=meozz6lJBjR45UuqY79EXfIam3Qt90vtt9kAuXpXaR2xN8ALGyXu276O+89n6iVaXS sePrUg3I1263ujnjyU4RwYLOsRS4cSWaODZjeSI+ZBTJPyMT9cnHPO9rYI5CoDGrHwdh DwplT0j96qH+0gnExV7pxtLXrBQcKEDJXhzeb35mFiTMLrz2CjUs0s9mOreAuDxvQ31F zxM6Pbcseojp4v2XIfAV7aMPfSf1tYMt9NVAyLOlgjEa2Xt1ZEC6RhOhWVHwktW3r2J+ 8GzCPLaPlmA4iZnVZKuQaTi721nQaBNFWs9bet6cdZNvXyi61BE1e5nsnWlYsrsyFpx/ 4p1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8JnXO0CmsRANa8vJkrTWMoBBwz9FHTmUizOnZ5jp4Ok=; b=ZEmhc2Cfoj02RhKsh+I2stwY0kcSk6w1awH89yG/IiXs5jXg+BkUcRLyl3yXc3kGOb A9Ll3NqN0/pNVq7/306X8mG1DBZgLOnLEnxS/+Mjbi5GmobDS/TKks+sqgtXO4PiNyr1 tVdQPsFwJyB0zpNiK8m0OQwDbPW2ur0Pq0BC0l3Xh+mFaS9zcxsmHZ/kvAXMt9AFZiiv LRTL7KCynRwoNwaVW4jS53uANlmluVydkp9BSeXmulx3ovQ36Ic28/ys0UUR1dO/bH6R 04WhxTjjgWQNLLEtDkUP/EIlBwSfF+RCNPbsAA6GWSslG1IoGpXvfzmN6IBGo5c16k/n 94Qg== X-Gm-Message-State: AGRZ1gLHtZ+WyvFcvAyyN+Aqf8ISlycDcq+qmetCJLxgxbTY1SpzW6cv f+OKZLnUGrqnugz46VAklpJpOg== X-Google-Smtp-Source: AJdET5extOWqniinY943Y+junajQfD4v+S10E+FXFkg4u0+tdqi+3gCo/PhFx/cLSA/0u+k0p4PgoQ== X-Received: by 2002:a63:111c:: with SMTP id g28mr1896919pgl.85.1540968444058; Tue, 30 Oct 2018 23:47:24 -0700 (PDT) Received: from localhost.localdomain (99-152-116-91.lightspeed.sntcca.sbcglobal.net. [99.152.116.91]) by smtp.gmail.com with ESMTPSA id z7-v6sm12127306pgi.42.2018.10.30.23.47.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Oct 2018 23:47:22 -0700 (PDT) From: Olof Johansson To: Palmer Dabbelt Subject: [PATCH 2/3] RISC-V: lib: minor asm cleanup Date: Tue, 30 Oct 2018 23:47:08 -0700 Message-Id: <20181031064709.30981-3-olof@lixom.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181031064709.30981-1-olof@lixom.net> References: <20181031064709.30981-1-olof@lixom.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181030_234734_722346_E7EAE0BE X-CRM114-Status: GOOD ( 11.16 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Olof Johansson , linux-riscv@lists.infradead.org, Albert Ou , Zong Li , linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org Message-ID: <20181031064708.BmY-VNvCZ2DExQ_SNPg6iT1__eVzur55UEBi3rQb7D8@z> Fix tab/space conversion and use ENTRY/ENDPROC macros. Signed-off-by: Olof Johansson --- arch/riscv/lib/tishift.S | 59 +++++++++++++++++++++++++----------------------- arch/riscv/lib/udivdi3.S | 42 ++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 48 deletions(-) diff --git a/arch/riscv/lib/tishift.S b/arch/riscv/lib/tishift.S index 69abb1277234..237bc9fd0763 100644 --- a/arch/riscv/lib/tishift.S +++ b/arch/riscv/lib/tishift.S @@ -10,33 +10,36 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ - .globl __lshrti3 -__lshrti3: - beqz a2, .L1 - li a5,64 - sub a5,a5,a2 - addi sp,sp,-16 - sext.w a4,a5 - blez a5, .L2 - sext.w a2,a2 - sll a4,a1,a4 - srl a0,a0,a2 - srl a1,a1,a2 - or a0,a0,a4 - sd a1,8(sp) - sd a0,0(sp) - ld a0,0(sp) - ld a1,8(sp) - addi sp,sp,16 - ret + +#include + +ENTRY(__lshrti3) + beqz a2, .L1 + li a5,64 + sub a5,a5,a2 + addi sp,sp,-16 + sext.w a4,a5 + blez a5, .L2 + sext.w a2,a2 + sll a4,a1,a4 + srl a0,a0,a2 + srl a1,a1,a2 + or a0,a0,a4 + sd a1,8(sp) + sd a0,0(sp) + ld a0,0(sp) + ld a1,8(sp) + addi sp,sp,16 + ret .L1: - ret + ret .L2: - negw a4,a4 - srl a1,a1,a4 - sd a1,0(sp) - sd zero,8(sp) - ld a0,0(sp) - ld a1,8(sp) - addi sp,sp,16 - ret + negw a4,a4 + srl a1,a1,a4 + sd a1,0(sp) + sd zero,8(sp) + ld a0,0(sp) + ld a1,8(sp) + addi sp,sp,16 + ret +ENDPROC(__lshrti3) diff --git a/arch/riscv/lib/udivdi3.S b/arch/riscv/lib/udivdi3.S index cb01ae5b181a..7f1c0af182a3 100644 --- a/arch/riscv/lib/udivdi3.S +++ b/arch/riscv/lib/udivdi3.S @@ -11,28 +11,30 @@ * GNU General Public License for more details. */ - .globl __udivdi3 -__udivdi3: - mv a2, a1 - mv a1, a0 - li a0, -1 - beqz a2, .L5 - li a3, 1 - bgeu a2, a1, .L2 +#include + +ENTRY(__udivdi3) + mv a2, a1 + mv a1, a0 + li a0, -1 + beqz a2, .L5 + li a3, 1 + bgeu a2, a1, .L2 .L1: - blez a2, .L2 - slli a2, a2, 1 - slli a3, a3, 1 - bgtu a1, a2, .L1 + blez a2, .L2 + slli a2, a2, 1 + slli a3, a3, 1 + bgtu a1, a2, .L1 .L2: - li a0, 0 + li a0, 0 .L3: - bltu a1, a2, .L4 - sub a1, a1, a2 - or a0, a0, a3 + bltu a1, a2, .L4 + sub a1, a1, a2 + or a0, a0, a3 .L4: - srli a3, a3, 1 - srli a2, a2, 1 - bnez a3, .L3 + srli a3, a3, 1 + srli a2, a2, 1 + bnez a3, .L3 .L5: - ret + ret +ENDPROC(__udivdi3) -- 2.11.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv