notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
32x: drc: new smc handling, write handlers adjusted.
[picodrive.git]
/
platform
/
gizmondo
/
asm_utils.s
diff --git
a/platform/gizmondo/asm_utils.s
b/platform/gizmondo/asm_utils.s
index
91e5710
..
1cee30e
100644
(file)
--- a/
platform/gizmondo/asm_utils.s
+++ b/
platform/gizmondo/asm_utils.s
@@
-1,23
+1,31
@@
@ vim:filetype=armasm
@ vim:filetype=armasm
-.global vidCpy8to16 @ void *dest, void *src, short *pal, int lines|(is32col<<8)
+.global vidCpy8to16 @ void *dest, void *src, short *pal, int lines|(flags<<16),
+ @ flags=is32col[0], no_even_lines[1], no_odd_lines[2]
vidCpy8to16:
stmfd sp!, {r4-r8,lr}
vidCpy8to16:
stmfd sp!, {r4-r8,lr}
-
tst r3, #0x1
00
+
and r4, r3, #0xff00
00
and r3, r3, #0xff
and r3, r3, #0xff
+ tst r4, #0x10000
mov r3, r3, lsr #1
orr r3, r3, r3, lsl #8
orreq r3, r3, #(320/8-1)<<24 @ 40 col mode
orrne r3, r3, #(256/8-1)<<24 @ 32 col mode
mov r3, r3, lsr #1
orr r3, r3, r3, lsl #8
orreq r3, r3, #(320/8-1)<<24 @ 40 col mode
orrne r3, r3, #(256/8-1)<<24 @ 32 col mode
- orrne r3, r3, #0x10000
addne r0, r0, #32*2
addne r0, r0, #32*2
+ orr r3, r3, r4
add r1, r1, #8
mov lr, #0xff
mov lr, lr, lsl #1
add r1, r1, #8
mov lr, #0xff
mov lr, lr, lsl #1
+ @ no even lines?
+ tst r3, #0x20000
+ addne r0, r0, #320*2
+ addne r1, r1, #328
+ bne vcloop_odd
+
@ even lines first
vcloop_aligned:
ldr r12, [r1], #4
@ even lines first
vcloop_aligned:
ldr r12, [r1], #4
@@
-62,6
+70,10
@@
vcloop_aligned:
tst r3, #0xff
bne vcloop_aligned
tst r3, #0xff
bne vcloop_aligned
+ @ no odd lines?
+ tst r3, #0x40000
+ ldmnefd sp!, {r4-r8,pc}
+
and r4, r3, #0xff00
orr r3, r3, r4, lsr #8
mov r4, r4, lsr #7
and r4, r3, #0xff00
orr r3, r3, r4, lsr #8
mov r4, r4, lsr #7
@@
-75,6
+87,7
@@
vcloop_aligned:
sub r1, r1, r4
sub r0, r0, #2
sub r1, r1, r4
sub r0, r0, #2
+vcloop_odd:
mov r8, #0
vcloop_unaligned:
mov r8, #0
vcloop_unaligned: