aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/lib/ashrdi3.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-06-20 15:49:59 +0100
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-06-20 15:49:59 +0100
commitf29481c0e7e55efc25598c1a6c503015cfe45245 (patch)
tree6ff6a52e54e5ec46648260df9cfb97308f8c05c2 /arch/arm/lib/ashrdi3.c
parent34c8eacab670e578a2aaafdf1061efd214b2f639 (diff)
[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/ashrdi3.c')
-rw-r--r--arch/arm/lib/ashrdi3.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/lib/ashrdi3.c b/arch/arm/lib/ashrdi3.c
index 71625d218f8..89f6fb7ed8f 100644
--- a/arch/arm/lib/ashrdi3.c
+++ b/arch/arm/lib/ashrdi3.c
@@ -31,11 +31,11 @@ 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)
@@ -43,18 +43,18 @@ __ashrdi3 (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 = 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;