Skip to content

Commit

Permalink
[PATCH] ARM: Remove gcc type-isms from GCC helper functions
Browse files Browse the repository at this point in the history 
Convert ugly GCC types to Linux types:

	UQImode -> u8
	SImode -> s32
	USImode -> u32
	DImode -> s64
	UDImode -> u64
	word_type -> int

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Jun 20, 2005
1 parent 34c8eac commit f29481c
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 95 deletions.
16 changes: 8 additions & 8 deletions arch/arm/lib/ashldi3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@ Boston, MA 02111-1307, USA. */

#include "gcclib.h"

DItype
__ashldi3 (DItype u, word_type b)
s64
__ashldi3 (s64 u, int b)
{
DIunion w;
word_type bm;
int bm;
DIunion uu;

if (b == 0)
return u;

uu.ll = u;

bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
bm = (sizeof (s32) * BITS_PER_UNIT) - b;
if (bm <= 0)
{
w.s.low = 0;
w.s.high = (USItype)uu.s.low << -bm;
w.s.high = (u32)uu.s.low << -bm;
}
else
{
USItype carries = (USItype)uu.s.low >> bm;
w.s.low = (USItype)uu.s.low << b;
w.s.high = ((USItype)uu.s.high << b) | carries;
u32 carries = (u32)uu.s.low >> bm;
w.s.low = (u32)uu.s.low << b;
w.s.high = ((u32)uu.s.high << b) | carries;
}

return w.ll;
Expand Down
14 changes: 7 additions & 7 deletions arch/arm/lib/ashrdi3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,30 @@ Boston, MA 02111-1307, USA. */

#include "gcclib.h"

DItype
__ashrdi3 (DItype u, word_type b)
s64
__ashrdi3 (s64 u, int b)
{
DIunion w;
word_type bm;
int bm;
DIunion uu;

if (b == 0)
return u;

uu.ll = u;

bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
bm = (sizeof (s32) * BITS_PER_UNIT) - b;
if (bm <= 0)
{
/* w.s.high = 1..1 or 0..0 */
w.s.high = uu.s.high >> (sizeof (SItype) * BITS_PER_UNIT - 1);
w.s.high = uu.s.high >> (sizeof (s32) * BITS_PER_UNIT - 1);
w.s.low = uu.s.high >> -bm;
}
else
{
USItype carries = (USItype)uu.s.high << bm;
u32 carries = (u32)uu.s.high << bm;
w.s.high = uu.s.high >> b;
w.s.low = ((USItype)uu.s.low >> b) | carries;
w.s.low = ((u32)uu.s.low >> b) | carries;
}

return w.ll;
Expand Down
17 changes: 6 additions & 11 deletions arch/arm/lib/gcclib.h
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
/* gcclib.h -- definitions for various functions 'borrowed' from gcc-2.95.3 */
/* I Molton 29/07/01 */

#define BITS_PER_UNIT 8
#define SI_TYPE_SIZE (sizeof (SItype) * BITS_PER_UNIT)
#include <linux/types.h>

typedef unsigned int UQItype __attribute__ ((mode (QI)));
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__)));
typedef unsigned int UDItype __attribute__ ((mode (DI)));
#define BITS_PER_UNIT 8
#define SI_TYPE_SIZE (sizeof(s32) * BITS_PER_UNIT)

#ifdef __ARMEB__
struct DIstruct {SItype high, low;};
struct DIstruct {s32 high, low;};
#else
struct DIstruct {SItype low, high;};
struct DIstruct {s32 low, high;};
#endif

typedef union
{
struct DIstruct s;
DItype ll;
s64 ll;
} DIunion;

66 changes: 33 additions & 33 deletions arch/arm/lib/longlong.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@

#define __BITS4 (SI_TYPE_SIZE / 4)
#define __ll_B (1L << (SI_TYPE_SIZE / 2))
#define __ll_lowpart(t) ((USItype) (t) % __ll_B)
#define __ll_highpart(t) ((USItype) (t) / __ll_B)
#define __ll_lowpart(t) ((u32) (t) % __ll_B)
#define __ll_highpart(t) ((u32) (t) / __ll_B)

