On Wed, Mar 30, 2011 at 09:58, Greg Ungerer <gerg@xxxxxxxxxxx> wrote:
The implementation of gcc's muldi3 support function differs only in
the use of the machine's 64 bit sized mul or not. (It isn't based
on using an MMU or not). Merge the current mmu and non-mmu versions
of arc/m68k/lib/muldi3 and use the appropriate pre-processor
conditionals to get the right version for all m68k processor types.
Signed-off-by: Greg Ungerer <gerg@xxxxxxxxxxx>
---
Âarch/m68k/lib/{muldi3_no.c => muldi3.c} | Â 14 +++++++
Âarch/m68k/lib/muldi3_mm.c        |  63 -------------------------------
Â2 files changed, 14 insertions(+), 63 deletions(-)
Ârename arch/m68k/lib/{muldi3_no.c => muldi3.c} (88%)
Âdelete mode 100644 arch/m68k/lib/muldi3_mm.c
diff --git a/arch/m68k/lib/muldi3_no.c b/arch/m68k/lib/muldi3.c
similarity index 88%
rename from arch/m68k/lib/muldi3_no.c
rename to arch/m68k/lib/muldi3.c
index 34af72c..6bc1c16 100644
--- a/arch/m68k/lib/muldi3_no.c
+++ b/arch/m68k/lib/muldi3.c
@@ -22,6 +22,18 @@ Boston, MA 02111-1307, USA. Â*/
Â#define BITS_PER_UNIT 8
Â#define SI_TYPE_SIZE 32
SI_TYPE_SIZE is used by the "nommu" (sic) case only.
And BITS_PER_UNIT seems to be unused for both.
+#if defined(__mc68020__) || defined(__mc68030__) || \
+ Â Âdefined(__mc68040__) || defined(__mc68060__)
+
+#define umul_ppmm(w1, w0, u, v) \
+ Â__asm__ ("mulu%.l %3,%1:%0" Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â\
+ Â Â Â Â Â : "=d" ((USItype)(w0)), Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â \
+ Â Â Â Â Â Â "=d" ((USItype)(w1)) Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â\
+ Â Â Â Â Â : "%0" ((USItype)(u)), Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â\
+ Â Â Â Â Â Â "dmi" ((USItype)(v)))
+
+#else
+
Â#define __BITS4 (SI_TYPE_SIZE / 4)
Â#define __ll_B (1L << (SI_TYPE_SIZE / 2))
Â#define __ll_lowpart(t) ((USItype) (t) % __ll_B)
@@ -51,6 +63,8 @@ Boston, MA 02111-1307, USA. Â*/
  (w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0);     \
 } while (0)
+#endif
+
Â#define __umulsidi3(u, v) \
 ({DIunion __w;                            \
  umul_ppmm (__w.s.high, __w.s.low, u, v);              \
diff --git a/arch/m68k/lib/muldi3_mm.c b/arch/m68k/lib/muldi3_mm.c
deleted file mode 100644
index be4f275..0000000
--- a/arch/m68k/lib/muldi3_mm.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and
- Â Â Â Â Â Â Â Â Â Â Â Â Âgcc-2.7.2.3/longlong.h which is: */
-/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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, or (at your option)
-any later version.
-
-GNU CC 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 GNU CC; see the file COPYING. ÂIf not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. Â*/
-
-#define BITS_PER_UNIT 8
-
-#define umul_ppmm(w1, w0, u, v) \
- Â__asm__ ("mulu%.l %3,%1:%0" Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â\
- Â Â Â Â Â : "=d" ((USItype)(w0)), Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â \
- Â Â Â Â Â Â "=d" ((USItype)(w1)) Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â\
- Â Â Â Â Â : "%0" ((USItype)(u)), Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â\
- Â Â Â Â Â Â "dmi" ((USItype)(v)))
-
-#define __umulsidi3(u, v) \
- Â({DIunion __w; Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â \
- Â Âumul_ppmm (__w.s.high, __w.s.low, u, v); Â Â Â Â Â Â Â Â Â Â Â Â Â \
- Â Â__w.ll; })
-
-typedef         int SItype   __attribute__ ((mode (SI)));
-typedef unsigned int USItype  __attribute__ ((mode (SI)));
-typedef         int DItype   __attribute__ ((mode (DI)));
-typedef int word_type __attribute__ ((mode (__word__)));
-
-struct DIstruct {SItype high, low;};
-
-typedef union
-{
- Âstruct DIstruct s;
- ÂDItype ll;
-} DIunion;
-
-DItype
-__muldi3 (DItype u, DItype v)
-{
- ÂDIunion w;
- ÂDIunion uu, vv;
-
- Âuu.ll = u,
- Âvv.ll = v;
-
- Âw.ll = __umulsidi3 (uu.s.low, vv.s.low);
- Âw.s.high += ((USItype) uu.s.low * (USItype) vv.s.high
- Â Â Â Â Â Â Â+ (USItype) uu.s.high * (USItype) vv.s.low);
-
- Âreturn w.ll;
-}
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html
--
Gr{oetje,eeting}s,
            Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
             Â Â -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
