X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fx86-vm.lisp;h=6e17592566351425925e5289060ca6a3de5e009b;hb=722703e7cbd3a4b279a4c1baab5d95df2c23cce9;hp=65e871cc4f87e1aee3b7a624be65dd3a6a7f1d59;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git

diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp
index 65e871c..6e17592 100644
--- a/src/code/x86-vm.lisp
+++ b/src/code/x86-vm.lisp
@@ -32,7 +32,7 @@
 ;;; FIXME: Since SBCL, unlike CMU CL, uses this as an opaque type,
 ;;; it's no longer architecture-dependent, and probably belongs in
 ;;; some other package, perhaps SB-KERNEL.
-(def-alien-type os-context-t (struct os-context-t-struct))
+(define-alien-type os-context-t (struct os-context-t-struct))
 
 ;;;; MACHINE-TYPE and MACHINE-VERSION
 
@@ -119,16 +119,16 @@
 	    (setf (signed-sap-ref-32 sap offset) rel-val))))))
     nil))
 
-;;; Add a code fixup to a code object generated by GENESIS. The fixup has
-;;; already been applied, it's just a matter of placing the fixup in the code's
-;;; fixup vector if necessary.
+;;; Add a code fixup to a code object generated by GENESIS. The fixup
+;;; has already been applied, it's just a matter of placing the fixup
+;;; in the code's fixup vector if necessary.
 ;;;
 ;;; KLUDGE: I'd like a good explanation of why this has to be done at
 ;;; load time instead of in GENESIS. It's probably simple, I just haven't
 ;;; figured it out, or found it written down anywhere. -- WHN 19990908
 #!+gencgc
-(defun !do-load-time-code-fixup (code offset fixup kind)
-  (flet ((add-load-time-code-fixup (code offset)
+(defun !envector-load-time-code-fixup (code offset fixup kind)
+  (flet ((frob (code offset)
 	   (let ((fixups (code-header-ref code code-constants-offset)))
 	     (cond ((typep fixups '(simple-array (unsigned-byte 32) (*)))
 		    (let ((new-fixups
@@ -160,11 +160,11 @@
 	(:absolute
 	 ;; Record absolute fixups that point within the code object.
 	 (when (> code-end-addr (sap-ref-32 sap offset) obj-start-addr)
-	   (add-load-time-code-fixup code offset)))
+	   (frob code offset)))
 	(:relative
 	 ;; Record relative fixups that point outside the code object.
 	 (when (or (< fixup obj-start-addr) (> fixup code-end-addr))
-	   (add-load-time-code-fixup code offset)))))))
+	   (frob code offset)))))))
 
 ;;;; low-level signal context access functions
 ;;;;
@@ -183,7 +183,7 @@
 ;;;;      and internal error handling) the extra runtime cost should be
 ;;;;      negligible.
 
-(def-alien-routine ("os_context_pc_addr" context-pc-addr) (* unsigned-int)
+(define-alien-routine ("os_context_pc_addr" context-pc-addr) (* unsigned-int)
   ;; (Note: Just as in CONTEXT-REGISTER-ADDR, we intentionally use an
   ;; 'unsigned *' interpretation for the 32-bit word passed to us by
   ;; the C code, even though the C code may think it's an 'int *'.)
@@ -195,7 +195,7 @@
     (declare (type (alien (* unsigned-int)) addr))
     (int-sap (deref addr))))
 
-(def-alien-routine ("os_context_register_addr" context-register-addr)
+(define-alien-routine ("os_context_register_addr" context-register-addr)
   (* unsigned-int)
   ;; (Note the mismatch here between the 'int *' value that the C code
   ;; may think it's giving us and the 'unsigned *' value that we
@@ -256,13 +256,13 @@
 
   0)
 
-;;;; INTERNAL-ERROR-ARGUMENTS
+;;;; INTERNAL-ERROR-ARGS
 
 ;;; Given a (POSIX) signal context, extract the internal error
 ;;; arguments from the instruction stream.
-(defun internal-error-arguments (context)
+(defun internal-error-args (context)
   (declare (type (alien (* os-context-t)) context))
-  (/show0 "entering INTERNAL-ERROR-ARGUMENTS, CONTEXT=..")
+  (/show0 "entering INTERNAL-ERROR-ARGS, CONTEXT=..")
   (/hexstr context)
   (let ((pc (context-pc context)))
     (declare (type system-area-pointer pc))
@@ -326,14 +326,6 @@
 ;;; the current alien stack pointer; saved/restored for non-local exits
 (defvar *alien-stack*)
 
-(defun sb!kernel::%instance-set-conditional (object slot test-value new-value)
-  (declare (type instance object)
-	   (type index slot))
-  #!+sb-doc
-  "Atomically compare object's slot value to test-value and if EQ store
-   new-value in the slot. The original value of the slot is returned."
-  (sb!kernel::%instance-set-conditional object slot test-value new-value))
-
 ;;; Support for the MT19937 random number generator. The update
 ;;; function is implemented as an assembly routine. This definition is
 ;;; transformed to a call to the assembly routine allowing its use in