summaryrefslogtreecommitdiff
blob: 9e633b85c5ff201525dfd2c51ac161778203fb20 (plain)
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
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
--- ./camstream/video/video_asm.S.old	2004-04-17 18:22:08.977932552 +0100
+++ ./camstream/video/video_asm.S	2004-04-17 18:23:37.614457752 +0100
@@ -17,52 +17,52 @@
 	
 ENTRY(calc_diff128)
 	enter $0, $0
-	push %ebx
-	push %esi
-	push %edi
-	
-	mov Number, %ecx	# number of pixels
-	mov Dst, %edi		# destination
-	mov Src1, %esi		# src_new
-	mov Src2, %ebx		# src_old
+	push %rbx
+	push %rsi
+	push %rdi
+	
+	mov Number, %rcx	# number of pixels
+	mov Dst, %rdi		# destination
+	mov Src1, %rsi		# src_new
+	mov Src2, %rbx		# src_old
 	
 0:	lodsb			# load byte
-	mov (%ebx), %ah		# load second byte
+	mov (%rbx), %ah		# load second byte
 	shr $1, %al		# /2 by shift-right both values
 	shr $1, %ah
 	sub %ah, %al		# substract old value
 	add $128, %al		# add virtual 0-point
 	stosb
-	inc %ebx
+	inc %rbx
 	loop 0b
 
-9:	pop %edi
-	pop %esi
-	pop %ebx
+9:	pop %rdi
+	pop %rsi
+	pop %rbx
 	leave
 	ret
 	
 
 ENTRY(calc_diff128_mmx)
 	enter $0, $0
-	push %ebx
-	push %esi
-	push %edi
-	
-	mov Number, %ecx	# number of pixels
-	mov Dst, %edi		# destination
-	mov Src1, %esi		# src_new
-	mov Src2, %ebx		# src_old
+	push %rbx
+	push %rsi
+	push %rdi
+	
+	mov Number, %rcx	# number of pixels
+	mov Dst, %rdi		# destination
+	mov Src1, %rsi		# src_new
+	mov Src2, %rbx		# src_old
 
-	shr $2, %ecx		# MMX uses 4 bytes in a row; too bad MMX 
+	shr $2, %rcx		# MMX uses 4 bytes in a row; too bad MMX 
 				# doesnt have carry-bits or shift-right byte, 
 				# or we could have grabbed 8 bytes in a row
 	movq mm_128w, %mm7
 	
-0:	movd (%esi), %mm0	# 00 00 00 00 b3 b2 b1 b0
+0:	movd (%rsi), %mm0	# 00 00 00 00 b3 b2 b1 b0
 	punpcklbw mm_0, %mm0	# 00 b3 00 b2 00 b1 00 b0
 	
-	movd (%ebx), %mm1	# 00 00 00 00 c3 c2 c1 c0
+	movd (%rbx), %mm1	# 00 00 00 00 c3 c2 c1 c0
 	punpcklbw mm_0, %mm1	# 00 c3 00 c2 00 c1 00 c0
 
 	psraw $1, %mm0		# shift, then substract; this eliminates a
@@ -71,17 +71,17 @@
 	psubw %mm1, %mm0	# subtract
 	paddw %mm7, %mm0	# add virtual 0-point
 	packuswb mm_0, %mm0	# pack, unsigned saturation 00 00 00 00 d3 d2 d1 d0
-	movd %mm0, (%edi)	# store
+	movd %mm0, (%rdi)	# store
 
-	add $4, %ebx
-	add $4, %esi
-	add $4, %edi
+	add $4, %rbx
+	add $4, %rsi
+	add $4, %rdi
 	loop 0b
 
 9:	emms			# empty MMX state
-	pop %edi
-	pop %esi
-	pop %ebx
+	pop %rdi
+	pop %rsi
+	pop %rbx
 	leave
 	ret
 	
@@ -89,24 +89,24 @@
 # calc_intg: perform Integrator step, that is, add a buffer to another
 ENTRY(calc_intg128)
 	enter $0, $0
