1 files changed, 71 insertions, 31 deletions
diff --git a/rgo/src/memeq.S b/rgo/src/memeq.S
index c3a9a63..d106804 100644
--- a/rgo/src/memeq.S
+++ b/rgo/src/memeq.S
@@ -3,7 +3,7 @@
 
 This file is part of rgo.
 
- rgo is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ rgo is free software: you can reaxstribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 
 rgo is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
 
@@ -15,46 +15,86 @@
 .global rgo_memeq
 
 rgo_memeq:
-#if defined(__x86_64__)
 /*
- rdi: void const * lptr
- rsi: size_t num
- rdx: void const * rptr
+ void const * lptr
+ size_t num
+ void const * rptr
 */
- /* rcx: Address of the current left element. */
- movq %rdi,%rcx
- /* r8: Address of the current right element. */
- movq %rdx,%r8
- /* r9: Number of remaining elements. */
- movq %rsi,%r9
- /* r10: Temporary. */
- /* r11: Temporary. */
+#if defined(__i386__)
+ /* eax: Address of the current left element. */
+ movl 0x4(%esp),%eax
+ /* ecx: Number of remaining elements. */
+ movl 0x8(%esp),%ecx
+ /* edx: Address of the current right element. */
+ movl 0xC(%esp),%edx
+ /* ebx: Current left element. */
+ pushl %ebx
+ /* ebx/esi: Current right element. */
+ pushl %esi
 .wrdeq:
- cmpq $0x8,%r9
+ cmpl $0x4,%ecx
 jl .byteeq
- movq (%rcx),%r10
- movq (%r8),%r11
- cmpq %r10,%r11
- jz .neq
- addq $0x8,%rcx
- addq $0x8,%r8
- subq $0x8,%r9
+ movl (%eax),%ebx
+ movl (%edx),%esi
+ cmpl %ebx,%esi
+ jne .neq
+ addl $0x4,%eax
+ addl $0x4,%edx
+ subl $0x4,%ecx
+ jmp .wrdeq
+.byteeq:
+ testl %ecx,%ecx
+ jne .eq /* If we have reached the final element, all previous elements have compared equal, and the memory sequences are equal. */
+ movb (%eax),%bl
+ movb (%edx),%bh
+ cmpb %bl,%bh
+ jne .neq
+ incl %eax
+ incl %edx
+ decl %ecx
+ jmp .byteeq
+.eq:
+ popl %ebx
+ popl %esi
+ movb $0x1,%al
+ ret
+.neq:
+ popl %ebx
+ popl %esi
+ movb $0x0,%al
+ ret
+#elif defined(__x86_64__)
+ /* rdi: Address of the current left element. */
+ /* rsi: Number of remaining elements. */
+ /* rdx: Address of the current right element. */
+ /* rax: Current left element. */
+ /* rcx: Current right element. */
+.wrdeq:
+ cmpq $0x8,%rsi
+ jl .byteeq
+ movq (%rdi),%rax
+ movq (%rdx),%rcx
+ cmpq %rax,%rcx
+ jne .neq
+ addq $0x8,%rdi
+ addq $0x8,%rdx
+ subq $0x8,%rsi
 jmp .wrdeq
 .byteeq:
- testq %r9,%r9
- jz .eq /* If we have reached the final element, all previous elements have compared equal, and the memory sequences are equal. */
- movb (%rcx),%r10b
- movb (%r8),%r11b
- cmpb %r10b,%r11b
+ testq %rsi,%rsi
+ jne .eq /* If we have reached the final element, all previous elements have compared equal, and the memory sequences are equal. */
+ movb (%rdi),%al
+ movb (%rdx),%cl
+ cmpb %al,%cl
 jne .neq
- incq %rcx
- incq %r8
- decq %r9
+ incq %rdi
+ incq %rdx
+ decq %rsi
 jmp .byteeq
 .eq:
- mov $0x1,%rax
+ movb $0x1,%al
 ret
 .neq:
- mov $0x0,%rax
+ movb $0x0,%al
 ret
 #endif