From 4a947cc8e1c2f7574585b4ae5b4199856dfa6ff4 Mon Sep 17 00:00:00 2001
From: John van Groningen
Date: Mon, 27 Jun 2011 09:40:12 +0000
Subject: allow arrays in data segment

---
 macho64/acopy.s | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'macho64')

diff --git a/macho64/acopy.s b/macho64/acopy.s
index b4b68bc..c9fdcf4 100644
--- a/macho64/acopy.s
+++ b/macho64/acopy.s
@@ -1101,11 +1101,10 @@ copy_arity_0_node2_:
 copy_string_or_array_2:
 	mov	rcx,rdx 
 	jne	copy_array_2
-	mov	rax,rcx 
 
-	sub	rax,heap_p1[rip]
-	cmp	rax,semi_space_size[rip]
-	jae	copy_string_constant
+	sub	rdx,heap_p1[rip]
+	cmp	rdx,semi_space_size[rip]
+	jae	copy_string_or_array_constant
 
 	mov	rdx,8[rcx]
 	add	rbp,8
@@ -1146,15 +1145,11 @@ cp_s_arg_lp2:
 	att_jae	copy_lp2
 	ret
 
-copy_string_constant:
-	mov	qword ptr [rbp],rdx 
-	add	rbp,8
-
-	sub	rbx,1
-	att_jae	copy_lp2
-	ret
-
 copy_array_2:
+	sub	rdx,heap_p1[rip]
+	cmp	rdx,semi_space_size[rip]
+	jae	copy_string_or_array_constant
+
 	push	rbx 
 
 	mov	rax,qword ptr 16[rcx]
@@ -1234,6 +1229,14 @@ copy_bool_array_2:
 	shr	rbx,3
 	att_jmp	copy_int_or_real_array_2
 
+copy_string_or_array_constant:
+	mov	qword ptr [rbp],rcx 
+	add	rbp,8
+
+	sub	rbx,1
+	att_jae	copy_lp2
+	ret
+
 end_copy1:
 	mov	heap_end_after_gc[rip],rsi 
 
-- 
cgit v1.2.3