[MPlayer-dev-eng] [PATCH] real->short for mp3lib

[Zuxy Meng]

Hi,

These parameters are actually used as pointers to short integers (as
operands of 'movw'), not floats. The declarations are therefore
misleading.

-- 
Zuxy
Beauty is truth,
While truth is beauty.
PGP KeyID: E8555ED6
-------------- next part --------------
Index: mp3lib/dct64_3dnow.c
===================================================================
--- mp3lib/dct64_3dnow.c	?????? 23452??
+++ mp3lib/dct64_3dnow.c	????????????
@@ -15,7 +15,7 @@
 static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
 static float attribute_used plus_1f = 1.0;
 
-void dct64_MMX_3dnow(real *a,real *b,real *c)
+void dct64_MMX_3dnow(short *a,short *b,real *c)
 {
   char tmp[256];
     __asm __volatile(
Index: mp3lib/dct64_sse.c
===================================================================
--- mp3lib/dct64_sse.c	?????? 23452??
+++ mp3lib/dct64_sse.c	????????????
@@ -30,15 +18,12 @@
 static const int nnnn[4] __attribute__((aligned(16))) =
 { 1 << 31, 1 << 31, 1 << 31, 1 << 31 };
 
-void dct64_sse(real *a,real *b,real *c)
+void dct64_sse(short *out0,short *out1,real *c)
 {
     static real __attribute__ ((aligned(16))) b1[0x20];
     static real __attribute__ ((aligned(16))) b2[0x20];
     static real const one = 1.f;
 
-    short *out0 = (short*)a;
-    short *out1 = (short*)b;
-
     {
         real *costab = costab_mmx;
         int i;
@@ -428,7 +413,7 @@
         "fistp 416(%4)\n\t"
         ".byte 0xdf, 0xc0\n\t" // ffreep %%st(0)
         :
-        :"m"(costab_mmx[30]), "r"(b1), "r"(b2), "r"(a), "r"(b)
+        :"m"(costab_mmx[30]), "r"(b1), "r"(b2), "r"(out0), "r"(out1)
         :"memory"
         );
 #endif
Index: mp3lib/sr1.c
===================================================================
--- mp3lib/sr1.c	?????? 23452??
+++ mp3lib/sr1.c	????????????
@@ -393,11 +392,11 @@
 /******************************************************************************/
 
 /* It's hidden from gcc in assembler */
-extern void dct64_MMX(real *, real *, real *);
-extern void dct64_MMX_3dnow(real *, real *, real *);
-extern void dct64_MMX_3dnowex(real *, real *, real *);
-extern void dct64_sse(real *, real *, real *);
-void (*dct64_MMX_func)(real *, real *, real *);
+extern void dct64_MMX(short *, short *, real *);
+extern void dct64_MMX_3dnow(short *, short *, real *);
+extern void dct64_MMX_3dnowex(short *, short *, real *);
+extern void dct64_sse(short *, short *, real *);
+void (*dct64_MMX_func)(short *, short *, real *);
 
 #include "cpudetect.h"
 
Index: mp3lib/dct64_MMX.c
===================================================================
--- mp3lib/dct64_MMX.c	?????? 23452??
+++ mp3lib/dct64_MMX.c	????????????
@@ -6,7 +6,7 @@
 #include "mangle.h"
 #define real float /* ugly - but only way */
 
-void dct64_MMX(real *a,real *b,real *c)
+void dct64_MMX(short *a,short *b,real *c)
 {
     char tmp[256];
     __asm __volatile(
Index: mp3lib/dct64_k7.c
===================================================================
--- mp3lib/dct64_k7.c	?????? 23452??
+++ mp3lib/dct64_k7.c	????????????
@@ -15,7 +15,7 @@
 static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
 static float attribute_used plus_1f = 1.0;
 
-void dct64_MMX_3dnowex(real *a,real *b,real *c)
+void dct64_MMX_3dnowex(short *a,short *b,real *c)
 {
   char tmp[256];
     __asm __volatile(