1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
|
diff -bBur MPlayer-20050413-orig/configure MPlayer-20050413/configure
--- MPlayer-20050413-orig/configure 2005-04-06 14:57:08.000000000 +0300
+++ MPlayer-20050413/configure 2005-04-14 16:20:41.000000000 +0300
@@ -604,7 +604,7 @@
cc_version="v. ?.??, bad"
cc_verc_fail=yes
;;
- 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9])
+ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.*)
_cc_major=`echo $cc_version | cut -d '.' -f 1`
_cc_minor=`echo $cc_version | cut -d '.' -f 2`
_cc_mini=`echo $cc_version | cut -d '.' -f 3`
diff -bBur MPlayer-20050413-orig/liba52/imdct.c MPlayer-20050413/liba52/imdct.c
--- MPlayer-20050413-orig/liba52/imdct.c 2005-03-23 01:27:18.000000000 +0200
+++ MPlayer-20050413/liba52/imdct.c 2005-04-14 16:48:54.000000000 +0300
@@ -937,7 +937,8 @@
/* 4-7. iterations */
for (m=3; m < 7; m++) {
two_m = (1 << m);
- two_m_plus_one = two_m<<1;
+ int two_m_plus_four=two_m<<4;
+ complex_t* buf_plus_128=buf+128;
asm volatile(
"movl %0, %%esi \n\t"
".balign 16 \n\t"
@@ -963,7 +964,7 @@
"addl %2, %%esi \n\t"
"cmpl %1, %%esi \n\t"
" jb 1b \n\t"
- :: "g" (buf), "m" (buf+128), "m" (two_m_plus_one<<3), "r" (two_m<<3),
+ :: "g" (buf), "m" (buf_plus_128), "m" (two_m_plus_four), "r" (two_m<<3),
"r" (sseW[m])
: "%esi", "%edi", "%edx"
);
diff -bBur MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c
--- MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c 2005-02-27 10:56:26.000000000 +0200
+++ MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c 2005-04-14 16:35:07.000000000 +0300
@@ -2648,6 +2648,8 @@
static always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){
int64_t dc_mask, eq_mask;
int64_t sums[10*8*2];
+ int64_t dc_and_eq_mask;
+
src+= step*3; // src points to begin of the 8x8 Block
//START_TIMER
asm volatile(
@@ -2754,8 +2756,9 @@
: "r" (src), "r" ((long)step), "m" (c->pQPb), "m"(c->ppMode.flatnessThreshold)
: "%"REG_a
);
+ dc_and_eq_mask=dc_mask & eq_mask;
- if(dc_mask & eq_mask){
+ if(dc_and_eq_mask){
long offset= -8*step;
int64_t *temp_sums= sums;
@@ -2930,7 +2933,7 @@
" js 1b \n\t"
: "+r"(offset), "+r"(temp_sums)
- : "r" ((long)step), "r"(src - offset), "m"(dc_mask & eq_mask)
+ : "r" ((long)step), "r"(src - offset), "m"(dc_and_eq_mask)
);
}else
src+= step; // src points to begin of the 8x8 Block
diff -bBur MPlayer-20050413-orig/libmpdemux/frequencies.h MPlayer-20050413/libmpdemux/frequencies.h
--- MPlayer-20050413-orig/libmpdemux/frequencies.h 2001-11-17 00:06:48.000000000 +0200
+++ MPlayer-20050413/libmpdemux/frequencies.h 2005-04-14 16:36:51.000000000 +0300
@@ -104,7 +104,7 @@
/* --------------------------------------------------------------------- */
extern struct CHANLISTS chanlists[];
-extern struct STRTAB chanlist_names[];
+/* extern struct STRTAB chanlist_names[]; */
extern int chantab;
extern struct CHANLIST *chanlist;
diff -bBur MPlayer-20050413-orig/mmx.h MPlayer-20050413/mmx.h
--- MPlayer-20050413-orig/mmx.h 2001-10-28 13:47:21.000000000 +0200
+++ MPlayer-20050413/mmx.h 2005-04-14 16:22:54.000000000 +0300
@@ -353,11 +353,11 @@
#define mmx_m2r(op, mem, reg) \
__asm__ __volatile__ (#op " %0, %%" #reg \
: /* nothing */ \
- : "X" (mem))
+ : "m" (mem))
#define mmx_r2m(op, reg, mem) \
__asm__ __volatile__ (#op " %%" #reg ", %0" \
- : "=X" (mem) \
+ : "=m" (mem) \
: /* nothing */ )
#define mmx_r2r(op, regs, regd) \
@@ -367,8 +367,8 @@
__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
#op " %1, %%mm0\n\t" \
"movq %%mm0, %0" \
- : "=X" (memd) \
- : "X" (mems))
+ : "=m" (memd) \
+ : "m" (mems))
#endif
diff -bBur MPlayer-20050413-orig/postproc/swscale_template.c MPlayer-20050413/postproc/swscale_template.c
--- MPlayer-20050413-orig/postproc/swscale_template.c 2005-02-17 01:47:00.000000000 +0200
+++ MPlayer-20050413/postproc/swscale_template.c 2005-04-14 16:46:12.000000000 +0300
@@ -2136,6 +2136,7 @@
else
{
long counter= -2*dstW;
+ uint8_t* ptr=src+filterSize;
// filter-= counter*filterSize/2;
filterPos-= counter/2;
dst-= counter/2;
@@ -2177,7 +2178,7 @@
" jnc 1b \n\t"
: "+r" (counter), "+r" (filter)
- : "m" (filterPos), "m" (dst), "m"(src+filterSize),
+ : "m" (filterPos), "m" (dst), "m"(ptr),
"m" (src), "r" ((long)filterSize*2)
: "%"REG_b, "%"REG_a, "%"REG_c
);
@@ -2320,6 +2321,8 @@
{
#endif
//NO MMX just normal asm ...
+ int xInc_hi=xInc>>16;
+ int xInc_lo=xInc&0xffff;
asm volatile(
"xor %%"REG_a", %%"REG_a" \n\t" // i
"xor %%"REG_b", %%"REG_b" \n\t" // xx
@@ -2356,7 +2359,7 @@
" jb 1b \n\t"
- :: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc>>16), "m" (xInc&0xFFFF)
+ :: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc_hi), "m" (xInc_lo)
: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
);
#ifdef HAVE_MMX2
@@ -2515,6 +2518,8 @@
else
{
#endif
+ int xInc_hi=xInc>>16;
+ int xInc_lo=xInc&0xffff;
asm volatile(
"xor %%"REG_a", %%"REG_a" \n\t" // i
"xor %%"REG_b", %%"REG_b" \n\t" // xx
@@ -2548,7 +2553,7 @@
"cmp %2, %%"REG_a" \n\t"
" jb 1b \n\t"
- :: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc>>16)), "m" ((xInc&0xFFFF)),
+ :: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc_hi)), "m" ((xInc_lo)),
"r" (src2)
: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
);
--- MPlayer-1.0pre7/libvo/aclib_template.c 2005-04-25 08:26:11.000000000 +0000
+++ MPlayer-1.0pre7.az/libvo/aclib_template.c 2005-04-25 08:26:17.000000000 +0000
@@ -249,8 +249,8 @@
MOVNTQ" %%mm6, 48(%1)\n"
MOVNTQ" %%mm7, 56(%1)\n"
:: "r" (from), "r" (to) : "memory");
- ((const unsigned char *)from)+=64;
- ((unsigned char *)to)+=64;
+ from=((const unsigned char *)from)+64;
+ to=((unsigned char *)to)+64;
}
// printf(" %d %d\n", (int)from&1023, (int)to&1023);
@@ -338,8 +338,8 @@
MOVNTQ" %%mm6, 48(%1)\n"
MOVNTQ" %%mm7, 56(%1)\n"
:: "r" (from), "r" (to) : "memory");
- ((const unsigned char *)from)+=64;
- ((unsigned char *)to)+=64;
+ from=((const unsigned char *)from)+64;
+ to=((unsigned char *)to)+64;
}
#endif /* Have SSE */
|
