From: Palmer Dabbelt <palmer@dabbelt.com>
To: monstr@monstr.eu, ralf@linux-mips.org, liqin.linux@gmail.com,
lennox.wu@gmail.com, ysato@users.sourceforge.jp, dalias@libc.org,
davem@davemloft.net, linux-mips@linux-mips.org,
linux-sh@vger.kernel.org, sparclinux@vger.kernel.org,
geert@linux-m68k.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Subject: [PATCH 1/7] lib: Add shared copies of some GCC library routines
Date: Tue, 23 May 2017 15:05:40 -0700 [thread overview]
Message-ID: <20170523220546.16758-2-palmer@dabbelt.com> (raw)
In-Reply-To: <20170523220546.16758-1-palmer@dabbelt.com>
Many ports (m32r, microblaze, mips, parisc, score, and sparc) use
functionally identical copies of various GCC library routine files,
which came up as we were submitting the RISC-V port (which also uses
some of these).
This patch adds a new copy of these library routine files, which are
functionally identical to the various other copies. These are
availiable via Kconfig as CONFIG_LIB_$ROUTINE, which currently isn't
used anywhere.
Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
---
include/lib/libgcc.h | 44 ++++++++++++++++++++++++++++++++
lib/Kconfig | 18 +++++++++++++
lib/Makefile | 8 ++++++
lib/ashldi3.c | 45 ++++++++++++++++++++++++++++++++
lib/ashrdi3.c | 46 +++++++++++++++++++++++++++++++++
lib/cmpdi2.c | 42 ++++++++++++++++++++++++++++++
lib/lshrdi3.c | 45 ++++++++++++++++++++++++++++++++
lib/muldi3.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/ucmpdi2.c | 35 +++++++++++++++++++++++++
9 files changed, 355 insertions(+)
create mode 100644 include/lib/libgcc.h
create mode 100644 lib/ashldi3.c
create mode 100644 lib/ashrdi3.c
create mode 100644 lib/cmpdi2.c
create mode 100644 lib/lshrdi3.c
create mode 100644 lib/muldi3.c
create mode 100644 lib/ucmpdi2.c
diff --git a/include/lib/libgcc.h b/include/lib/libgcc.h
new file mode 100644
index 000000000000..a5397e34e005
--- /dev/null
+++ b/include/lib/libgcc.h
@@ -0,0 +1,44 @@
+/*
+ * include/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.
+ */
+
+
+#ifndef __LIB_LIBGCC_H
+#define __LIB_LIBGCC_H
+
+#include <asm/byteorder.h>
+
+typedef int word_type __attribute__ ((mode (__word__)));
+
+#ifdef __BIG_ENDIAN
+struct DWstruct {
+ int high, low;
+};
+#elif defined(__LITTLE_ENDIAN)
+struct DWstruct {
+ int low, high;
+};
+#else
+#error I feel sick.
+#endif
+
+typedef union {
+ struct DWstruct s;
+ long long ll;
+} DWunion;
+
+#endif /* __ASM_LIBGCC_H */
diff --git a/lib/Kconfig b/lib/Kconfig
index 0c8b78a9ae2e..24c08ae53c20 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -565,3 +565,21 @@ config PRIME_NUMBERS
tristate
endmenu
+
+config LIB_ASHLDI3
+ def_bool n
+
+config LIB_ASHRDI3
+ def_bool n
+
+config LIB_LSHRDI3
+ def_bool n
+
+config LIB_MULDI3
+ def_bool n
+
+config LIB_CMPDI2
+ def_bool n
+
+config LIB_UCMPDI2
+ def_bool n
diff --git a/lib/Makefile b/lib/Makefile
index 0166fbc0fa81..d111c6d9224a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -243,3 +243,11 @@ UBSAN_SANITIZE_ubsan.o := n
obj-$(CONFIG_SBITMAP) += sbitmap.o
obj-$(CONFIG_PARMAN) += parman.o
+
+# GCC library routines
+obj-$(CONFIG_LIB_ASHLDI3) += ashldi3.o
+obj-$(CONFIG_LIB_ASHRDI3) += ashrdi3.o
+obj-$(CONFIG_LIB_LSHRDI3) += lshrdi3.o
+obj-$(CONFIG_LIB_MULDI3) += multi3.o
+obj-$(CONFIG_LIB_CMPDI2) += cmpdi2.o
+obj-$(CONFIG_LIB_UCMPDI2) += ucmpdi2.o
diff --git a/lib/ashldi3.c b/lib/ashldi3.c
new file mode 100644
index 000000000000..5a4c731546b0
--- /dev/null
+++ b/lib/ashldi3.c
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+
+#include <linux/export.h>
+
+#include <lib/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/lib/ashrdi3.c b/lib/ashrdi3.c
new file mode 100644
index 000000000000..31b34ca7252c
--- /dev/null
+++ b/lib/ashrdi3.c
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+#include <linux/export.h>
+
+#include <lib/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/lib/cmpdi2.c b/lib/cmpdi2.c
new file mode 100644
index 000000000000..a0d7701d9386
--- /dev/null
+++ b/lib/cmpdi2.c
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+#include <linux/export.h>
+
+#include <lib/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/lib/lshrdi3.c b/lib/lshrdi3.c
new file mode 100644
index 000000000000..c5a5c23b2e92
--- /dev/null
+++ b/lib/lshrdi3.c
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <lib/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/lib/muldi3.c b/lib/muldi3.c
new file mode 100644
index 000000000000..b361dca557af
--- /dev/null
+++ b/lib/muldi3.c
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+#include <linux/export.h>
+#include <lib/libgcc.h>
+
+#define W_TYPE_SIZE 32
+
+#define __ll_B ((unsigned long) 1 << (W_TYPE_SIZE / 2))
+#define __ll_lowpart(t) ((unsigned long) (t) & (__ll_B - 1))
+#define __ll_highpart(t) ((unsigned long) (t) >> (W_TYPE_SIZE / 2))
+
+/* If we still don't have umul_ppmm, define it using plain C. */
+#if !defined(umul_ppmm)
+#define umul_ppmm(w1, w0, u, v) \
+ do { \
+ unsigned long __x0, __x1, __x2, __x3; \
+ unsigned short __ul, __vl, __uh, __vh; \
+ \
+ __ul = __ll_lowpart(u); \
+ __uh = __ll_highpart(u); \
+ __vl = __ll_lowpart(v); \
+ __vh = __ll_highpart(v); \
+ \
+ __x0 = (unsigned long) __ul * __vl; \
+ __x1 = (unsigned long) __ul * __vh; \
+ __x2 = (unsigned long) __uh * __vl; \
+ __x3 = (unsigned long) __uh * __vh; \
+ \
+ __x1 += __ll_highpart(__x0); /* this can't give carry */\
+ __x1 += __x2; /* but this indeed can */ \
+ if (__x1 < __x2) /* did we get it? */ \
+ __x3 += __ll_B; /* yes, add it in the proper pos */ \
+ \
+ (w1) = __x3 + __ll_highpart(__x1); \
+ (w0) = __ll_lowpart(__x1) * __ll_B + __ll_lowpart(__x0);\
+ } while (0)
+#endif
+
+#if !defined(__umulsidi3)
+#define __umulsidi3(u, v) ({ \
+ DWunion __w; \
+ umul_ppmm(__w.s.high, __w.s.low, u, v); \
+ __w.ll; \
+ })
+#endif
+
+long long __muldi3(long long u, long long v)
+{
+ const DWunion uu = {.ll = u};
+ const DWunion vv = {.ll = v};
+ DWunion w = {.ll = __umulsidi3(uu.s.low, vv.s.low)};
+
+ w.s.high += ((unsigned long) uu.s.low * (unsigned long) vv.s.high
+ + (unsigned long) uu.s.high * (unsigned long) vv.s.low);
+
+ return w.ll;
+}
+EXPORT_SYMBOL(__muldi3);
diff --git a/lib/ucmpdi2.c b/lib/ucmpdi2.c
new file mode 100644
index 000000000000..49a53505c8e3
--- /dev/null
+++ b/lib/ucmpdi2.c
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <lib/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);
--
2.13.0
next prev parent reply other threads:[~2017-05-23 22:05 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 22:05 Unify the various copies of libgcc into lib Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 1/7] lib: Add shared copies of some GCC library routines Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt [this message]
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-24 8:52 ` Matt Redfearn
2017-05-24 8:52 ` Matt Redfearn
2017-06-03 2:18 ` Palmer Dabbelt
2017-06-03 2:18 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 2/7] m32r: Use lib/ucmpdi2.c Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 3/7] microblaze: Use libgcc files from lib/ Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-24 11:22 ` kbuild test robot
2017-05-24 11:22 ` kbuild test robot
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 4/7] mips: Use lib/{ashldi3,ashrdi3,cmpdi2,lshrdi3,ucmpdi2}.c Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-24 9:01 ` Matt Redfearn
2017-05-24 9:01 ` Matt Redfearn
2017-06-03 2:18 ` Palmer Dabbelt
2017-05-24 11:39 ` kbuild test robot
2017-05-24 11:39 ` kbuild test robot
2017-05-24 11:50 ` kbuild test robot
2017-05-24 11:50 ` kbuild test robot
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 5/7] score: " Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 6/7] sh: Use lib/ashldi3,ashrdi3,lshrdi3}.c Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-24 11:22 ` kbuild test robot
2017-05-24 11:22 ` kbuild test robot
2017-05-24 11:30 ` kbuild test robot
2017-05-24 11:30 ` kbuild test robot
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 7/7] sparc: Use lib/{cmpdi2,ucmpdi2}.c Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-24 9:21 ` Unify the various copies of libgcc into lib Geert Uytterhoeven
2017-05-24 9:21 ` Geert Uytterhoeven
2017-06-03 2:59 ` Palmer Dabbelt
2017-06-03 2:59 ` Palmer Dabbelt
2017-05-24 13:49 ` David Howells
2017-05-24 13:49 ` David Howells
2017-05-24 13:59 ` John Paul Adrian Glaubitz
2017-05-24 13:59 ` John Paul Adrian Glaubitz
2017-06-06 19:10 ` Unify the various copies of libgcc into lib v2 Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 1/7] lib: Add shared copies of some GCC library routines Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 2/7] m32r: Use lib/ucmpdi2.c Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 3/7] microblaze: Use libgcc files from lib/ Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 4/7] score: Use lib/{ashldi3,ashrdi3,cmpdi2,lshrdi3,ucmpdi2}.c Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 5/7] sh: Use lib/ashldi3,ashrdi3,lshrdi3}.c Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-07 19:27 ` kbuild test robot
2017-06-07 19:27 ` kbuild test robot
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 6/7] sparc: Use lib/{cmpdi2,ucmpdi2}.c Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 7/7] MIPS: Use generic libgcc intrinsics Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-09 19:53 ` Ralf Baechle
2017-06-09 19:53 ` Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170523220546.16758-2-palmer@dabbelt.com \
--to=palmer@dabbelt.com \
--cc=dalias@libc.org \
--cc=davem@davemloft.net \
--cc=geert@linux-m68k.org \
--cc=lennox.wu@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-sh@vger.kernel.org \
--cc=liqin.linux@gmail.com \
--cc=monstr@monstr.eu \
--cc=ralf@linux-mips.org \
--cc=sparclinux@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox