1.0.20.15: rename SB-ASSEM:ALIGN to EMIT-ALIGNMENT

 * ...and EMIT-ALIGNMENT to %EMIT-ALIGNMENT, as per FIXME.

 * Also a missing SEGMENT-NAME -> SEGMENT-TYPE change from 1.0.20.13.

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 67f8c7c..2cb78b8 100644 (file)
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -125,13 +125,13 @@ of SBCL which maintained the CMU-CL-style split into two packages.)"
                "*ASSEM-INSTRUCTIONS*"
                "*ASSEM-MAX-LOCATIONS*"
 
-               "EMIT-BYTE" "EMIT-SKIP" "EMIT-BACK-PATCH"
+               "EMIT-ALIGNMENT" "EMIT-BYTE" "EMIT-SKIP" "EMIT-BACK-PATCH"
                "EMIT-CHOOSER" "DEFINE-BITFIELD-EMITTER"
                "DEFINE-INSTRUCTION" "DEFINE-INSTRUCTION-MACRO"
                "DEF-ASSEMBLER-PARAMS" "EMIT-POSTIT"
 
-               "MAKE-SEGMENT" "SEGMENT-NAME" "ASSEMBLE"
-               "ALIGN" "INST" "LABEL" "LABEL-P" "GEN-LABEL"
+               "MAKE-SEGMENT" "SEGMENT-TYPE" "ASSEMBLE"
+               "INST" "LABEL" "LABEL-P" "GEN-LABEL"
                "EMIT-LABEL" "LABEL-POSITION" "APPEND-SEGMENT" "FINALIZE-SEGMENT"
                "ON-SEGMENT-CONTENTS-VECTORLY" "WRITE-SEGMENT-CONTENTS"
                "READS" "WRITES" "SEGMENT"

