Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a671de08 authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: lib: Remove helper macros 



Remove these gcc types and use standard types.

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent c0d997fb

arch/microblaze/lib/muldi3.c

+12 −16
Original line number Diff line number Diff line
@@ -2,32 +2,28 @@ 


#include "libgcc.h"



#define DWtype long long

#define UWtype unsigned long

#define UHWtype unsigned short



#define W_TYPE_SIZE 32



#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2))

#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1))

#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2))

#define __ll_B ((unsigned long) 1 << (W_TYPE_SIZE / 2))

#define __ll_lowpart(t) ((unsigned long) (t) & (__ll_B - 1))

#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 !defined(umul_ppmm)

#define umul_ppmm(w1, w0, u, v)						\

	do {								\

		UWtype __x0, __x1, __x2, __x3;				\

		UHWtype __ul, __vl, __uh, __vh;				\

		unsigned long __x0, __x1, __x2, __x3;			\

		unsigned short __ul, __vl, __uh, __vh;			\

									\

		__ul = __ll_lowpart(u);					\

		__uh = __ll_highpart(u);				\

		__vl = __ll_lowpart(v);					\

		__vh = __ll_highpart(v);				\

									\

		__x0 = (UWtype) __ul * __vl;				\

		__x1 = (UWtype) __ul * __vh;				\

		__x2 = (UWtype) __uh * __vl;				\

		__x3 = (UWtype) __uh * __vh;				\

		__x0 = (unsigned long) __ul * __vl;			\

		__x1 = (unsigned long) __ul * __vh;			\

		__x2 = (unsigned long) __uh * __vl;			\

		__x3 = (unsigned long) __uh * __vh;			\

									\

		__x1 += __ll_highpart(__x0); /* this can't give carry */\

		__x1 += __x2; /* but this indeed can */			\
@@ -47,14 +43,14 @@ 
	})

#endif



DWtype __muldi3(DWtype u, DWtype v)

long long __muldi3(long long u, long long v)

{

	const DWunion uu = {.ll = u};

	const DWunion vv = {.ll = v};

	DWunion w = {.ll = __umulsidi3(uu.s.low, vv.s.low)};



	w.s.high += ((UWtype) uu.s.low * (UWtype) vv.s.high

		+ (UWtype) uu.s.high * (UWtype) vv.s.low);

	w.s.high += ((unsigned long) uu.s.low * (unsigned long) vv.s.high

		+ (unsigned long) uu.s.high * (unsigned long) vv.s.low);



	return w.ll;

}