From 098d708519fac8fd8842dfd2d32f977c514c7762 Mon Sep 17 00:00:00 2001 From: simonb Date: Fri, 22 Feb 2002 13:17:53 +0000 Subject: Drop the alpha-linux l3.diff.gz altogether - it only makes the previous diff much harder to read than it should be. --- audio/mpg123/patches/patch-ai | 110 ++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 69 deletions(-) (limited to 'audio/mpg123/patches') diff --git a/audio/mpg123/patches/patch-ai b/audio/mpg123/patches/patch-ai index 0ab19dfcc8b..5c250056079 100644 --- a/audio/mpg123/patches/patch-ai +++ b/audio/mpg123/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ +$NetBSD: patch-ai,v 1.3 2002/02/22 13:17:54 simonb Exp $ ---- layer3.c.orig Fri Feb 22 23:36:59 2002 +--- layer3.c.orig Thu Apr 22 01:25:18 1999 +++ layer3.c @@ -109,54 +109,54 @@ int i,j,k,l; @@ -111,49 +111,30 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } } -@@ -608,21 +608,12 @@ +@@ -608,7 +608,7 @@ * Dequantize samples (includes huffman decoding) */ /* 24 is enough because tab13 has max. a 19 bit huffvector */ --#ifdef __alpha - #define BITSHIFT ((sizeof(int)-1)*8) +-#define BITSHIFT ((sizeof(long)-1)*8) ++#define BITSHIFT ((sizeof(int)-1)*8) #define REFRESH_MASK \ while(num < BITSHIFT) { \ mask |= getbyte()<<(BITSHIFT-num); \ - num += 8; \ - part2remain -= 8; } --#else --#define BITSHIFT ((sizeof(long)-1)*8) --#define REFRESH_MASK \ -- while(num < BITSHIFT) { \ -- mask |= getbyte()<<(BITSHIFT-num); \ -- num += 8; \ -- part2remain -= 8; } --#endif - - static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, - struct gr_info_s *gr_info,int sfreq,int part2bits) -@@ -634,11 +625,7 @@ +@@ -625,7 +625,7 @@ int *me; int num=getbitoffset(); --#ifdef __alpha - int mask = (int) getbits(num)<<(BITSHIFT+8-num); --#else - long mask = (long) getbits(num)<<(BITSHIFT+8-num); --#endif ++ int mask = (int) getbits(num)<<(BITSHIFT+8-num); part2remain -= num; { -@@ -722,58 +709,50 @@ +@@ -709,50 +709,50 @@ if(x == 15 && h->linbits) { max[lwin] = cb; REFRESH_MASK; --#ifdef __alpha - x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); --#else - x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); --#endif ++ x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; mask <<= h->linbits; if(mask < 0) @@ -182,11 +163,8 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ if(y == 15 && h->linbits) { max[lwin] = cb; REFRESH_MASK; --#ifdef __alpha - y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); --#else - y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); --#endif ++ y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; mask <<= h->linbits; if(mask < 0) @@ -214,7 +192,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ xrpnt += step; } } -@@ -825,7 +804,7 @@ +@@ -804,7 +804,7 @@ mask <<= 1; } else @@ -223,7 +201,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ xrpnt += step; } } -@@ -833,8 +812,8 @@ +@@ -812,8 +812,8 @@ if(lwin < 3) { /* short band? */ while(1) { for(;mc > 0;mc--) { @@ -234,15 +212,12 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } if(m >= me) break; -@@ -904,58 +883,50 @@ +@@ -883,50 +883,50 @@ if (x == 15 && h->linbits) { max = cb; REFRESH_MASK; --#ifdef __alpha - x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); --#else - x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); --#endif ++ x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; mask <<= h->linbits; if(mask < 0) @@ -271,11 +246,8 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ if (y == 15 && h->linbits) { max = cb; REFRESH_MASK; --#ifdef __alpha - y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); --#else - y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); --#endif ++ y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; mask <<= h->linbits; if(mask < 0) @@ -303,7 +275,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } } -@@ -1003,7 +974,7 @@ +@@ -974,7 +974,7 @@ mask <<= 1; } else @@ -312,7 +284,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } } -@@ -1016,7 +987,7 @@ +@@ -987,7 +987,7 @@ num = 0; while(xrpnt < &xr[SBLIMIT][0]) @@ -321,7 +293,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ while( part2remain > 16 ) { getbits(16); /* Dismiss stuffing Bits */ -@@ -1094,8 +1065,8 @@ +@@ -1065,8 +1065,8 @@ t1 = tab1[is_p]; t2 = tab2[is_p]; for (; sb > 0; sb--,idx+=3) { real v = xr[0][idx]; @@ -332,7 +304,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } } } -@@ -1116,8 +1087,8 @@ +@@ -1087,8 +1087,8 @@ t1 = tab1[is_p]; t2 = tab2[is_p]; for ( ; sb > 0; sb--,idx+=3 ) { real v = xr[0][idx]; @@ -343,7 +315,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } } } /* end for(lwin; .. ; . ) */ -@@ -1137,8 +1108,8 @@ +@@ -1108,8 +1108,8 @@ t1 = tab1[is_p]; t2 = tab2[is_p]; for ( ; sb > 0; sb--,idx++) { real v = xr[0][idx]; @@ -354,7 +326,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } } else -@@ -1157,8 +1128,8 @@ +@@ -1128,8 +1128,8 @@ t1 = tab1[is_p]; t2 = tab2[is_p]; for ( ; sb > 0; sb--,idx++) { real v = xr[0][idx]; @@ -365,7 +337,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } } else -@@ -1172,8 +1143,8 @@ +@@ -1143,8 +1143,8 @@ for ( sb = bi->longDiff[21]; sb > 0; sb--,idx++ ) { real v = xr[0][idx]; @@ -376,7 +348,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } } } /* ... */ -@@ -1206,8 +1177,8 @@ +@@ -1177,8 +1177,8 @@ for(ss=7;ss>=0;ss--) { /* upper and lower butterfly inputs */ register real bu = *--xr2,bd = *xr1; @@ -387,7 +359,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } } } -@@ -1281,8 +1252,8 @@ +@@ -1252,8 +1252,8 @@ { real t0, t1, t2; @@ -398,7 +370,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ t3 = in[0]; t2 = t3 - t1 - t1; -@@ -1290,16 +1261,16 @@ +@@ -1261,16 +1261,16 @@ tmp[4] = t2 + t0 + t0; t3 += t1; @@ -419,7 +391,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ tmp[2] = tmp[6] = t3 - t0 - t2; tmp[0] = tmp[8] = t3 + t0 + t1; -@@ -1309,9 +1280,9 @@ +@@ -1280,9 +1280,9 @@ { real t1, t2, t3; @@ -432,7 +404,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ { real t0 = t1 + t2 + t3; -@@ -1322,7 +1293,7 @@ +@@ -1293,7 +1293,7 @@ t2 -= t3; t1 -= t3; @@ -441,7 +413,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ t1 += t3; tmp[3] += t1; -@@ -1337,35 +1308,35 @@ +@@ -1308,35 +1308,35 @@ { real t0, t1, t2, t3, t4, t5, t6, t7; @@ -487,7 +459,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ tmp[5] = t3 - t2; t4 -= t1 + t7; -@@ -1380,53 +1351,53 @@ +@@ -1351,53 +1351,53 @@ { real t0, t1, t2, t3, t4, t5, t6, t7; @@ -564,7 +536,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ { register real *out2 = o2; -@@ -1451,20 +1422,20 @@ +@@ -1422,20 +1422,20 @@ #define MACRO0(v) { \ real tmp; \ @@ -591,7 +563,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ MACRO0(v); } register const real *c = COS9; -@@ -1475,17 +1446,17 @@ +@@ -1446,17 +1446,17 @@ real ta33,ta66,tb33,tb66; @@ -617,7 +589,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ MACRO1(0); MACRO2(8); -@@ -1493,10 +1464,10 @@ +@@ -1464,10 +1464,10 @@ { real tmp1a,tmp2a,tmp1b,tmp2b; @@ -632,7 +604,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ MACRO1(1); MACRO2(7); -@@ -1504,10 +1475,10 @@ +@@ -1475,10 +1475,10 @@ { real tmp1a,tmp2a,tmp1b,tmp2b; @@ -647,7 +619,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ MACRO1(2); MACRO2(6); -@@ -1515,10 +1486,10 @@ +@@ -1486,10 +1486,10 @@ { real tmp1a,tmp2a,tmp1b,tmp2b; @@ -662,7 +634,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ MACRO1(3); MACRO2(5); -@@ -1527,7 +1498,7 @@ +@@ -1498,7 +1498,7 @@ { real sum0,sum1; sum0 = in[2*0+0] - in[2*2+0] + in[2*4+0] - in[2*6+0] + in[2*8+0]; @@ -671,7 +643,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ MACRO0(4); } } -@@ -1551,19 +1522,19 @@ +@@ -1522,19 +1522,19 @@ \ in5 += in3; in3 += in1; \ \ @@ -697,7 +669,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ \ in3 = in4 + in5; \ in4 -= in5; \ -@@ -1583,27 +1554,27 @@ +@@ -1554,27 +1554,27 @@ { real tmp0,tmp1 = (in0 - in4); { @@ -739,7 +711,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } in++; -@@ -1617,27 +1588,27 @@ +@@ -1588,27 +1588,27 @@ { real tmp0,tmp1 = (in0 - in4); { @@ -781,7 +753,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } in++; -@@ -1652,27 +1623,27 @@ +@@ -1623,27 +1623,27 @@ { real tmp0,tmp1 = (in0 - in4); { @@ -823,7 +795,7 @@ $NetBSD: patch-ai,v 1.2 2002/02/22 12:52:04 simonb Exp $ } } -@@ -1722,7 +1693,7 @@ +@@ -1693,7 +1693,7 @@ int i; for(i=0;i