diff --git a/src/compiler/alpha/call.lisp b/src/compiler/alpha/call.lisp
index 467d670..d62f5bd 100644 (file)
--- a/src/compiler/alpha/call.lisp
+++ b/src/compiler/alpha/call.lisp
@@ -131,7 +131,7 @@
   (:generator 1
     ;; Make sure the function is aligned, and drop a label pointing to
     ;; this function header.
-    (align n-lowtag-bits)
+    (emit-alignment n-lowtag-bits)
     (trace-table-entry trace-table-fun-prologue)
     (emit-label start-lab)
     ;; Allocate function header.

diff --git a/src/compiler/alpha/macros.lisp b/src/compiler/alpha/macros.lisp
index 0982d6e..513f9e2 100644 (file)
--- a/src/compiler/alpha/macros.lisp
+++ b/src/compiler/alpha/macros.lisp
@@ -108,7 +108,7 @@
   "Emit a return-pc header word.  LABEL is the label to use for this
    return-pc."
   `(progn
-     (align n-lowtag-bits)
+     (emit-alignment n-lowtag-bits)
      (emit-label ,label)
      (inst lra-header-word)))
 
@@ -207,7 +207,7 @@
           (inst byte (length ,vector))
           (dotimes (i (length ,vector))
             (inst byte (aref ,vector i))))
-        (align word-shift)))))
+        (emit-alignment word-shift)))))
 
 (defmacro error-call (vop error-code &rest values)
   "Cause an error.  ERROR-CODE is the error to cause."

diff --git a/src/compiler/assem.lisp b/src/compiler/assem.lisp
index 867cf4f..b351d46 100644 (file)
--- a/src/compiler/assem.lisp
+++ b/src/compiler/assem.lisp
@@ -875,11 +875,11 @@
       (funcall hook segment vop :label label)))
   (emit-annotation segment label))
 
-;;; Called by the ALIGN macro to emit an alignment note. We check to
-;;; see if we can guarantee the alignment restriction by just
-;;; outputting a fixed number of bytes. If so, we do so. Otherwise, we
-;;; create and emit an alignment note.
-(defun emit-alignment (segment vop bits &optional (fill-byte 0))
+;;; Called by the EMIT-ALIGNMENT macro to emit an alignment note. We check to
+;;; see if we can guarantee the alignment restriction by just outputting a
+;;; fixed number of bytes. If so, we do so. Otherwise, we create and emit an
+;;; alignment note.
+(defun %emit-alignment (segment vop bits &optional (fill-byte 0))
   (when (segment-run-scheduler segment)
     (schedule-pending-instructions segment))
   (let ((hook (segment-inst-hook segment)))
@@ -999,8 +999,8 @@
               (let ((index (alignment-index note)))
                 (with-modified-segment-index-and-posn (segment index posn)
                   (setf (segment-last-annotation segment) prev)
-                  (emit-alignment segment nil (alignment-bits note)
-                                  (alignment-fill-byte note))
+                  (%emit-alignment segment nil (alignment-bits note)
+                                   (alignment-fill-byte note))
                   (let* ((new-index (segment-current-index segment))
                          (size (- new-index index))
                          (old-size (alignment-size note))
@@ -1263,13 +1263,10 @@
 ;;; Note: The need to capture SYMBOL-MACROLET bindings of
 ;;; **CURRENT-SEGMENT* and (%%CURRENT-VOP%%) prevents this from being an
 ;;; ordinary function.
-(defmacro align (bits &optional (fill-byte 0))
+(defmacro emit-alignment (bits &optional (fill-byte 0))
   #!+sb-doc
   "Emit an alignment restriction to the current segment."
-  `(emit-alignment (%%current-segment%%) (%%current-vop%%) ,bits ,fill-byte))
-;;; FIXME: By analogy with EMIT-LABEL and EMIT-POSTIT, this should be
-;;; called EMIT-ALIGNMENT, and the function that it calls should be
-;;; called %EMIT-ALIGNMENT.
+  `(%emit-alignment (%%current-segment%%) (%%current-vop%%) ,bits ,fill-byte))
 
 (defun label-position (label &optional if-after delta)
   #!+sb-doc
@@ -1291,10 +1288,10 @@
     (dolist (postit postits)
       (emit-back-patch segment 0 postit)))
   #!-(or x86 x86-64)
-  (emit-alignment segment nil max-alignment)
+  (%emit-alignment segment nil max-alignment)
   #!+(or x86 x86-64)
   (unless (eq :elsewhere (segment-type other-segment))
-    (emit-alignment segment nil max-alignment))
+    (%emit-alignment segment nil max-alignment))
   (let ((segment-current-index-0 (segment-current-index segment))
         (segment-current-posn-0  (segment-current-posn  segment)))
     (incf (segment-current-index segment)

diff --git a/src/compiler/codegen.lisp b/src/compiler/codegen.lisp
index da07167..1426716 100644 (file)
--- a/src/compiler/codegen.lisp
+++ b/src/compiler/codegen.lisp
@@ -68,7 +68,7 @@
 (defun trace-instruction (segment vop inst args)
   (let ((*standard-output* *compiler-trace-output*))
     (unless (eq *prev-segment* segment)
-      (format t "in the ~A segment:~%" (sb!assem:segment-name segment))
+      (format t "in the ~A segment:~%" (sb!assem:segment-type segment))
       (setf *prev-segment* segment))
     (unless (eq *prev-vop* vop)
       (when vop

diff --git a/src/compiler/hppa/call.lisp b/src/compiler/hppa/call.lisp
index 94d6997..45bc167 100644 (file)
--- a/src/compiler/hppa/call.lisp
+++ b/src/compiler/hppa/call.lisp
@@ -133,7 +133,7 @@
   (:generator 1
     ;; Make sure the function is aligned, and drop a label pointing to this
     ;; function header.
-    (align n-lowtag-bits)
+    (emit-alignment n-lowtag-bits)
     (trace-table-entry trace-table-fun-prologue)
     (emit-label start-lab)
     ;; Allocate function header.

diff --git a/src/compiler/hppa/macros.lisp b/src/compiler/hppa/macros.lisp
index 5a28295..52b4e4b 100644 (file)
--- a/src/compiler/hppa/macros.lisp
+++ b/src/compiler/hppa/macros.lisp
@@ -80,7 +80,7 @@
   "Emit a return-pc header word.  LABEL is the label to use for this
    return-pc."
   `(progn
-     (align n-lowtag-bits)
+     (emit-alignment n-lowtag-bits)
      (emit-label ,label)
      (inst lra-header-word)))
 
@@ -157,7 +157,7 @@
           (inst byte (length ,vector))
           (dotimes (i (length ,vector))
             (inst byte (aref ,vector i))))
