Changeset 8041

Timestamp:

Jan 10, 2008, 12:29:57 AM (17 years ago)

Author:

Gary Byers

Message:

Set save_rbp slot of newly-created tsp frames.
Ensure that linked frames on cstack have room for/use saved_rbp
slot, encapsulate/hide foreign stack usage.

Location:

branches/working-0711/ccl/lisp-kernel

Files:

• x86-spentry64.s (modified) (6 diffs)
• x86-subprims64.s (modified) (2 diffs)

branches/working-0711/ccl/lisp-kernel/x86-spentry64.s

@@ -2052 +2052 @@
         __(jnz 0b)      
         __(movq %stack_temp,(%temp0))
-        __(movq %imm0,tsp_frame.fixed_overhead(%temp0))
-        __(leaq tsp_frame.fixed_overhead+fulltag_misc(%temp0),%arg_z)
+        __(movq %rbp,csp_frame.save_rbp(%temp0))
+        __(movq %imm0,csp_frame.fixed_overhead(%temp0))
+        __(leaq csp_frame.fixed_overhead+fulltag_misc(%temp0),%arg_z)
         __(ret)
 local_label(stack_misc_alloc_heap_alloc_ivector):
@@ -2668 +2669 @@
         __(movq %rcontext:tcr.foreign_sp,%arg_z)
         __(movq %imm1,(%arg_z))
+        __(movq %rbp,csp_frame.save_rbp(%arg_z))
         __(lea macptr.size+tsp_frame.fixed_overhead(%arg_z),%imm0)
         __(movq $macptr_header,tsp_frame.fixed_overhead(%arg_z))
@@ -2679 +2681 @@
         __(movq %rcontext:tcr.foreign_sp,%imm0)
         __(movq %imm1,(%imm0))
+        __(movq %rbp,csp_frame.save_rbp(%imm0))
         __(set_nargs(1))
         __(movq $nrs.new_gcable_ptr,%fname)
@@ -2693 +2696 @@
         __(movq %rcontext:tcr.foreign_sp,%arg_z)
         __(movq %imm1,(%arg_z))
+        __(movq %rbp,csp_frame.save_rbp(%arg_z))
         __(lea macptr.size+tsp_frame.fixed_overhead(%arg_z),%imm0)
         __(movq $macptr_header,tsp_frame.fixed_overhead(%arg_z))
@@ -2709 +2713 @@
         __(movq %rcontext:tcr.foreign_sp,%imm0)
         __(movq %imm1,(%imm0))
+        __(movq %rbp,csp_frame.save_rbp(%imm0))
         __(set_nargs(1))
         __(movq $nrs.new_gcable_ptr,%fname)
@@ -4522 +4527 @@
         __(movq %r12,%r11)
 1:      /* Align foreign stack for lisp   */
-        __(subq $node_size,%rsp)
+        __(pushq %rcontext:tcr.save_rbp) /* mark cstack frame's "owner" */
         __(pushq %rcontext:tcr.foreign_sp)
         /* init lisp registers   */

branches/working-0711/ccl/lisp-kernel/x86-subprims64.s

@@ -35 +35 @@
         __(movq %rsp,%rbp)
         /* Switch to the lisp stack */
+        __(push $0)
+        __(push $0)
         __(movq %rsp,%rcontext:tcr.foreign_sp)
         __(movq %rcontext:tcr.save_vsp,%rsp)
         __(push $0)
         __(movq %rsp,%rbp)
+        
+        __(TSP_Alloc_Fixed(0,%temp0))
+        __(movsd %fpzero,tsp_frame.save_rbp(%temp0)) /* sentinel */
         __(jmp local_label(test))
 local_label(loop):
@@ -61 +66 @@
         __(jnz local_label(loop))
 local_label(back_to_c):
+        __(discard_temp_frame(%imm0))
         __(movq %rcontext:tcr.foreign_sp,%rsp)
+        __(addq $dnode_size,%rsp)
         __(movq %rsp,%rbp)
         __(leave)