add configure, revive pnd build, unify/refactor things

[picodrive.git] / pico / draw_arm.s

diff --git a/pico/draw_arm.s b/pico/draw_arm.s
index 82bb603..ec5fcf7 100644 (file)
--- a/pico/draw_arm.s
+++ b/pico/draw_arm.s
@@ -1,10 +1,12 @@
-@ vim:filetype=armasm\r
-\r
-@ ARM assembly versions of some funtions from draw.c\r
-@ this is highly specialized, be careful if changing related C code!\r
-\r
-@ (c) Copyright 2007-2008, Grazvydas "notaz" Ignotas\r
-@ All Rights Reserved\r
+/*\r
+ * assembly optimized versions of most funtions from draw.c\r
+ * (C) notaz, 2006-2010\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ *\r
+ * this is highly specialized, be careful if changing related C code!\r
+ */\r
 \r
 .include "port_config.s"\r
 \r
@@ -1638,7 +1640,7 @@ vidConvCpyRGB565: @ void *to, void *from, int pixels
     stmfd   sp!, {r4-r9,lr}\r
     mov     r8,     #0x0061\r
     orr     r8, r8, #0x0800\r
-    orr     r8, r8, lsl #16\r
+    orr     r8, r8, r8, lsl #16\r
     vidConvCpyRGB565_local\r
     ldmfd   sp!, {r4-r9,lr}\r
     bx      lr\r
@@ -1663,7 +1665,7 @@ PicoDoHighPal555_nopush:
     mov     r2, #0x40\r
     mov     r8,     #0x0061\r
     orr     r8, r8, #0x0800\r
-    orr     r8, r8, lsl #16\r
+    orr     r8, r8, r8, lsl #16\r
 \r
     vidConvCpyRGB565_local\r
 \r
@@ -2026,3 +2028,4 @@ blockcpy_loop_or:
     ldmfd   sp!, {r4-r6}\r
     bx      lr\r
 \r
+@ vim:filetype=armasm\r