-        (align word-shift)))))
+        (emit-alignment word-shift)))))
 
 (defmacro error-call (vop error-code &rest values)
   "Cause an error.  ERROR-CODE is the error to cause."

diff --git a/src/compiler/mips/call.lisp b/src/compiler/mips/call.lisp
index 7ed79a6..af2d65d 100644 (file)
--- a/src/compiler/mips/call.lisp
+++ b/src/compiler/mips/call.lisp
@@ -137,7 +137,7 @@
   (:generator 1
     ;; Make sure the function is aligned, and drop a label pointing to this
     ;; function header.
-    (align n-lowtag-bits)
+    (emit-alignment n-lowtag-bits)
     (trace-table-entry trace-table-fun-prologue)
     (emit-label start-lab)
     ;; Allocate function header.

diff --git a/src/compiler/mips/macros.lisp b/src/compiler/mips/macros.lisp
index 1598bc6..1a1e3d3 100644 (file)
--- a/src/compiler/mips/macros.lisp
+++ b/src/compiler/mips/macros.lisp
@@ -103,7 +103,7 @@ byte-ordering issues."
   #!+sb-doc
   "Emit a return-pc header word.  LABEL is the label to use for this return-pc."
   `(progn
-     (align n-lowtag-bits)
+     (emit-alignment n-lowtag-bits)
      (emit-label ,label)
      (inst lra-header-word)))
 
@@ -237,7 +237,7 @@ placed inside the PSEUDO-ATOMIC, and presumably initializes the object."
           (inst byte (length ,vector))
           (dotimes (i (length ,vector))
             (inst byte (aref ,vector i))))
-        (align word-shift)))))
+        (emit-alignment word-shift)))))
 
 (defmacro error-call (vop error-code &rest values)
   #!+sb-doc

diff --git a/src/compiler/ppc/call.lisp b/src/compiler/ppc/call.lisp
index d0f6b01..e8cfc9a 100644 (file)
--- a/src/compiler/ppc/call.lisp
+++ b/src/compiler/ppc/call.lisp
@@ -129,7 +129,7 @@
   (:generator 1
     ;; Make sure the function is aligned, and drop a label pointing to this
     ;; function header.
-    (align n-lowtag-bits)
+    (emit-alignment n-lowtag-bits)
     (trace-table-entry trace-table-fun-prologue)
     (emit-label start-lab)
     ;; Allocate function header.

diff --git a/src/compiler/ppc/macros.lisp b/src/compiler/ppc/macros.lisp
index 6eace04..06f3226 100644 (file)
--- a/src/compiler/ppc/macros.lisp
+++ b/src/compiler/ppc/macros.lisp
@@ -94,7 +94,7 @@
 (defmacro emit-return-pc (label)
   "Emit a return-pc header word.  LABEL is the label to use for this return-pc."
   `(progn
-     (align n-lowtag-bits)
+     (emit-alignment n-lowtag-bits)
      (emit-label ,label)
      (inst lra-header-word)))
 
@@ -271,7 +271,7 @@
           (inst byte (length ,vector))
           (dotimes (i (length ,vector))
             (inst byte (aref ,vector i))))
-        (align word-shift)))))
+        (emit-alignment word-shift)))))
 
 (defmacro error-call (vop error-code &rest values)
   "Cause an error.  ERROR-CODE is the error to cause."

diff --git a/src/compiler/sparc/call.lisp b/src/compiler/sparc/call.lisp
index b869141..8bd2e54 100644 (file)
--- a/src/compiler/sparc/call.lisp
+++ b/src/compiler/sparc/call.lisp
@@ -133,7 +133,7 @@
   (:generator 1
     ;; Make sure the function is aligned, and drop a label pointing to this
     ;; function header.
-    (align n-lowtag-bits)
+    (emit-alignment n-lowtag-bits)
     (trace-table-entry trace-table-fun-prologue)
     (emit-label start-lab)
     ;; Allocate function header.

diff --git a/src/compiler/sparc/macros.lisp b/src/compiler/sparc/macros.lisp
index 5b06d9f..5136a42 100644 (file)
--- a/src/compiler/sparc/macros.lisp
+++ b/src/compiler/sparc/macros.lisp
@@ -94,7 +94,7 @@
 (defmacro emit-return-pc (label)
   "Emit a return-pc header word.  LABEL is the label to use for this return-pc."
   `(progn
-     (align n-lowtag-bits)
+     (emit-alignment n-lowtag-bits)
      (emit-label ,label)
      (inst lra-header-word)))
 
@@ -181,7 +181,7 @@
           (inst byte (length ,vector))
           (dotimes (i (length ,vector))
             (inst byte (aref ,vector i))))
-        (align word-shift)))))
+        (emit-alignment word-shift)))))
 
 (defmacro error-call (vop error-code &rest values)
   "Cause an error.  ERROR-CODE is the error to cause."

diff --git a/src/compiler/x86-64/call.lisp b/src/compiler/x86-64/call.lisp
index 6676cc4..a0ae3a4 100644 (file)
--- a/src/compiler/x86-64/call.lisp
+++ b/src/compiler/x86-64/call.lisp
@@ -123,7 +123,7 @@
   (:info start-lab copy-more-arg-follows)
   (:vop-var vop)
   (:generator 1
-    (align n-lowtag-bits)
+    (emit-alignment n-lowtag-bits)
     (trace-table-entry trace-table-fun-prologue)
     (emit-label start-lab)
     ;; Skip space for the function header.

diff --git a/src/compiler/x86/call.lisp b/src/compiler/x86/call.lisp
index 5c1152a..0ce1982 100644 (file)
--- a/src/compiler/x86/call.lisp
+++ b/src/compiler/x86/call.lisp
@@ -123,7 +123,7 @@
   (:info start-lab copy-more-arg-follows)
   (:vop-var vop)
   (:generator 1
-    (align n-lowtag-bits)
+    (emit-alignment n-lowtag-bits)
     (trace-table-entry trace-table-fun-prologue)
     (emit-label start-lab)
     ;; Skip space for the function header.

diff --git a/version.lisp-expr b/version.lisp-expr
index babdc8f..8d6a56a 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.20.14"
+"1.0.20.15"