X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fcompiler%2Fx86%2Fc-call.lisp;h=8cfd2e72bfffcef986278a853c11ecaef67e53b4;hb=d147d512602d761a2dcdfded506dd1a8f9a140dc;hp=87440e082be0f285c0f0db813a8dfa86247bd877;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/compiler/x86/c-call.lisp b/src/compiler/x86/c-call.lisp
index 87440e0..8cfd2e7 100644
--- a/src/compiler/x86/c-call.lisp
+++ b/src/compiler/x86/c-call.lisp
@@ -12,10 +12,7 @@
 
 (in-package "SB!VM")
 
-(file-comment
- "$Header$")
-
-;; The move-argument vop is going to store args on the stack for
+;; The MOVE-ARGUMENT vop is going to store args on the stack for
 ;; call-out. These tn's will be used for that. move-arg is normally
 ;; used for things going down the stack but C wants to have args
 ;; indexed in the positive direction.
@@ -25,7 +22,7 @@
 		 (sc-number-or-lose sc-name)
 		 offset))
 
-(defstruct arg-state
+(defstruct (arg-state (:copier nil))
   (stack-frame-size 0))
 
 (def-alien-type-method (integer :arg-tn) (type state)
@@ -64,7 +61,7 @@
     (setf (arg-state-stack-frame-size state) (1+ stack-frame-size))
     (my-make-wired-tn 'single-float 'single-stack stack-frame-size)))
 
-(defstruct result-state
+(defstruct (result-state (:copier nil))
   (num-results 0))
 
 (defun result-reg-offset (slot)
@@ -121,7 +118,7 @@
     (when values
       (invoke-alien-type-method :result-tn (car values) state))))
 
-(def-vm-support-routine make-call-out-tns (type)
+(!def-vm-support-routine make-call-out-tns (type)
   (let ((arg-state (make-arg-state)))
     (collect ((arg-tns))
       (dolist #+nil ;; this reversed list seems to cause the alien botches!!
@@ -197,7 +194,7 @@
   (:info amount)
   (:results (result :scs (sap-reg any-reg)))
   (:generator 0
-    (assert (location= result esp-tn))
+    (aver (location= result esp-tn))
     (unless (zerop amount)
       (let ((delta (logandc2 (+ amount 3) 3)))
 	(inst sub esp-tn delta)))
@@ -214,11 +211,11 @@
   (:info amount)
   (:results (result :scs (sap-reg any-reg)))
   (:generator 0
-    (assert (not (location= result esp-tn)))
+    (aver (not (location= result esp-tn)))
     (unless (zerop amount)
       (let ((delta (logandc2 (+ amount 3) 3)))
 	(inst sub (make-ea :dword
-			   :disp (+ *nil-value*
+			   :disp (+ nil-value
 				    (static-symbol-offset '*alien-stack*)
 				    (ash symbol-value-slot word-shift)
 				    (- other-pointer-type)))
@@ -231,7 +228,7 @@
     (unless (zerop amount)
       (let ((delta (logandc2 (+ amount 3) 3)))
 	(inst add (make-ea :dword
-			   :disp (+ *nil-value*
+			   :disp (+ nil-value
 				    (static-symbol-offset '*alien-stack*)
 				    (ash symbol-value-slot word-shift)
 				    (- other-pointer-type)))