diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-20 16:49:59 +0200 |
|---|---|---|
| committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-20 16:49:59 +0200 |
| commit | f29481c0e7e55efc25598c1a6c503015cfe45245 (patch) | |
| tree | 6ff6a52e54e5ec46648260df9cfb97308f8c05c2 /arch/arm/lib/lshrdi3.c | |
| parent | [PATCH] ARM: Remove obsolete arch/arm/kernel/arch.c (diff) | |
| download | linux-f29481c0e7e55efc25598c1a6c503015cfe45245.tar.xz linux-f29481c0e7e55efc25598c1a6c503015cfe45245.zip | |
[PATCH] ARM: Remove gcc type-isms from GCC helper functions
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>
Diffstat (limited to 'arch/arm/lib/lshrdi3.c')
| -rw-r--r-- | arch/arm/lib/lshrdi3.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/lib/lshrdi3.c b/arch/arm/lib/lshrdi3.c index b666f1bad451..5c2385acdecc 100644 --- a/arch/arm/lib/lshrdi3.c +++ b/arch/arm/lib/lshrdi3.c @@ -31,11 +31,11 @@ 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) @@ -43,17 +43,17 @@ __lshrdi3 (DItype u, word_type b) 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; |