From patchwork Tue Jun 6 19:10:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 9769797 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 73AF36035D for ; Tue, 6 Jun 2017 19:19:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 602C123B23 for ; Tue, 6 Jun 2017 19:19:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54710284DA; Tue, 6 Jun 2017 19:19:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74DF623B23 for ; Tue, 6 Jun 2017 19:19:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751666AbdFFTOb (ORCPT ); Tue, 6 Jun 2017 15:14:31 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36522 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751871AbdFFTKj (ORCPT ); Tue, 6 Jun 2017 15:10:39 -0400 Received: by mail-pg0-f66.google.com with SMTP id v18so10499037pgb.3 for ; Tue, 06 Jun 2017 12:10:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=from:to:to:to:to:to:to:to:to:to:to:to:to:to:cc:subject:date :message-id:in-reply-to:references; bh=SxegilclmafEDrh8NB05FhxdVdtFhF7GIr3TgcmfKY0=; b=TDXU6RNUNMfiXWFV1hvRR9o+FJWA0cWPVDJ2MR8fBk7UjuWZx9uFczYTmSKiaCrBY5 7+21sQOkY0oxP2LRCEs6+TaWAs5rAmFDjGGAp7tBc1J7ZT3CN/gi8erCJ3MaTRC9Z8wj 36QUYqfN5CoG7RfkmQ+Wrt3kHaXTZOGyJzdjEHx5cPr26D2DQHyfaCzzY5mr3dwztAf+ 2QyZ3nU6w7MO82zozr0FZ5duLDkXXktHVAih3jQzq1yEY2K0tjpBhtzYk1I1oEwCPSVx MExnISLuUV1YweusEBgDZ7B1xIviDZz4m/J2hTUhdNRXXc9FnD6K+LRSNDFzVsrqyqmy v6zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:to:to:to:to:to:to:to:to:to:to:to:to:cc :subject:date:message-id:in-reply-to:references; bh=SxegilclmafEDrh8NB05FhxdVdtFhF7GIr3TgcmfKY0=; b=mRFHTSaTz9P4SFqNA5hh1vgkbK4SreT1BZTA7UdHOu0unDzU2OvUpiev5F6lO+hHqW uZsEYlURUXHRYKjx/48CVtXM4QABSwaIH1+caM1GqRQyzmTfa5BvFB+QwXlZnyp43vc/ 4+PLTFk5n0/xygMVM7CHVrnxID4CHN72XEPsTsBROvXcjVIl1PcyIIXQTlm+aQBl9NdJ BhgEqIZVaD6vQFtELL5/QGUAOpNcBNiDldBlfY8C0sfbPPEpmaOhKL5ThMi8rBAZeMGe HrLXSjEhZcxpoeShg6wupc9j4a2y3XBjvouJTVaXcmynR9+eUVIkeWfwxBh3ar4Ph6nP NZNA== X-Gm-Message-State: AODbwcAh8pl42POreq56SQP6wRblayMB88xvPm2iCq4uhV74PIQqwu3/ uuF8uFyw2f9YgV0i X-Received: by 10.84.233.193 with SMTP id m1mr23005639pln.236.1496776233626; Tue, 06 Jun 2017 12:10:33 -0700 (PDT) Received: from localhost ([216.38.154.21]) by smtp.gmail.com with ESMTPSA id 71sm40410548pgd.57.2017.06.06.12.10.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 12:10:32 -0700 (PDT) From: Palmer Dabbelt To: monstr@monstr.eu To: ralf@linux-mips.org To: liqin.linux@gmail.com To: lennox.wu@gmail.com To: ysato@users.sourceforge.jp To: dalias@libc.org To: davem@davemloft.net To: linux-mips@linux-mips.org To: linux-sh@vger.kernel.org To: sparclinux@vger.kernel.org To: geert@linux-m68k.org To: linux-kernel@vger.kernel.org To: linux-arch@vger.kernel.org Cc: Palmer Dabbelt Subject: [PATCH 4/7] score: Use lib/{ashldi3, ashrdi3, cmpdi2, lshrdi3, ucmpdi2}.c Date: Tue, 6 Jun 2017 12:10:20 -0700 Message-Id: <20170606191023.24581-5-palmer@dabbelt.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170606191023.24581-1-palmer@dabbelt.com> References: <20170523220546.16758-1-palmer@dabbelt.com> <20170606191023.24581-1-palmer@dabbelt.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These files are functionally identical to the shared copies that I recently added. Signed-off-by: Palmer Dabbelt Reviewed-by: Geert Uytterhoeven --- arch/score/Kconfig | 5 +++++ arch/score/lib/Makefile | 3 --- arch/score/lib/ashldi3.c | 46 ---------------------------------------------- arch/score/lib/ashrdi3.c | 48 ------------------------------------------------ arch/score/lib/cmpdi2.c | 44 -------------------------------------------- arch/score/lib/libgcc.h | 37 ------------------------------------- arch/score/lib/lshrdi3.c | 47 ----------------------------------------------- arch/score/lib/ucmpdi2.c | 38 -------------------------------------- 8 files changed, 5 insertions(+), 263 deletions(-) delete mode 100644 arch/score/lib/ashldi3.c delete mode 100644 arch/score/lib/ashrdi3.c delete mode 100644 arch/score/lib/cmpdi2.c delete mode 100644 arch/score/lib/libgcc.h delete mode 100644 arch/score/lib/lshrdi3.c delete mode 100644 arch/score/lib/ucmpdi2.c diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 507d63181389..151ec2296d53 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig @@ -15,6 +15,11 @@ config SCORE select MODULES_USE_ELF_REL select CLONE_BACKWARDS select CPU_NO_EFFICIENT_FFS + select GENERIC_ASHLDI3 + select GENERIC_ASHRDI3 + select GENERIC_CMPDI2 + select GENERIC_LSHRDI3 + select GENERIC_UCMPDI2 choice prompt "System type" diff --git a/arch/score/lib/Makefile b/arch/score/lib/Makefile index 553e30e81faf..ea3f3aba8c71 100644 --- a/arch/score/lib/Makefile +++ b/arch/score/lib/Makefile @@ -3,6 +3,3 @@ # lib-y += string.o checksum.o checksum_copy.o - -# libgcc-style stuff needed in the kernel -obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o diff --git a/arch/score/lib/ashldi3.c b/arch/score/lib/ashldi3.c deleted file mode 100644 index 15691a910431..000000000000 --- a/arch/score/lib/ashldi3.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * arch/score/lib/ashldi3.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include "libgcc.h" - -long long __ashldi3(long long u, word_type b) -{ - DWunion uu, w; - word_type bm; - - if (b == 0) - return u; - - uu.ll = u; - bm = 32 - b; - - if (bm <= 0) { - w.s.low = 0; - w.s.high = (unsigned int) uu.s.low << -bm; - } else { - const unsigned int carries = (unsigned int) uu.s.low >> bm; - - w.s.low = (unsigned int) uu.s.low << b; - w.s.high = ((unsigned int) uu.s.high << b) | carries; - } - - return w.ll; -} -EXPORT_SYMBOL(__ashldi3); diff --git a/arch/score/lib/ashrdi3.c b/arch/score/lib/ashrdi3.c deleted file mode 100644 index d9814a5d8d30..000000000000 --- a/arch/score/lib/ashrdi3.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * arch/score/lib/ashrdi3.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include "libgcc.h" - -long long __ashrdi3(long long u, word_type b) -{ - DWunion uu, w; - word_type bm; - - if (b == 0) - return u; - - uu.ll = u; - bm = 32 - b; - - if (bm <= 0) { - /* w.s.high = 1..1 or 0..0 */ - w.s.high = - uu.s.high >> 31; - w.s.low = uu.s.high >> -bm; - } else { - const unsigned int carries = (unsigned int) uu.s.high << bm; - - w.s.high = uu.s.high >> b; - w.s.low = ((unsigned int) uu.s.low >> b) | carries; - } - - return w.ll; -} -EXPORT_SYMBOL(__ashrdi3); diff --git a/arch/score/lib/cmpdi2.c b/arch/score/lib/cmpdi2.c deleted file mode 100644 index 1ed5290c66ed..000000000000 --- a/arch/score/lib/cmpdi2.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * arch/score/lib/cmpdi2.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include "libgcc.h" - -word_type __cmpdi2(long long a, long long b) -{ - const DWunion au = { - .ll = a - }; - const DWunion bu = { - .ll = b - }; - - if (au.s.high < bu.s.high) - return 0; - else if (au.s.high > bu.s.high) - return 2; - - if ((unsigned int) au.s.low < (unsigned int) bu.s.low) - return 0; - else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) - return 2; - - return 1; -} -EXPORT_SYMBOL(__cmpdi2); diff --git a/arch/score/lib/libgcc.h b/arch/score/lib/libgcc.h deleted file mode 100644 index 0f12543d9f31..000000000000 --- a/arch/score/lib/libgcc.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * arch/score/lib/libgcc.h - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef __ASM_LIBGCC_H -#define __ASM_LIBGCC_H - -#include - -typedef int word_type __attribute__((mode(__word__))); - -struct DWstruct { - int low, high; -}; - -typedef union { - struct DWstruct s; - long long ll; -} DWunion; - -#endif /* __ASM_LIBGCC_H */ diff --git a/arch/score/lib/lshrdi3.c b/arch/score/lib/lshrdi3.c deleted file mode 100644 index ce21175fd791..000000000000 --- a/arch/score/lib/lshrdi3.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * arch/score/lib/lshrdi3.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#include -#include "libgcc.h" - -long long __lshrdi3(long long u, word_type b) -{ - DWunion uu, w; - word_type bm; - - if (b == 0) - return u; - - uu.ll = u; - bm = 32 - b; - - if (bm <= 0) { - w.s.high = 0; - w.s.low = (unsigned int) uu.s.high >> -bm; - } else { - const unsigned int carries = (unsigned int) uu.s.high << bm; - - w.s.high = (unsigned int) uu.s.high >> b; - w.s.low = ((unsigned int) uu.s.low >> b) | carries; - } - - return w.ll; -} -EXPORT_SYMBOL(__lshrdi3); diff --git a/arch/score/lib/ucmpdi2.c b/arch/score/lib/ucmpdi2.c deleted file mode 100644 index b15241e0b079..000000000000 --- a/arch/score/lib/ucmpdi2.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * arch/score/lib/ucmpdi2.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include "libgcc.h" - -word_type __ucmpdi2(unsigned long long a, unsigned long long b) -{ - const DWunion au = {.ll = a}; - const DWunion bu = {.ll = b}; - - if ((unsigned int) au.s.high < (unsigned int) bu.s.high) - return 0; - else if ((unsigned int) au.s.high > (unsigned int) bu.s.high) - return 2; - if ((unsigned int) au.s.low < (unsigned int) bu.s.low) - return 0; - else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) - return 2; - return 1; -} -EXPORT_SYMBOL(__ucmpdi2);