summaryrefslogtreecommitdiff
path: root/src/compression/widemuldiv.c
diff options
context:
space:
mode:
authorMagnus Lundborg <lundborg.magnus@gmail.com>2013-10-21 07:31:05 (GMT)
committerMagnus Lundborg <lundborg.magnus@gmail.com>2013-10-21 07:31:05 (GMT)
commitbeaa92cb293a4147aef8ed03027500804535ed96 (patch)
treec8427746983418476a99b5c61847e0b4eeca5f1d /src/compression/widemuldiv.c
parent885f2782f9f48b69bc229612b0734b4de48b890b (diff)
Fixed compiler warnings and linking errors in MSVC.
Changed tabs to spaces in tng_compression functions.
Diffstat (limited to 'src/compression/widemuldiv.c')
-rw-r--r--src/compression/widemuldiv.c70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/compression/widemuldiv.c b/src/compression/widemuldiv.c
index dfc88b5..44d4adb 100644
--- a/src/compression/widemuldiv.c
+++ b/src/compression/widemuldiv.c
@@ -38,9 +38,9 @@ void Ptngc_widemul(unsigned int i1, unsigned int i2, unsigned int *ohi, unsigned
{
#if defined(TRAJNG_X86_GCC_INLINE_MULDIV)
__asm__ __volatile__ ("mull %%edx\n\t"
- : "=a" (i1), "=d" (i2)
- : "a" (i1),"d" (i2)
- : "cc");
+ : "=a" (i1), "=d" (i2)
+ : "a" (i1),"d" (i2)
+ : "cc");
*ohi=i2;
*olo=i1;
#else /* TRAJNG X86 GCC INLINE MULDIV */
@@ -56,7 +56,7 @@ void Ptngc_widemul(unsigned int i1, unsigned int i2, unsigned int *ohi, unsigned
unsigned int a_U,a_L; /* upper and lower half of a */
unsigned int b_U,b_L; /* upper and lower half of b */
-
+
unsigned int x_UU,x_UL,x_LU,x_LL; /* temporary storage. */
unsigned int x,x_U,x_L; /* temporary storage. */
@@ -70,11 +70,11 @@ void Ptngc_widemul(unsigned int i1, unsigned int i2, unsigned int *ohi, unsigned
x=a_L*b_L;
x_LL=x & L_m;
x_LU=x>>bits;
-
+
x=a_U*b_L;
x_LU+=x & L_m;
x_UL=x>>bits;
-
+
x=a_L*b_U;
x_LU+=x & L_m;
x_UL+=x>>bits;
@@ -105,9 +105,9 @@ void Ptngc_widediv(unsigned int hi, unsigned int lo, unsigned int i, unsigned in
{
#if defined(TRAJNG_X86_GCC_INLINE_MULDIV)
__asm__ __volatile__ ("divl %%ecx\n\t"
- : "=a" (lo), "=d" (hi)
- : "a" (lo),"d" (hi), "c" (i)
- : "cc");
+ : "=a" (lo), "=d" (hi)
+ : "a" (lo),"d" (hi), "c" (i)
+ : "cc");
*result=lo;
*remainder=hi;
#else /* TRAJNG X86 GCC INLINE MULDIV */
@@ -126,7 +126,7 @@ void Ptngc_widediv(unsigned int hi, unsigned int lo, unsigned int i, unsigned in
unsigned int hibit=bits2-1U;
unsigned int hibit_mask=1U<<hibit;
unsigned int allbits=(hibit_mask-1U)|hibit_mask;
-
+
/* Do division. */
rmask=hibit_mask;
res=0;
@@ -135,26 +135,26 @@ void Ptngc_widediv(unsigned int hi, unsigned int lo, unsigned int i, unsigned in
while (rmask)
{
if ((s_U<hi) || ((s_U==hi) && (s_L<=lo)))
- {
- /* Subtract */
- hi-=s_U;
- if (s_L>lo)
- {
- unsigned int t;
- hi--; /* Borrow */
- t=allbits-s_L;
- lo+=t+1;
- }
- else
- lo-=s_L;
-
- /* Set bit. */
- res|=rmask;
- }
+ {
+ /* Subtract */
+ hi-=s_U;
+ if (s_L>lo)
+ {
+ unsigned int t;
+ hi--; /* Borrow */
+ t=allbits-s_L;
+ lo+=t+1;
+ }
+ else
+ lo-=s_L;
+
+ /* Set bit. */
+ res|=rmask;
+ }
rmask>>=1;
s_L>>=1;
if (s_U & 1U)
- s_L|=hibit_mask;
+ s_L|=hibit_mask;
s_U>>=1;
}
*remainder=lo;
@@ -179,7 +179,7 @@ static void largeint_add_gen(unsigned int v1, unsigned int *largeint, int n, int
v2=(largeint[j]+carry)&0xFFFFFFFFU;
carry=0;
if ((((unsigned int)-1)&0xFFFFFFFFU) -1<largeint[j])
- carry=1;
+ carry=1;
largeint[j]=v2;
j++;
}
@@ -200,13 +200,13 @@ void Ptngc_largeint_mul(unsigned int v1, unsigned int *largeint_in, unsigned int
for (i=0; i<n; i++)
{
if (largeint_in[i]!=0U)
- {
- unsigned int lo,hi;
- Ptngc_widemul(v1,largeint_in[i],&hi,&lo); /* 32x32->64 mul */
- largeint_add_gen(lo,largeint_out,n,i);
- if (i+1<n)
- largeint_add_gen(hi,largeint_out,n,i+1);
- }
+ {
+ unsigned int lo,hi;
+ Ptngc_widemul(v1,largeint_in[i],&hi,&lo); /* 32x32->64 mul */
+ largeint_add_gen(lo,largeint_out,n,i);
+ if (i+1<n)
+ largeint_add_gen(hi,largeint_out,n,i+1);
+ }
}
}
contact: Jan Huwald // Impressum