X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fassem.lisp;h=ba5c68e67214312458061645e731ea020dcc342c;hb=7646aefa188758e2892fea2ad02be4f29b3938f2;hp=778eb41fdac6972dd1a6965cf46b616c57b1e6c3;hpb=670010e3f3dcd62efaf23f61abdc73950edb88c6;p=sbcl.git

diff --git a/src/compiler/assem.lisp b/src/compiler/assem.lisp
index 778eb41..ba5c68e 100644
--- a/src/compiler/assem.lisp
+++ b/src/compiler/assem.lisp
@@ -473,7 +473,7 @@
 	    ;; nothing to do, then emit a nop. ### Note: despite the
 	    ;; fact that this is a loop, it really won't work for
 	    ;; repetitions other then zero and one. For example, if
-p	    ;; the branch has two dependents and one of them dpends on
+	    ;; the branch has two dependents and one of them dpends on
 	    ;; the other, then the stuff that grabs a dependent could
 	    ;; easily grab the wrong one. But I don't feel like fixing
 	    ;; this because it doesn't matter for any of the
@@ -768,7 +768,7 @@ p	    ;; the branch has two dependents and one of them dpends on
   (declare (type segment segment)
 	   (type annotation note))
   (when (annotation-posn note)
-    (error "attempt to emit ~S a second time"))
+    (error "attempt to emit ~S a second time" note))
   (setf (annotation-posn note) (segment-current-posn segment))
   (setf (annotation-index note) (segment-current-index segment))
   (let ((last (segment-last-annotation segment))
@@ -1270,8 +1270,7 @@ p	    ;; the branch has two dependents and one of them dpends on
     (setf (segment-postits segment) (segment-postits other-segment))
     (dolist (postit postits)
       (emit-back-patch segment 0 postit)))
-  #!-x86 (emit-alignment segment nil max-alignment)
-  #!+x86 (emit-alignment segment nil max-alignment #x90)
+  (emit-alignment segment nil max-alignment #!+(or x86-64 x86) #x90)
   (let ((segment-current-index-0 (segment-current-index segment))
 	(segment-current-posn-0  (segment-current-posn  segment)))
     (incf (segment-current-index segment)