fix bug in cross

diff --git a/source/NE10_cross.neon.s b/source/NE10_cross.neon.s
index dc45664..e44a77b 100644 (file)
--- a/source/NE10_cross.neon.s
+++ b/source/NE10_cross.neon.s
@@ -26,7 +26,7 @@
 
 
 
-        .align  2
+        .align  4
         .global cross_vec3f_neon
         .thumb
         .thumb_func
@@ -49,86 +49,13 @@ cross_vec3f_neon:
         @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
         push              {r4}
-        and               r4, r3, #3          @ r3 = count % 4;
-        sub               r3, r3, r4          @ count = count - r3; This is what's left to be processed after this loop
+        and               r4, r3, #3          @ r4 = count % 4; calculate the residual loop
+        asr               r3, r3, #2          @ r3 = count >> 2; calculate the main loop
 
-        cmp               r3, #0
-        beq               .L_check_vec3
+        cbz               r4, .L_check_mainloop_vec3
 
-        @ load the 1st set of values
-          vld3.32         {d0, d2, d4}, [r1]!
-          vld3.32         {d1, d3, d5}, [r1]!
-          vld3.32         {d26, d28, d30}, [r2]!
-          vld3.32         {d27, d29, d31}, [r2]!
-          subs            r3, r3, #8          @ 4 for this set, and 4 for the 2nd set
-
-        @ calculate values for the 1st set
-          vmul.f32        q10, q1, q15
-          vmul.f32        q11, q2, q13
-          vmul.f32        q12, q0, q14
-
-          vmls.f32        q10, q14, q2
-          vmls.f32        q11, q15, q0
-          vmls.f32        q12, q13, q1
-
-
-        @ load the 2nd set of values
-          vld3.32         {d0, d2, d4}, [r1]!
-          vld3.32         {d1, d3, d5}, [r1]!
-          vld3.32         {d26, d28, d30}, [r2]!
-          vld3.32         {d27, d29, d31}, [r2]!
-
-          ble             .L_mainloopend_vec3
-
-.L_mainloop_vec3:
-        @ store the result for the 1st/next (e.g. 3rd) set
-          vst3.32         {d20, d22, d24}, [r0]!
-          vst3.32         {d21, d23, d25}, [r0]!
-
-        @ calculate values for the 2nd/next (e.g. 3rd) set
-          vmul.f32        q10, q1, q15
-          vmul.f32        q11, q2, q13
-          vmul.f32        q12, q0, q14
-
-          vmls.f32        q10, q14, q2
-          vmls.f32        q11, q15, q0
-          vmls.f32        q12, q13, q1
-
-       @ load the next (e.g. 3rd) set of values
-          subs            r3, r3, #4
-          vld3.32         {d0, d2, d4}, [r1]!
-          vld3.32         {d1, d3, d5}, [r1]!
-          vld3.32         {d26, d28, d30}, [r2]!
-          vld3.32         {d27, d29, d31}, [r2]!
-
-        bgt               .L_mainloop_vec3             @ loop if r2 is > r3, if we have at least another 4 vectors (12 floats) to process
-
-.L_mainloopend_vec3:
-        @ the last iteration for this call
-        @ store the result for the set of values before the last one (e.g 2nd set)
-          vst3.32         {d20, d22, d24}, [r0]!
-          vst3.32         {d21, d23, d25}, [r0]!
-
-        @ calculate values for the last (e.g. 3rd) set
-          vmul.f32        q10, q1, q15
-          vmul.f32        q11, q2, q13
-          vmul.f32        q12, q0, q14
-
-          vmls.f32        q10, q14, q2
-          vmls.f32        q11, q15, q0
-          vmls.f32        q12, q13, q1
-
-        @ store the result for the last (e.g. 3rd) set
-          vst3.32         {d20, d22, d24}, [r0]!
-          vst3.32         {d21, d23, d25}, [r0]!
-
-.L_check_vec3:
-     @ check if anything left to process at the end of the input array
-        cmp               r4, #0
-        ble               .L_return_vec3
-
-.L_secondloop_vec3:
-     @ process the last few items left in the input array
+.L_residualloop_vec3:
+        @ process the last few items left in the input array
         vld3.f32          {d0[0], d2[0], d4[0]}, [r1]!     @ The values are loaded like so:
                                                            @      q0 = { V1.x, -, -, - };
                                                            @      q1 = { V1.y, -, -, - };
@@ -151,7 +78,39 @@ cross_vec3f_neon:
 
         vst3.32           {d20[0], d21[0], d22[0]}, [r0]!
 
-        bgt               .L_secondloop_vec3
+        bgt               .L_residualloop_vec3
+
+.L_check_mainloop_vec3:
+        cbz               r3, .L_return_vec3
+
+        @ load current set of values
+        vld3.32         {d0, d2, d4}, [r1]!
+        vld3.32         {d1, d3, d5}, [r1]!
+        vld3.32         {d26, d28, d30}, [r2]!
+        vld3.32         {d27, d29, d31}, [r2]!
+
+.L_mainloop_vec3:
+        @ calculate values for the 2nd/next (e.g. 3rd) set
+        vmul.f32        q10, q1, q15
+        vmul.f32        q11, q2, q13
+        vmul.f32        q12, q0, q14
+
+        vmls.f32        q10, q14, q2
+        vmls.f32        q11, q15, q0
+        vmls.f32        q12, q13, q1
+
+        @ store the result for the 1st/next (e.g. 3rd) set
+        vst3.32         {d20, d22, d24}, [r0]!
+        vst3.32         {d21, d23, d25}, [r0]!
+        subs            r3, r3, #1
+
+        @ load the next (e.g. 3rd) set of values
+        vld3.32         {d0, d2, d4}, [r1]!
+        vld3.32         {d1, d3, d5}, [r1]!
+        vld3.32         {d26, d28, d30}, [r2]!
+        vld3.32         {d27, d29, d31}, [r2]!
+
+        bgt               .L_mainloop_vec3             @ loop if r2 is > r3, if we have at least another 4 vectors (12 floats) to process
 
 .L_return_vec3:
      @ return