/* Define auxiliary asm macros.
1) umul_ppmm(high_prod, low_prod, multipler, multiplicand)
multiplies two USItype integers MULTIPLER and MULTIPLICAND,
and generates a two-part USItype product in HIGH_PROD and
multiplies two u32 integers MULTIPLER and MULTIPLICAND,
and generates a two-part u32 product in HIGH_PROD and
LOW_PROD.
2) __umulsidi3(a,b) multiplies two USItype integers A and B,
and returns a UDItype product. This is just a variant of umul_ppmm.
2) __umulsidi3(a,b) multiplies two u32 integers A and B,
and returns a u64 product. This is just a variant of umul_ppmm.
3) udiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
denominator) divides a two-word unsigned integer, composed by the
Expand Down Expand Up @@ -77,23 +77,23 @@
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
__asm__ ("adds %1, %4, %5 \n\
adc %0, %2, %3" \
: "=r" ((USItype) (sh)), \
"=&r" ((USItype) (sl)) \
: "%r" ((USItype) (ah)), \
"rI" ((USItype) (bh)), \
"%r" ((USItype) (al)), \
"rI" ((USItype) (bl)))
: "=r" ((u32) (sh)), \
"=&r" ((u32) (sl)) \
: "%r" ((u32) (ah)), \
"rI" ((u32) (bh)), \
"%r" ((u32) (al)), \
"rI" ((u32) (bl)))
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
__asm__ ("subs %1, %4, %5 \n\
sbc %0, %2, %3" \
: "=r" ((USItype) (sh)), \
"=&r" ((USItype) (sl)) \
: "r" ((USItype) (ah)), \
"rI" ((USItype) (bh)), \
"r" ((USItype) (al)), \
"rI" ((USItype) (bl)))
: "=r" ((u32) (sh)), \
"=&r" ((u32) (sl)) \
: "r" ((u32) (ah)), \
"rI" ((u32) (bh)), \
"r" ((u32) (al)), \
"rI" ((u32) (bl)))
#define umul_ppmm(xh, xl, a, b) \
{register USItype __t0, __t1, __t2; \
{register u32 __t0, __t1, __t2; \
__asm__ ("%@ Inlined umul_ppmm \n\
mov %2, %5, lsr #16 \n\
mov %0, %6, lsr #16 \n\
Expand All @@ -107,11 +107,11 @@
addcs %0, %0, #65536 \n\
adds %1, %1, %3, lsl #16 \n\
adc %0, %0, %3, lsr #16" \
: "=&r" ((USItype) (xh)), \
"=r" ((USItype) (xl)), \
: "=&r" ((u32) (xh)), \
"=r" ((u32) (xl)), \
"=&r" (__t0), "=&r" (__t1), "=r" (__t2) \
: "r" ((USItype) (a)), \
"r" ((USItype) (b)));}
: "r" ((u32) (a)), \
"r" ((u32) (b)));}
#define UMUL_TIME 20
#define UDIV_TIME 100
#endif /* __arm__ */
Expand All @@ -123,14 +123,14 @@

