1 Index: src/dct/x86_asm/fdct_mmx_skal.asm
2 ===================================================================
3 RCS file: /xvid/xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm,v
4 retrieving revision 1.6
5 retrieving revision 1.7
6 diff -u -r1.6 -r1.7
7 --- src/dct/x86_asm/fdct_mmx_skal.asm 29 Aug 2004 10:02:38 -0000 1.6
8 +++ src/dct/x86_asm/fdct_mmx_skal.asm 11 Sep 2007 12:41:13 -0000 1.7
9 @@ -378,9 +378,9 @@
10 paddd mm2, mm3 ; [ out0 | out1 ]
11 pmaddwd mm7, mm1 ; [a0.M10+a1.M11 | b0.M26+b1.M27]
12 psrad mm2, 16
13 - pmaddwd mm0, qword [%3 + 48] ; [a0.M12+a1.M13 | b0.M28+b1.M29]
14 + pmaddwd mm0, [%3 + 48] ; [a0.M12+a1.M13 | b0.M28+b1.M29]
15 paddd mm4, mm5 ; [ out2 | out3 ]
16 - pmaddwd mm1, qword [%3 + 56] ; [a0.M14+a1.M15 | b0.M30+b1.M31]
17 + pmaddwd mm1, [%3 + 56] ; [a0.M14+a1.M15 | b0.M30+b1.M31]
18 psrad mm4, 16
19
20 paddd mm6, mm7 ; [ out4 | out5 ]
21 @@ -436,9 +436,9 @@
22 paddd mm2, mm3 ; [ out0 | out1 ]
23 pmaddwd mm7, mm1 ; [a0.M10+a1.M11 | b0.M26+b1.M27]
24 psrad mm2, 16
25 - pmaddwd mm0, qword [%3 + 48] ; [a0.M12+a1.M13 | b0.M28+b1.M29]
26 + pmaddwd mm0, [%3 + 48] ; [a0.M12+a1.M13 | b0.M28+b1.M29]
27 paddd mm4, mm5 ; [ out2 | out3 ]
28 - pmaddwd mm1, qword [%3 + 56] ; [a0.M14+a1.M15 | b0.M30+b1.M31]
29 + pmaddwd mm1, [%3 + 56] ; [a0.M14+a1.M15 | b0.M30+b1.M31]
30 psrad mm4, 16
31
32 paddd mm6, mm7 ; [ out4 | out5 ]
33 Index: src/image/x86_asm/interpolate8x8_3dne.asm
34 ===================================================================
35 RCS file: /xvid/xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm,v
36 retrieving revision 1.7
37 retrieving revision 1.8
38 diff -u -r1.7 -r1.8
39 --- src/image/x86_asm/interpolate8x8_3dne.asm 13 Sep 2005 12:12:15 -0000 1.7
40 +++ src/image/x86_asm/interpolate8x8_3dne.asm 11 Sep 2007 12:41:13 -0000 1.8
41 @@ -97,7 +97,13 @@
42 %if (%1)
43 movq mm0, [eax]
44 %else
45 - movq mm0, [dword eax]
46 + movq mm0, [eax+0]
47 + ; ---
48 + ; nasm >0.99.x rejects the original statement:
49 + ; movq mm0, [dword eax]
50 + ; as it is ambiguous. for this statement nasm <0.99.x would
51 + ; generate "movq mm0,[eax+0]"
52 + ; ---
53 %endif
54 pavgb mm0, [eax+1]
55 movq mm1, [eax+edx]
56 Index: src/motion/x86_asm/sad_3dne.asm
57 ===================================================================
58 RCS file: /xvid/xvidcore/src/motion/x86_asm/sad_3dne.asm,v
59 retrieving revision 1.6
60 retrieving revision 1.7
61 diff -u -r1.6 -r1.7
62 --- src/motion/x86_asm/sad_3dne.asm 29 Aug 2004 10:02:38 -0000 1.6
63 +++ src/motion/x86_asm/sad_3dne.asm 11 Sep 2007 12:41:13 -0000 1.7
64 @@ -180,7 +180,7 @@
65 movq mm1, [eax+2*ecx+8]
66 psadbw mm3, mm4
67
68 - movq mm0, [dword eax+edx]
69 + movq mm0, [eax+edx+0]
70 psadbw mm2, mm4
71 add eax, edx
72 psadbw mm1, mm4
73 Index: src/quant/x86_asm/quantize_h263_3dne.asm
74 ===================================================================
75 RCS file: /xvid/xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm,v
76 retrieving revision 1.5
77 retrieving revision 1.6
78 diff -u -r1.5 -r1.6
79 --- src/quant/x86_asm/quantize_h263_3dne.asm 29 Aug 2004 10:02:38 -0000 1.5
80 +++ src/quant/x86_asm/quantize_h263_3dne.asm 11 Sep 2007 12:41:13 -0000 1.6
81 @@ -396,7 +396,7 @@
82
83 quant_intra1 3
84 psubw mm5, mm4 ;C8
85 - mov esi, [dword esp + 12] ; pop back the register value
86 + mov esi, [esp + 12] ; pop back the register value
87 mov edi, [esp + 4] ; pop back the register value
88 sar eax, 16
89 lea ebx, [byte eax + 1] ; workaround for eax < 0
90 @@ -755,7 +755,7 @@
91 pmaxsw mm2, mm3 ;|c| ;B4 (2nd)
92 pmullw mm2, [edi] ;*= 2Q ;B8 (3rd+)
93 psraw mm3, 15 ; sign(c) ;B7 (2nd)
94 - mov edx, [dword esp+ 4+12] ; data
95 + mov edx, [esp+ 4+12] ; data
96
97 ALIGN 8
98
99 Index: src/utils/x86_asm/mem_transfer_3dne.asm
100 ===================================================================
101 RCS file: /xvid/xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm,v
102 retrieving revision 1.7
103 retrieving revision 1.8
104 diff -u -r1.7 -r1.8
105 --- src/utils/x86_asm/mem_transfer_3dne.asm 13 Sep 2005 12:12:15 -0000 1.7
106 +++ src/utils/x86_asm/mem_transfer_3dne.asm 11 Sep 2007 12:41:13 -0000 1.8
107 @@ -254,7 +254,7 @@
108 mov eax, [esp + 8] ; Cur
109 mov ecx, [esp +12] ; Ref
110 push edi
111 - mov edx, [dword esp+4+16] ; Stride
112 + mov edx, [esp+4+16] ; Stride
113 mov edi, [esp+4+ 4] ; Dst
114 pxor mm7, mm7
115 nop
116 @@ -272,7 +272,7 @@
117 mov eax, [esp + 8] ; Cur
118 mov ecx, [esp +12] ; Ref
119 push edi
120 - mov edx, [dword esp+4+16] ; Stride
121 + mov edx, [esp+4+16] ; Stride
122 mov edi, [esp+4+ 4] ; Dst
123 pxor mm7, mm7
124 nop
125 Index: build/generic/configure.in
126 ===================================================================
127 RCS file: /xvid/xvidcore/build/generic/configure.in,v
128 retrieving revision 1.22
129 retrieving revision 1.23
130 diff -u -r1.22 -r1.23
131 --- build/generic/configure.in 21 Dec 2006 23:29:27 -0000 1.22
132 +++ build/generic/configure.in 23 Nov 2007 10:44:11 -0000 1.23
133 @@ -17,6 +17,8 @@
134
135 dnl NASM version requirement
136 minimum_nasm_patch_version=34
137 +minimum_nasm_minor_version=99
138 +minimum_nasm_major_version=2
139 nasm_prog="nasm"
140 yasm_prog="yasm"
141
142 @@ -364,14 +366,31 @@
143 dnl
144 AC_MSG_CHECKING([for nasm patch version])
145 nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
146 + nasm_minor=`$nasm_prog -v | cut -d '.' -f 2 | cut -d ' ' -f 1`
147 + nasm_major=`$nasm_prog -v | cut -d '.' -f 1 | cut -d ' ' -f 3`
148 if test -z $nasm_patch ; then
149 nasm_patch=-1
150 fi
151 + if test -z $nasm_minor ; then
152 + nasm_minor=-1
153 + fi
154 + if test -z $nasm_major ; then
155 + nasm_major=-1
156 + fi
157 AC_MSG_RESULT([$nasm_patch])
158
159 -
160 if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then
161 - AC_MSG_WARN([nasm patch version is too old])
162 + if test "$nasm_minor" -lt "$minimum_nasm_minor_version" ; then
163 + if test "$nasm_major" -lt "$minimum_nasm_major_version" ; then
164 + AC_MSG_WARN([nasm version is too old])
165 + else
166 + found_nasm_comp_prog="yes"
167 + chosen_asm_prog="$nasm_prog"
168 + fi
169 + else
170 + found_nasm_comp_prog="yes"
171 + chosen_asm_prog="$nasm_prog"
172 + fi
173 else
174 found_nasm_comp_prog="yes"
175 chosen_asm_prog="$nasm_prog"
|
