notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get rid of port_config.s
[picodrive.git]
/
pico
/
draw_arm.S
diff --git
a/pico/draw_arm.s
b/pico/draw_arm.S
similarity index 96%
rename from
pico/draw_arm.s
rename to
pico/draw_arm.S
index
ec5fcf7
..
0bf297b
100644
(file)
--- a/
pico/draw_arm.s
+++ b/
pico/draw_arm.S
@@
-8,8
+8,6
@@
* this is highly specialized, be careful if changing related C code!
\r
*/
\r
\r
* this is highly specialized, be careful if changing related C code!
\r
*/
\r
\r
-.include "port_config.s"
\r
-
\r
.extern Pico
\r
.extern PicoOpt
\r
.extern HighCol
\r
.extern Pico
\r
.extern PicoOpt
\r
.extern HighCol
\r
@@
-1768,11
+1766,11
@@
FinalizeLineRGB555_pal_done:
\r
.fl_no32colRGB555:
\r
\r
\r
.fl_no32colRGB555:
\r
\r
-
.i
f UNALIGNED_DRAWLINEDEST
\r
+
#ifde
f UNALIGNED_DRAWLINEDEST
\r
@ this is basically for Gizmondo, which has unaligned odd lines in the framebuffer
\r
tst r0, #2
\r
bne .fl_RGB555u
\r
@ this is basically for Gizmondo, which has unaligned odd lines in the framebuffer
\r
tst r0, #2
\r
bne .fl_RGB555u
\r
-
.
endif
\r
+
#
endif
\r
\r
.fl_loopRGB555:
\r
ldr r12, [r1], #4
\r
\r
.fl_loopRGB555:
\r
ldr r12, [r1], #4
\r
@@
-1815,10
+1813,10
@@
FinalizeLineRGB555_pal_done:
mov r9, #0x3900 @ f800 07e0 001f | e000 0780 001c | 3800 01e0 0007
\r
orr r9, r9, #0x00e7
\r
\r
mov r9, #0x3900 @ f800 07e0 001f | e000 0780 001c | 3800 01e0 0007
\r
orr r9, r9, #0x00e7
\r
\r
-
.i
f UNALIGNED_DRAWLINEDEST
\r
+
#ifde
f UNALIGNED_DRAWLINEDEST
\r
tst r0, #2
\r
bne .fl_32scale_RGB555u
\r
tst r0, #2
\r
bne .fl_32scale_RGB555u
\r
-
.
endif
\r
+
#
endif
\r
\r
.fl_loop32scale_RGB555:
\r
ldr r12, [r1], #4
\r
\r
.fl_loop32scale_RGB555:
\r
ldr r12, [r1], #4
\r
@@
-1876,7
+1874,7
@@
FinalizeLineRGB555_pal_done:
ldmfd sp!, {r4-r9,lr}
\r
bx lr
\r
\r
ldmfd sp!, {r4-r9,lr}
\r
bx lr
\r
\r
-
.i
f UNALIGNED_DRAWLINEDEST
\r
+
#ifde
f UNALIGNED_DRAWLINEDEST
\r
@ unaligned versions of loops
\r
@ warning: starts drawing 2bytes before dst
\r
\r
@ unaligned versions of loops
\r
@ warning: starts drawing 2bytes before dst
\r
\r
@@
-1989,7
+1987,7
@@
FinalizeLineRGB555_pal_done:
ldmfd sp!, {r4-r9,lr}
\r
bx lr
\r
\r
ldmfd sp!, {r4-r9,lr}
\r
bx lr
\r
\r
-.endif @ UNALIGNED_DRAWLINEDEST
\r
+#endif /* UNALIGNED_DRAWLINEDEST */
\r
\r
\r
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
\r
\r
\r
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
\r