diff options
| author | twinaphex | 2013-03-25 03:20:16 +0100 |
|---|---|---|
| committer | twinaphex | 2013-03-25 03:20:16 +0100 |
| commit | bcb982d5c38b25451598e9f00844a11bcd73ac74 (patch) | |
| tree | 59432441cf9e9f0a06f1079829cf70ad39d92949 /frontend | |
| parent | de4229995f85cddc72420b1b094e022b63f3951b (diff) | |
| parent | 9aff1963cf8ca9bbba14d4c82674ad0075c604ac (diff) | |
| download | pcsx_rearmed-bcb982d5c38b25451598e9f00844a11bcd73ac74.tar.gz pcsx_rearmed-bcb982d5c38b25451598e9f00844a11bcd73ac74.tar.bz2 pcsx_rearmed-bcb982d5c38b25451598e9f00844a11bcd73ac74.zip | |
Merge branch 'mainline'
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/cspace_arm.S | 3 | ||||
| -rw-r--r-- | frontend/cspace_neon.S (renamed from frontend/cspace_neon.s) | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/frontend/cspace_arm.S b/frontend/cspace_arm.S index e9d15a5..67778da 100644 --- a/frontend/cspace_arm.S +++ b/frontend/cspace_arm.S @@ -26,8 +26,7 @@ #endif .endm -.global bgr555_to_rgb565 @ void *dst, const void *src, int bytes -bgr555_to_rgb565: +FUNCTION(bgr555_to_rgb565): @ void *dst, const void *src, int bytes pld_ r1 push {r4-r11,lr} mov lr, #0x001f diff --git a/frontend/cspace_neon.s b/frontend/cspace_neon.S index b458f06..e7b48a9 100644 --- a/frontend/cspace_neon.s +++ b/frontend/cspace_neon.S @@ -8,11 +8,12 @@ * See the COPYING file in the top-level directory. */ +#include "arm_features.h" + .text .align 2 -.global bgr555_to_rgb565 -bgr555_to_rgb565: +FUNCTION(bgr555_to_rgb565): pld [r1] mov r3, #0x07c0 vdup.16 q15, r3 @@ -74,8 +75,7 @@ btr16_end16: bx lr -.global bgr888_to_rgb888 -bgr888_to_rgb888: +FUNCTION(bgr888_to_rgb888): pld [r1] @ r2 /= 48 mov r2, r2, lsr #4 @@ -96,8 +96,7 @@ bgr888_to_rgb888: bx lr -.global bgr888_to_rgb565 -bgr888_to_rgb565: +FUNCTION(bgr888_to_rgb565): pld [r1] @ r2 /= 48 mov r2, r2, lsr #4 @@ -129,8 +128,7 @@ bgr888_to_rgb565: bx lr -.global rgb888_to_rgb565 -rgb888_to_rgb565: +FUNCTION(rgb888_to_rgb565): pld [r1] @ r2 /= 48 mov r2, r2, lsr #4 |