Changeset 8391

Timestamp:

Feb 1, 2008, 3:44:38 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

Change nargs from imm0 to temp1.

Location:

branches/ia32/lisp-kernel

Files:

• x86-constants32.h (modified) (1 diff)
• x86-constants32.s (modified) (1 diff)
• x86-macros.s (modified) (1 diff)
• x86-spentry32.s (modified) (2 diffs)

branches/ia32/lisp-kernel/x86-constants32.h

@@ -28 +28 @@
 #define Iallocptr Itemp0
 #define Ira0 Itemp0
-#define Inargs Iimm0
+#define Inargs Itemp1
 #define Ixfn Itemp1
 

branches/ia32/lisp-kernel/x86-constants32.s

@@ -45 +45 @@
 define([allocptr],[temp0])
 
-define([nargs_b],[imm0_b])
-define([nargs_w],[imm0_w])
-define([nargs],[imm0])
+define([nargs],[temp1])
 
 define([ra0],[temp0])

branches/ia32/lisp-kernel/x86-macros.s

@@ -468 +468 @@
 define([do_funcall],[
         new_macro_labels()
-        __(movl %imm0,%temp1) /* preserve nargs */
         extract_fulltag(%temp0,%imm0)
         __(cmpb $fulltag_misc,%imm0_b)
-        __(movl %temp1,%imm0)
         __(jne macro_label(bad))
         __(cmpb $subtag_function,misc_subtag_offset(%temp0))

branches/ia32/lisp-kernel/x86-spentry32.s

@@ -942 +942 @@
 
 _spentry(tcallsymslide)
-        __(int $3)
+        __(movl %ebp,%imm0)
+        __(subl %nargs,%imm0)   /* new tos */
+        __(push %imm0)
+        __(push %arg_y)
+        __(push %arg_z)
+        __(push %nargs)
+        __(lea (4-nargregs)*node_size(%esp,%nargs),%arg_y) /* src ptr */
+        __(movl %ebp,%imm0) /* dst ptr */
+        __(subl $fixnumone*nargregs,%nargs)
+        __(jmp 1f)
+0:      __(subl $node_size,%arg_y)
+        __(movl (%arg_y),%arg_z)
+        __(subl $node_size,%imm0)
+        __(movl %arg_z,(%imm0))
+1:      __(subl $fixnumone,%nargs)
+        __(jge 0b)
+        __(pop %nargs)
+        __(pop %arg_z)
+        __(pop %arg_y)
+        __(pop %esp)
+        __(push -node_size(%ebp))
+        __(movl 0(%ebp),%ebp)
+        __(jump_fname)
 _endsubp(tcallsymslide)
 
@@ -964 +986 @@
 _endsubp(tcallnfnvsp)
 
+/* Make a "raw" area on the foreign stack, stack-cons a macptr to point */
+/* to it, and return the macptr.  Size (in bytes, boxed) is in arg_z */
+/* on entry; macptr in arg_z on exit. */
 _spentry(makestackblock)
-        __(int $3)
+        __(unbox_fixnum(%arg_z,%imm0))
+        __(dnode_align(%imm0,tsp_frame.fixed_overhead+macptr.size,%imm0))
+        __(cmpl $tstack_alloc_limit,%imm0)
+        __(jae 1f)
+        __(movd %rcontext:tcr.foreign_sp,%mm0)
+        __(subl %imm0,%rcontext:tcr.foreign_sp)
+        __(movl %rcontext:tcr.foreign_sp,%arg_z)
+        __(movd %mm0,(%arg_z))
+        __(lea macptr.size+tsp_frame.fixed_overhead(%arg_z),%imm0)
+        __(movl $macptr_header,tsp_frame.fixed_overhead(%arg_z))
+        __(addl $fulltag_misc+tsp_frame.fixed_overhead,%arg_z)
+        __(movl %imm0,macptr.address(%arg_z))
+        __(movss %fpzero,macptr.domain(%arg_z))
+        __(movss %fpzero,macptr.type(%arg_z))
+        __(ret)
+1:      __(movd %rcontext:tcr.foreign_sp,%mm0)
+        __(subl $dnode_size,%rcontext:tcr.foreign_sp)
+        __(movl %rcontext:tcr.foreign_sp,%imm0)
+        __(movd %mm0,(%imm0))
+        __(set_nargs(1))
+        __(movl $nrs.new_gcable_ptr,%fname)
+        __(jump_fname())
 _endsubp(makestackblock)