leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

microblaze: lib: Remove helper macros

Browse Source 
Remove these gcc types and use standard types.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2012-12-13 17:46:31 +01:00
parent c0d997fb4c
commit a671de0868
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/microblaze/lib/muldi3.c
View File

@ -2,32 +2,28 @@
#include "libgcc.h" #include "libgcc.h"
#define DWtype long long
#define UWtype unsigned long
#define UHWtype unsigned short
#define W_TYPE_SIZE 32 #define W_TYPE_SIZE 32
#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2)) #define __ll_B ((unsigned long) 1 << (W_TYPE_SIZE / 2))
#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1)) #define __ll_lowpart(t) ((unsigned long) (t) & (__ll_B - 1))
#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2)) #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 we still don't have umul_ppmm, define it using plain C. */
#if !defined(umul_ppmm) #if !defined(umul_ppmm)
#define umul_ppmm(w1, w0, u, v) \ #define umul_ppmm(w1, w0, u, v) \
do { \ do { \
UWtype __x0, __x1, __x2, __x3; \ unsigned long __x0, __x1, __x2, __x3; \
UHWtype __ul, __vl, __uh, __vh; \ unsigned short __ul, __vl, __uh, __vh; \
\ \
__ul = __ll_lowpart(u); \ __ul = __ll_lowpart(u); \
__uh = __ll_highpart(u); \ __uh = __ll_highpart(u); \
__vl = __ll_lowpart(v); \ __vl = __ll_lowpart(v); \
__vh = __ll_highpart(v); \ __vh = __ll_highpart(v); \
\ \
__x0 = (UWtype) __ul * __vl; \ __x0 = (unsigned long) __ul * __vl; \
__x1 = (UWtype) __ul * __vh; \ __x1 = (unsigned long) __ul * __vh; \
__x2 = (UWtype) __uh * __vl; \ __x2 = (unsigned long) __uh * __vl; \
__x3 = (UWtype) __uh * __vh; \ __x3 = (unsigned long) __uh * __vh; \
\ \
__x1 += __ll_highpart(__x0); /* this can't give carry */\ __x1 += __ll_highpart(__x0); /* this can't give carry */\
__x1 += __x2; /* but this indeed can */ \ __x1 += __x2; /* but this indeed can */ \
@ -47,14 +43,14 @@
}) })
#endif #endif
DWtype __muldi3(DWtype u, DWtype v) long long __muldi3(long long u, long long v)
{ {
const DWunion uu = {.ll = u}; const DWunion uu = {.ll = u};
const DWunion vv = {.ll = v}; const DWunion vv = {.ll = v};
DWunion w = {.ll = __umulsidi3(uu.s.low, vv.s.low)}; DWunion w = {.ll = __umulsidi3(uu.s.low, vv.s.low)};
w.s.high += ((UWtype) uu.s.low * (UWtype) vv.s.high w.s.high += ((unsigned long) uu.s.low * (unsigned long) vv.s.high
+ (UWtype) uu.s.high * (UWtype) vv.s.low); + (unsigned long) uu.s.high * (unsigned long) vv.s.low);
return w.ll; return w.ll;
} }