-	push %ebx
-	push %esi
-	push %edi
-	
-	mov  8(%ebp), %ecx	# number of pixels
-	mov 12(%ebp), %edi	# destination
-	mov 16(%ebp), %esi	# 2nd buffer
+	push %rbx
+	push %rsi
+	push %rdi
+	
+	mov  8(%rbp), %rcx	# number of pixels
+	mov 12(%rbp), %rdi	# destination
+	mov 16(%rbp), %rsi	# 2nd buffer
 
 0:	lodsb
 	sub $128, %al		# s - 128
 	shl $1, %al		# *2
-	add %al, (%edi)		# add to destination
-	inc %edi
+	add %al, (%rdi)		# add to destination
+	inc %rdi
 	loop 0b
 	
-9:	pop %edi
-	pop %esi
-	pop %ebx
+9:	pop %rdi
+	pop %rsi
+	pop %rbx
 	leave
 	ret
 
@@ -116,36 +116,36 @@
 # Perform Integrator step with MMX instructions
 ENTRY(calc_intg128_smx)
 	enter $0, $0
-	push %ebx
-	push %esi
-	push %edi
-	
-	mov  8(%ebp), %ecx	# number of pixels
-	mov 12(%ebp), %edi	# destination
-	mov 16(%ebp), %esi	# 2nd buffer
-	shr $2, %ecx		# divide by 4 (again, we must use word operands)
+	push %rbx
+	push %rsi
+	push %rdi
+	
+	mov  8(%rbp), %rcx	# number of pixels
+	mov 12(%rbp), %rdi	# destination
+	mov 16(%rbp), %rsi	# 2nd buffer
+	shr $2, %rcx		# divide by 4 (again, we must use word operands)
 	
 	movq mm_128w, %mm7	# load constant
 
 				# The following instructions are hopefully mixed
 				#  to optimize execution
-0:	movd (%edi), %mm0	# 00 00 00 00 b3 b2 b1 b0
+0:	movd (%rdi), %mm0	# 00 00 00 00 b3 b2 b1 b0
 	punpcklbw mm_0, %mm0	# 00 b3 00 b2 00 b1 00 b0
-	movd (%esi), %mm1	# 00 00 00 00 c3 c2 c1 c0
+	movd (%rsi), %mm1	# 00 00 00 00 c3 c2 c1 c0
 	punpcklbw mm_0, %mm1	# 00 c3 00 c2 00 c1 00 c0
-	add $4, %esi		# keep CPU busy
+	add $4, %rsi		# keep CPU busy
 	psubw %mm7, %mm1	# src - 128
 	psllw $1, %mm1		# * 2
 	paddw %mm1, %mm0	# dst += src
 	packuswb mm_0, %mm0	# pack, unsigned saturation 00 00 00 00 d3 d2 d1 d0
-	movd %mm0, (%edi)	# store back
-	add $4, %edi
+	movd %mm0, (%rdi)	# store back
+	add $4, %rdi
 	loop 0b
 		
 9:	emms			# clear MMX state
-	pop %edi
-	pop %esi
-	pop %ebx
+	pop %rdi
+	pop %rsi
+	pop %rbx
 	leave
 	ret
 
--- ./camstream/video/video_asm_add.S.old	2004-04-17 18:22:17.121694512 +0100
+++ ./camstream/video/video_asm_add.S	2004-04-17 18:23:54.272925280 +0100
@@ -4,102 +4,102 @@
 
 ENTRY(calc_add)
 	enter $0, $0
-	push %ebx
-	push %esi
-	push %edi
-
-	mov Number, %ecx
-	mov Dst, %edi
-	mov Src1, %esi
+	push %rbx
+	push %rsi
+	push %rdi
+
+	mov Number, %rcx
+	mov Dst, %rdi
+	mov Src1, %rsi
 
 0:	lodsb
-	add %al, (%edi)
-	inc %edi
+	add %al, (%rdi)
+	inc %rdi
 	loop 0b
 
-9:	pop %edi
-	pop %esi
-	pop %ebx
+9:	pop %rdi
+	pop %rsi
+	pop %rbx
 	leave
 	ret
 
 ENTRY(calc_add_mmx)
 	enter $0, $0
