[Scummvm-cvs-logs] SF.net SVN: scummvm:[36034] scummvm/trunk/graphics/scaler
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Jan 24 07:26:43 CET 2009
Revision: 36034
http://scummvm.svn.sourceforge.net/scummvm/?rev=36034&view=rev
Author: fingolfin
Date: 2009-01-24 06:26:43 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
Moved 565 mode specific bits of HQ2x/HQ3x asm to 'variables'
Modified Paths:
--------------
scummvm/trunk/graphics/scaler/hq2x_i386.asm
scummvm/trunk/graphics/scaler/hq3x_i386.asm
Modified: scummvm/trunk/graphics/scaler/hq2x_i386.asm
===================================================================
--- scummvm/trunk/graphics/scaler/hq2x_i386.asm 2009-01-24 06:06:45 UTC (rev 36033)
+++ scummvm/trunk/graphics/scaler/hq2x_i386.asm 2009-01-24 06:26:43 UTC (rev 36034)
@@ -49,7 +49,8 @@
threshold dd 0x00300706,0x00000000
; FIXME: zerlowbits assumes 565 mode.
; Also, in the code, the constant 0x0821 is used which also assumes 565 mode
-zerolowbits dd 0xF7DEF7DE
+highbits dd 0xF7DEF7DE
+lowbits dd 0x0821
moduloSrc dd 0
moduloDst dd 0
@@ -136,12 +137,12 @@
mov ecx,%3
cmp edx,ecx
je %%fin
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
- and ecx,[zerolowbits]
+ add ecx,[lowbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
%%fin:
@@ -155,17 +156,17 @@
mov ecx,%4
cmp edx,ecx
je %%fin1
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
+ add ecx,[lowbits]
%%fin1:
mov edx,%2
cmp edx,ecx
je %%fin2
- and ecx,[zerolowbits]
- and edx,[zerolowbits]
+ and ecx,[highbits]
+ and edx,[highbits]
add edx,ecx
shr edx,1
%%fin2:
@@ -179,8 +180,8 @@
mov ecx,%3
cmp edx,ecx
je %%fin
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
%%fin:
@@ -1728,12 +1729,12 @@
shl eax,16
or eax,edx
mov ecx,[w2]
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
- and ecx,[zerolowbits]
+ add ecx,[lowbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
mov ecx,edx
@@ -1745,12 +1746,12 @@
.. at cross2:
shl eax,16
mov ecx,[w4]
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
- and ecx,[zerolowbits]
+ add ecx,[lowbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
or eax,edx
@@ -1759,12 +1760,12 @@
jmp .loopx_end
.. at cross4:
mov ecx,[w6]
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
- and ecx,[zerolowbits]
+ add ecx,[lowbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
shl edx,16
@@ -1777,12 +1778,12 @@
shl eax,16
or eax,edx
mov ecx,[w8]
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
- and ecx,[zerolowbits]
+ add ecx,[lowbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
mov ecx,edx
Modified: scummvm/trunk/graphics/scaler/hq3x_i386.asm
===================================================================
--- scummvm/trunk/graphics/scaler/hq3x_i386.asm 2009-01-24 06:06:45 UTC (rev 36033)
+++ scummvm/trunk/graphics/scaler/hq3x_i386.asm 2009-01-24 06:26:43 UTC (rev 36034)
@@ -44,9 +44,10 @@
reg_blank dd 0,0
const7 dd 0x00070007,0x00000007
threshold dd 0x00300706,0x00000000
-zerolowbits dd 0xF7DEF7DE
; FIXME: zerlowbits assumes 565 mode.
; Also, in the code, the constant 0x0821 is used which also assumes 565 mode
+highbits dd 0xF7DEF7DE
+lowbits dd 0x0821
moduloSrc dd 0
moduloDst dd 0
@@ -133,12 +134,12 @@
mov ecx,%3
cmp edx,ecx
je %%fin
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
- and ecx,[zerolowbits]
+ add ecx,[lowbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
%%fin:
@@ -152,17 +153,17 @@
mov ecx,%4
cmp edx,ecx
je %%fin1
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
+ add ecx,[lowbits]
%%fin1:
mov edx,%2
cmp edx,ecx
je %%fin2
- and ecx,[zerolowbits]
- and edx,[zerolowbits]
+ and ecx,[highbits]
+ and edx,[highbits]
add edx,ecx
shr edx,1
%%fin2:
@@ -223,8 +224,8 @@
mov ecx,%3
cmp edx,ecx
je %%fin
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
%%fin:
@@ -2302,12 +2303,12 @@
shl eax,16
or eax,edx
mov ecx,[w2]
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
- and ecx,[zerolowbits]
+ add ecx,[lowbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
mov [edi],dx
@@ -2323,12 +2324,12 @@
shl eax,16
or eax,edx
mov ecx,[w4]
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
- and ecx,[zerolowbits]
+ add ecx,[lowbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
mov [edi],dx
@@ -2343,12 +2344,12 @@
shl eax,16
or eax,edx
mov ecx,[w6]
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
- and ecx,[zerolowbits]
+ add ecx,[lowbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
mov [edi],eax
@@ -2363,12 +2364,12 @@
shl eax,16
or eax,edx
mov ecx,[w8]
- and edx,[zerolowbits]
- and ecx,[zerolowbits]
+ and edx,[highbits]
+ and ecx,[highbits]
add ecx,edx
shr ecx,1
- add ecx,0x0821
- and ecx,[zerolowbits]
+ add ecx,[lowbits]
+ and ecx,[highbits]
add edx,ecx
shr edx,1
mov [edi],eax
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list