diff options
| author | John van Groningen | 2011-06-27 09:40:12 +0000 |
|---|---|---|
| committer | John van Groningen | 2011-06-27 09:40:12 +0000 |
| commit | 4a947cc8e1c2f7574585b4ae5b4199856dfa6ff4 (patch) | |
| tree | 7edc71f06703d91165f806dc5486beccde29d506 | |
| parent | fix spelling of dll_initialised, remove some spaces (diff) | |
allow arrays in data segment
| -rw-r--r-- | macho64/acopy.s | 27 |
1 files changed, 15 insertions, 12 deletions
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 |