X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Farm_utils.s;fp=frontend%2Farm_utils.s;h=d13192303c079d58f76397b0a674325f185fccf8;hp=4e561f9363702c7942fd8bcaee73b6aedec04883;hb=69f0df9cbaed6620a190ac289958c5bf7c079d92;hpb=04fd948ab0639acff080434f54212af13ab14ef1

diff --git a/frontend/arm_utils.s b/frontend/arm_utils.s
index 4e561f93..d1319230 100644
--- a/frontend/arm_utils.s
+++ b/frontend/arm_utils.s
@@ -15,7 +15,8 @@
 bgr555_to_rgb565:
     mov         r3, #0x07c0
     vdup.16     q15, r3
-    sub         r2, r2, #64
+    subs        r2, r2, #64
+    blt         btr16_end64
 0:
     vldmia      r1!, {q0-q3}
     vshl.u16    q4, q0, #11
@@ -38,20 +39,36 @@ bgr555_to_rgb565:
     subs        r2, r2, #64
     bge         0b
 
+btr16_end64:
     adds        r2, r2, #64
     bxeq        lr
+    subs        r2, r2, #16
+    blt         btr16_end16
 
-    @ handle the remainder
+    @ handle the remainder (reasonably rare)
 0:
-    vld1.16     {q0}, [r1, :64]!
+    vld1.16     {q0}, [r1]!
     vshl.u16    q1, q0, #11
     vshl.u16    q2, q0, #1
     vsri.u16    q1, q0, #10
     vbit        q1, q2, q15
     subs        r2, r2, #16
-    vst1.16     {q1}, [r0, :64]!
-    bgt         0b
+    vst1.16     {q1}, [r0]!
+    bge         0b
 
+btr16_end16:
+    adds        r2, r2, #16
+    bxeq        lr
+    subs        r2, r2, #8
+    bxlt        lr
+
+    @ very rare
+    vld1.16     d0, [r1]!
+    vshl.u16    d1, d0, #11
+    vshl.u16    d2, d0, #1
+    vsri.u16    d1, d0, #10
+    vbit        d1, d2, d30
+    vst1.16     d1, [r0]!
     bx          lr