Changeset 4949

Timestamp:

Aug 18, 2006, 8:19:51 AM (18 years ago)

Author:

Gary Byers

Message:

Darwin x86-64 assembler doesn't like absolute jumps, prefers slower ones.

Move lock prefixes to their own lines, to satisfy you-know-who.

If we don't have thread-local-storage (TLS), it's hard to avoid
the get_tcr() call on each calback.

File:

• trunk/ccl/lisp-kernel/x86-spentry64.s (modified) (10 diffs)

trunk/ccl/lisp-kernel/x86-spentry64.s

@@ -186 +186 @@
 _startfn(C(misc_ref_common))
         __(movzbl %imm1_b,%imm1_l)
-        __(jmp *local_label(misc_ref_jmp)(,%imm1,8))
+        __(lea local_label(misc_ref_jmp)(%rip),%temp2)
+        __(jmp *(%temp2,%imm1,8))
         .p2align 3
 local_label(misc_ref_jmp):      
@@ -620 +621 @@
 _startfn(C(misc_set_common))
         __(movzbl %imm1_b,%imm1_l)
-        __(jmp *local_label(misc_set_jmp)(,%imm1,8))
+        __(lea local_label(misc_set_jmp)(%rip),%temp2)
+        __(jmp *(%temp2,%imm1,8))
         .p2align 3
 local_label(misc_set_jmp):              
@@ -1720 +1722 @@
         __(shrq $bitmap_shift,%imm1)
         __(xorb $63,%imm0_b)
-        __(lock btsq %imm0,(%temp0,%imm1,8))
+        __(lock)
+        __(btsq %imm0,(%temp0,%imm1,8))
         __(jmp *%ra0)
 _endsubp(rplaca)
@@ -1741 +1744 @@
         __(shrq $bitmap_shift,%imm1)
         __(xorb $63,%imm0_b)
-        __(lock btsq %imm0,(%temp0,%imm1,8))
+        __(lock)
+        __(btsq %imm0,(%temp0,%imm1,8))
         __(jmp *%ra0)
 _endsubp(rplacd)
@@ -1765 +1769 @@
         __(shrq $bitmap_shift,%imm1)
         __(xorb $63,%imm0_b)
-        __(lock btsq %imm0,(%temp0,%imm1,8))
+        __(lock) 
+        __(btsq %imm0,(%temp0,%imm1,8))
         __(jmp *%ra0)                
 _endsubp(gvset)
@@ -1791 +1796 @@
         __(shrq $bitmap_shift,%imm1)
         __(xorb $63,%imm0_b)
-        __(lock btsq %imm0,(%temp0,%imm1,8))
+        __(lock)
+        __( btsq %imm0,(%temp0,%imm1,8))
         /* Now memoize the address of the hash vector   */
         __(movq %arg_x,%imm0)
@@ -1800 +1806 @@
         __(shrq $bitmap_shift,%imm1)
         __(xorb $63,%imm0_b)
-        __(lock btsq %imm0,(%temp0,%imm1,8))
+        __(lock)
+        __(btsq %imm0,(%temp0,%imm1,8))
         __(jmp *%ra0)                
 _endsubp(set_hash_key)
@@ -1818 +1825 @@
         __(movq %temp1,%imm0)
         __(jne 3f)
-        __(lock cmpxchgq %arg_z,(%arg_x,%imm1))
+        __(lock)
+        __(cmpxchgq %arg_z,(%arg_x,%imm1))
         .globl C(egc_store_node_conditional_success_test)
 C(egc_store_node_conditional_success_test):
@@ -1832 +1840 @@
         __(shrq $bitmap_shift,%imm1)
         __(xorb $63,%imm0_b)
-        __(lock btsq %imm0,(%temp1,%imm1,8))
+        __(lock)
+        __(btsq %imm0,(%temp1,%imm1,8))
         .globl C(egc_write_barrier_end)
 C(egc_write_barrier_end):
@@ -4194 +4203 @@
         __(push %rbx)
         __(push %rbp)
-        /* TCR initialized for lisp ?   */
-        __(movq %fs:current_tcr@TPOFF+tcr.linear,%rax)
-        __(testq %rax,%rax)
-        __(jne 1f)
+        __ifdef([HAVE_TLS])
+         /* TCR initialized for lisp ?   */
+         __(movq %fs:current_tcr@TPOFF+tcr.linear,%rax)
+         __(testq %rax,%rax)
+         __(jne 1f)
+        __endif
         __(movq %r11,%r12)
         __(ref_global(get_tcr,%rax))