RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix operator spr change ARM code bugs

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@694 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-05-20 22:14:42 +00:00
parent 55ad2080c3
commit e54507e856
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pico/draw_arm.s
View file

@ -206,12 +206,12 @@
cmp r4, #0xe cmp r4, #0xe
ldrgeb r4, [r1,#\ofs] ldrgeb r4, [r1,#\ofs]
orrlt r4, r3, r4 orrlt r4, r3, r4
orrge r4, r3, #0x80 orrge r4, r4, #0x80
strb r4, [r1,#\ofs] strb r4, [r1,#\ofs]
0: 0:
.endm .endm
.macro TileFlipSh_noop .macro TileFlipSh_markop
TileDoShGenPixel_markop 16, 0 @ #0x000f0000 TileDoShGenPixel_markop 16, 0 @ #0x000f0000
TileDoShGenPixel_markop 20, 1 @ #0x00f00000 TileDoShGenPixel_markop 20, 1 @ #0x00f00000
TileDoShGenPixel_markop 24, 2 @ #0x0f000000 TileDoShGenPixel_markop 24, 2 @ #0x0f000000
@ -222,7 +222,7 @@
TileDoShGenPixel_markop 12, 7 @ #0x0000f000 TileDoShGenPixel_markop 12, 7 @ #0x0000f000
.endm .endm
.macro TileNormSh_noop .macro TileNormSh_markop
TileDoShGenPixel_markop 12, 0 @ #0x0000f000 TileDoShGenPixel_markop 12, 0 @ #0x0000f000
TileDoShGenPixel_markop 8, 1 @ #0x00000f00 TileDoShGenPixel_markop 8, 1 @ #0x00000f00
TileDoShGenPixel_markop 4, 2 @ #0x000000f0 TileDoShGenPixel_markop 4, 2 @ #0x000000f0
@ -991,7 +991,7 @@ DrawSpriteSHi:
orr r9, r9, r4, lsl #16 orr r9, r9, r4, lsl #16
orr r9, r9, #0x90000000 @ r9=scc1 ???? ... <code> (s=shadow/hilight, cc=pal) orr r9, r9, #0x90000000 @ r9=scc1 ???? ... <code> (s=shadow/hilight, cc=pal)
cmp r12,r9, lsr #28 @ sh/hi with pal3? cmp r12,r9, lsr #28 @ sh/hi with pal3?
cmpne r3, #1 @ if not, is ir hi prio? cmpne r3, #1 @ if not, is it hi prio?
bne DrawSpriteSHi @ non-operator low sprite, already drawn bne DrawSpriteSHi @ non-operator low sprite, already drawn
ldr r3, [r0] @ sprite[0] ldr r3, [r0] @ sprite[0]
@ -1089,7 +1089,7 @@ DrawSpriteSHi:
tst r9, #0x0800 tst r9, #0x0800
bne .dsprShi_TileFlip_sh bne .dsprShi_TileFlip_sh
@ (r1=pdest, r2=pixels8, r3=pal) r4: scratch, r12: helper pattern @ (r1=pdest, r2=pixels8, r3=pal) r4, r7: scratch, r12: helper pattern
.dsprShi_TileNorm_sh: .dsprShi_TileNorm_sh:
TileNormSh TileNormSh
b .dsprShi_loop b .dsprShi_loop
@ -1271,7 +1271,7 @@ DrawSprite: @ was: unsigned int *sprite, int sh, int acc_sprites
.dspr_singlec_sh: .dspr_singlec_sh:
cmp r2, #0xe0000000 cmp r2, #0xe0000000
bcs .dspr_loop @ operator tileline, ignore bcs .dspr_TileNorm_sh @ op. tileline, markop. XXX: maybe add a spec. handler?
.dspr_SingleColor: .dspr_SingleColor:
and r4, r2, #0xf and r4, r2, #0xf
@ -1295,11 +1295,11 @@ DrawSprite: @ was: unsigned int *sprite, int sh, int acc_sprites
@ (r1=pdest, r2=pixels8, r3=pal) r4: scratch, r12: helper pattern @ (r1=pdest, r2=pixels8, r3=pal) r4: scratch, r12: helper pattern
.dspr_TileNorm_sh: .dspr_TileNorm_sh:
TileNormSh_noop TileNormSh_markop
b .dspr_loop b .dspr_loop
.dspr_TileFlip_sh: .dspr_TileFlip_sh:
TileFlipSh_noop TileFlipSh_markop
b .dspr_loop b .dspr_loop