1.0.16.10: function-ify ERROR-CALL and GENERATE-ERROR-CODE on x86

[sbcl.git] / src / compiler / x86 / array.lisp

diff --git a/src/compiler/x86/array.lisp b/src/compiler/x86/array.lisp
index 0b12e75..22ab26c 100644 (file)
--- a/src/compiler/x86/array.lisp
+++ b/src/compiler/x86/array.lisp
@@ -112,7 +112,7 @@
   (:vop-var vop)
   (:save-p :compute-only)
   (:generator 5
-    (let ((error (generate-error-code vop invalid-array-index-error
+    (let ((error (generate-error-code vop 'invalid-array-index-error
                                       array bound index))
           (index (if (sc-is index immediate)
                    (fixnumize (tn-value index))
@@ -150,10 +150,10 @@
   #!+sb-unicode
   (def-full-data-vector-frobs simple-character-string character character-reg))
 
-(define-full-compare-and-swap simple-vector-compare-and-swap
-    simple-vector vector-data-offset other-pointer-lowtag
-    (descriptor-reg any-reg) *
-    %simple-vector-compare-and-swap)
+(define-full-compare-and-swap %compare-and-swap-svref simple-vector
+  vector-data-offset other-pointer-lowtag
+  (descriptor-reg any-reg) *
+  %compare-and-swap-svref)
 \f
 ;;;; integer vectors whose elements are smaller than a byte, i.e.,
 ;;;; bit, 2-bit, and 4-bit vectors