#define __udiv_qrnnd_c(q, r, n1, n0, d) \
do { \
USItype __d1, __d0, __q1, __q0; \
USItype __r1, __r0, __m; \
u32 __d1, __d0, __q1, __q0; \
u32 __r1, __r0, __m; \
__d1 = __ll_highpart (d); \
__d0 = __ll_lowpart (d); \
\
__r1 = (n1) % __d1; \
__q1 = (n1) / __d1; \
__m = (USItype) __q1 * __d0; \
__m = (u32) __q1 * __d0; \
__r1 = __r1 * __ll_B | __ll_highpart (n0); \
if (__r1 < __m) \
{ \
Expand All @@ -143,7 +143,7 @@
\
__r0 = __r1 % __d1; \
__q0 = __r1 / __d1; \
__m = (USItype) __q0 * __d0; \
__m = (u32) __q0 * __d0; \
__r0 = __r0 * __ll_B | __ll_lowpart (n0); \
if (__r0 < __m) \
{ \
Expand All @@ -154,7 +154,7 @@
} \
__r0 -= __m; \
\
(q) = (USItype) __q1 * __ll_B | __q0; \
(q) = (u32) __q1 * __ll_B | __q0; \
(r) = __r0; \
} while (0)

Expand All @@ -163,14 +163,14 @@

#define count_leading_zeros(count, x) \
do { \
USItype __xr = (x); \
USItype __a; \
u32 __xr = (x); \
u32 __a; \
\
if (SI_TYPE_SIZE <= 32) \
{ \
__a = __xr < ((USItype)1<<2*__BITS4) \
? (__xr < ((USItype)1<<__BITS4) ? 0 : __BITS4) \
: (__xr < ((USItype)1<<3*__BITS4) ? 2*__BITS4 : 3*__BITS4); \
__a = __xr < ((u32)1<<2*__BITS4) \
? (__xr < ((u32)1<<__BITS4) ? 0 : __BITS4) \
: (__xr < ((u32)1<<3*__BITS4) ? 2*__BITS4 : 3*__BITS4); \
} \
else \
{ \
Expand Down
16 changes: 8 additions & 8 deletions arch/arm/lib/lshrdi3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@ Boston, MA 02111-1307, USA. */

#include "gcclib.h"

DItype
__lshrdi3 (DItype u, word_type b)
s64
__lshrdi3 (s64 u, int b)
{
DIunion w;
word_type bm;
int bm;
DIunion uu;

if (b == 0)
return u;

uu.ll = u;

bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
bm = (sizeof (s32) * BITS_PER_UNIT) - b;
if (bm <= 0)
{
w.s.high = 0;
w.s.low = (USItype)uu.s.high >> -bm;
w.s.low = (u32)uu.s.high >> -bm;
}
else
{
USItype carries = (USItype)uu.s.high << bm;
w.s.high = (USItype)uu.s.high >> b;
w.s.low = ((USItype)uu.s.low >> b) | carries;
u32 carries = (u32)uu.s.high << bm;
w.s.high = (u32)uu.s.high >> b;
w.s.low = ((u32)uu.s.low >> b) | carries;
}

return w.ll;
Expand Down
18 changes: 9 additions & 9 deletions arch/arm/lib/muldi3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA. */
#include "gcclib.h"

#define umul_ppmm(xh, xl, a, b) \
{register USItype __t0, __t1, __t2; \
{register u32 __t0, __t1, __t2; \
__asm__ ("%@ Inlined umul_ppmm \n\
mov %2, %5, lsr #16 \n\
mov %0, %6, lsr #16 \n\
Expand All @@ -46,11 +46,11 @@ Boston, MA 02111-1307, USA. */
addcs %0, %0, #65536 \n\
adds %1, %1, %3, lsl #16 \n\
adc %0, %0, %3, lsr #16" \
: "=&r" ((USItype) (xh)), \
"=r" ((USItype) (xl)), \
: "=&r" ((u32) (xh)), \
"=r" ((u32) (xl)), \
"=&r" (__t0), "=&r" (__t1), "=r" (__t2) \
: "r" ((USItype) (a)), \
"r" ((USItype) (b)));}
: "r" ((u32) (a)), \
"r" ((u32) (b)));}


#define __umulsidi3(u, v) \
Expand All @@ -59,8 +59,8 @@ Boston, MA 02111-1307, USA. */
__w.ll; })


DItype
__muldi3 (DItype u, DItype v)
s64
__muldi3 (s64 u, s64 v)
{
DIunion w;
DIunion uu, vv;
Expand All @@ -69,8 +69,8 @@ __muldi3 (DItype u, DItype v)
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);
w.s.high += ((u32) uu.s.low * (u32) vv.s.high
+ (u32) uu.s.high * (u32) vv.s.low);

return w.ll;
}
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/lib/ucmpdi2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@ Boston, MA 02111-1307, USA. */

#include "gcclib.h"

word_type
__ucmpdi2 (DItype a, DItype b)
int
__ucmpdi2 (s64 a, s64 b)
{
DIunion au, bu;

au.ll = a, bu.ll = b;

if ((USItype) au.s.high < (USItype) bu.s.high)
if ((u32) au.s.high < (u32) bu.s.high)
return 0;
else if ((USItype) au.s.high > (USItype) bu.s.high)
else if ((u32) au.s.high > (u32) bu.s.high)
return 2;
if ((USItype) au.s.low < (USItype) bu.s.low)
if ((u32) au.s.low < (u32) bu.s.low)
return 0;
else if ((USItype) au.s.low > (USItype) bu.s.low)
else if ((u32) au.s.low > (u32) bu.s.low)
return 2;
return 1;
}
Expand Down
Loading

0 comments on commit f29481c

Please sign in to comment.