-	push %ebx
-	push %esi
-	push %edi
-
-	mov Number, %ecx
-	mov Dst, %edi
-	mov Src1, %esi
+	push %rbx
+	push %rsi
+	push %rdi
+
+	mov Number, %rcx
+	mov Dst, %rdi
+	mov Src1, %rsi
 	
-	shr $3, %ecx		# Divide by 8 (!)
+	shr $3, %rcx		# Divide by 8 (!)
 
-0:	movq (%esi), %mm0
-	add $8, %esi
-	movq (%edi), %mm1
+0:	movq (%rsi), %mm0
+	add $8, %rsi
+	movq (%rdi), %mm1
 	paddb %mm1, %mm0	# add, with overflow
-	movq %mm0, (%edi)
-	add $8, %edi
+	movq %mm0, (%rdi)
+	add $8, %rdi
 	loop 0
 
-9:	pop %edi
-	pop %esi
-	pop %ebx
+9:	pop %rdi
+	pop %rsi
+	pop %rbx
 	leave
 	ret
 
 
 ENTRY(calc_add_mmxs)
 	enter $0, $0
-	push %ebx
-	push %esi
-	push %edi
-
-	mov Number, %ecx
-	mov Dst, %edi
-	mov Src1, %esi
+	push %rbx
+	push %rsi
+	push %rdi
+
+	mov Number, %rcx
+	mov Dst, %rdi
+	mov Src1, %rsi
 	
-	shr $3, %ecx		# Divide by 8 (!)
+	shr $3, %rcx		# Divide by 8 (!)
 
-0:	movq (%esi), %mm0
-	add $8, %esi
-	movq (%edi), %mm1
+0:	movq (%rsi), %mm0
+	add $8, %rsi
+	movq (%rdi), %mm1
 	paddsb %mm1, %mm0	# add, with saturation
-	movq %mm0, (%edi)
-	add $8, %edi
+	movq %mm0, (%rdi)
+	add $8, %rdi
 	loop 0
 
-9:	pop %edi
-	pop %esi
-	pop %ebx
+9:	pop %rdi
+	pop %rsi
+	pop %rbx
 	leave
 	ret
 
 ENTRY(calc_add128_mmx)
 	enter $0, $0
-	push %ebx
-	push %esi
-	push %edi
-
-	mov Number, %ecx
-	mov Dst, %edi
-	mov Src1, %esi
+	push %rbx
+	push %rsi
+	push %rdi
+
+	mov Number, %rcx
+	mov Dst, %rdi
+	mov Src1, %rsi
 	
-	shr $3, %ecx		# Divide by 8 (!)
+	shr $3, %rcx		# Divide by 8 (!)
 	movq mm_128b, %mm7	# load constant
 
-0:	movq (%esi), %mm0
-	add $8, %esi
+0:	movq (%rsi), %mm0
+	add $8, %rsi
 	psubb %mm7, %mm0	# compensate null-point
-	movq (%edi), %mm1
+	movq (%rdi), %mm1
 	paddb %mm1, %mm0	# add, with overflow
-	movq %mm0, (%edi)
-	add $8, %edi
+	movq %mm0, (%rdi)
+	add $8, %rdi
 	loop 0
 
-9:	pop %edi
-	pop %esi
-	pop %ebx
+9:	pop %rdi
+	pop %rsi
+	pop %rbx
 	leave
 	ret
--- ./camstream/video/video_def.h.old	2004-04-17 18:22:25.357442488 +0100
+++ ./camstream/video/video_def.h	2004-04-17 18:24:14.037920544 +0100
@@ -1,8 +1,8 @@
 #define __ASSEMBLY__
 #include <linux/linkage.h>
 
-#define Number 8(%ebp)
-#define Dst    12(%ebp)
-#define Src1   16(%ebp)
-#define Src2   20(%ebp)
+#define Number 8(%rbp)
+#define Dst    12(%rbp)
+#define Src1   16(%rbp)
+#define Src2   20(%rbp)