X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fassem.lisp;h=401d9a509e9c00ddcf72be8f40688be916b8de25;hb=66ee499237be5778b44b0d7b2de396562137228e;hp=867cf4fb2604983c6988c526370283d615b39333;hpb=673e63b95a69cf596526c675793465f4faf2c189;p=sbcl.git diff --git a/src/compiler/assem.lisp b/src/compiler/assem.lisp index 867cf4f..401d9a5 100644 --- a/src/compiler/assem.lisp +++ b/src/compiler/assem.lisp @@ -107,7 +107,7 @@ #!+sb-dyncount (collect-dynamic-statistics nil)) (sb!c::defprinter (segment) - name) + type) (declaim (inline segment-current-index)) (defun segment-current-index (segment) @@ -703,14 +703,16 @@ (def!struct (alignment-note (:include annotation) (:conc-name alignment-) (:predicate alignment-p) - (:constructor make-alignment (bits size fill-byte)) + (:constructor make-alignment (bits size pattern)) (:copier nil)) ;; the minimum number of low-order bits that must be zero (bits 0 :type alignment) ;; the amount of filler we are assuming this alignment op will take (size 0 :type (integer 0 #.(1- (ash 1 max-alignment)))) - ;; the byte used as filling - (fill-byte 0 :type (or assembly-unit (signed-byte #.assembly-unit-bits)))) + ;; the byte used as filling or :LONG-NOP, indicating to call EMIT-LONG-NOP + ;; to emit a filling pattern + (pattern 0 :type (or possibly-signed-assembly-unit + (member :long-nop)))) ;;; a reference to someplace that needs to be back-patched when ;;; we actually know what label positions, etc. are @@ -765,12 +767,18 @@ (incf (segment-current-posn segment)) (values)) -;;; interface: Output AMOUNT copies of FILL-BYTE to SEGMENT. -(defun emit-skip (segment amount &optional (fill-byte 0)) +;;; interface: Output AMOUNT bytes to SEGMENT, either copies of +;;; PATTERN (if that is an integer), or by calling EMIT-LONG-NOP +;;; (if PATTERN is :LONG-NOP). +(defun emit-skip (segment amount &optional (pattern 0)) (declare (type segment segment) (type index amount)) - (dotimes (i amount) - (emit-byte segment fill-byte)) + (etypecase pattern + (integer + (dotimes (i amount) + (emit-byte segment pattern))) + ((eql :long-nop) + (sb!vm:emit-long-nop segment amount))) (values)) ;;; This is used to handle the common parts of annotation emission. We @@ -851,10 +859,23 @@ ;;; This is used internally whenever a chooser or alignment decides it ;;; doesn't need as much space as it originally thought. +;;; This function used to extend an existing filler instead of creating +;;; a new one when the previous segment annotation was a filler. Now +;;; this is only done if the previous filler is immediately adjacent +;;; to the new one in the segment, too. To see why this restriction is +;;; necessary, consider a jump followed by an alignment made of +;;; multi-byte NOPs when both are shrunk: The shortened alignment is +;;; reemitted at its original _start_ position but the joined filler +;;; would extend over this position and instead leave a subsequence of +;;; the segment up to the alignment's original _end_ position visible. (defun emit-filler (segment n-bytes) (declare (type index n-bytes)) (let ((last (segment-last-annotation segment))) - (cond ((and last (filler-p (car last))) + (cond ((and last + (filler-p (car last)) + (= (+ (filler-index (car last)) + (filler-bytes (car last))) + (segment-current-index segment))) (incf (filler-bytes (car last)) n-bytes)) (t (emit-annotation segment (make-filler n-bytes))))) @@ -875,11 +896,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 (pattern 0)) (when (segment-run-scheduler segment) (schedule-pending-instructions segment)) (let ((hook (segment-inst-hook segment))) @@ -894,24 +915,24 @@ ;; alignment note to cover the rest. (let ((slop (logand offset (1- (ash 1 alignment))))) (unless (zerop slop) - (emit-skip segment (- (ash 1 alignment) slop) fill-byte))) + (emit-skip segment (- (ash 1 alignment) slop) pattern))) (let ((size (logand (1- (ash 1 bits)) (lognot (1- (ash 1 alignment)))))) (aver (> size 0)) - (emit-annotation segment (make-alignment bits size fill-byte)) - (emit-skip segment size fill-byte)) + (emit-annotation segment (make-alignment bits size pattern)) + (emit-skip segment size pattern)) (setf (segment-alignment segment) bits) (setf (segment-sync-posn segment) (segment-current-posn segment))) (t - ;; The last alignment was more restrictive then this one. + ;; The last alignment was more restrictive than this one. ;; So we can just figure out how much noise to emit ;; assuming the last alignment was met. (let* ((mask (1- (ash 1 bits))) (new-offset (logand (+ offset mask) (lognot mask)))) - (emit-skip segment (- new-offset offset) fill-byte)) + (emit-skip segment (- new-offset offset) pattern)) ;; But we emit an alignment with size=0 so we can verify ;; that everything works. - (emit-annotation segment (make-alignment bits 0 fill-byte))))) + (emit-annotation segment (make-alignment bits 0 pattern))))) (values)) ;;; This is used to find how ``aligned'' different offsets are. @@ -999,8 +1020,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-pattern note)) (let* ((new-index (segment-current-index segment)) (size (- new-index index)) (old-size (alignment-size note)) @@ -1049,6 +1070,11 @@ (with-modified-segment-index-and-posn (segment (alignment-index note) posn) + (when (eql (alignment-pattern note) :long-nop) + ;; We need to re-emit the alignment because a shorter + ;; multi-byte NOP pattern is most of the time not a + ;; prefix of a longer one. + (emit-skip segment size (alignment-pattern note))) (emit-filler segment additional-delta) (setf prev (segment-last-annotation segment)) (if prev @@ -1145,97 +1171,63 @@ ;;; solutions and maybe even good solutions, but I'm disinclined to ;;; hunt for good solutions until the system works and I can test them ;;; in isolation. -(sb!int:def!macro assemble ((&optional segment vop &key labels) &body body - &environment env) - #!+sb-doc - "Execute BODY (as a progn) with SEGMENT as the current segment." - (flet ((label-name-p (thing) - (and thing (symbolp thing)))) - (let* ((seg-var (gensym "SEGMENT-")) - (vop-var (gensym "VOP-")) - (visible-labels (remove-if-not #'label-name-p body)) - (inherited-labels - (multiple-value-bind (expansion expanded) - (macroexpand '..inherited-labels.. env) - (if expanded expansion nil))) - (new-labels (append labels - (set-difference visible-labels - inherited-labels))) - (nested-labels (set-difference (append inherited-labels new-labels) - visible-labels))) - (when (intersection labels inherited-labels) - (error "duplicate nested labels: ~S" - (intersection labels inherited-labels))) - `(let* ((,seg-var ,(or segment '(%%current-segment%%))) - (,vop-var ,(or vop '(%%current-vop%%))) - ,@(when segment - `((**current-segment** ,seg-var))) - ,@(when vop - `((**current-vop** ,vop-var))) - ,@(mapcar (lambda (name) - `(,name (gen-label))) - new-labels)) - (declare (ignorable ,vop-var ,seg-var) - ;; Must be done so that contribs and user code doing - ;; low-level stuff don't need to worry about this. - (disable-package-locks %%current-segment%% %%current-vop%%)) - (macrolet ((%%current-segment%% () ',seg-var) - (%%current-vop%% () ',vop-var)) - ;; KLUDGE: Some host lisps (CMUCL 18e Sparc at least) - ;; can't deal with this declaration, so disable it on host. - ;; Ditto for later ENABLE-PACKAGE-LOCKS %%C-S%% declaration. - #-sb-xc-host - (declare (enable-package-locks %%current-segment%% %%current-vop%%)) - (symbol-macrolet (,@(when (or inherited-labels nested-labels) - `((..inherited-labels.. ,nested-labels)))) - ,@(mapcar (lambda (form) - (if (label-name-p form) - `(emit-label ,form) - form)) - body))))))) -#+sb-xc-host -(sb!xc:defmacro assemble ((&optional segment vop &key labels) - &body body - &environment env) - #!+sb-doc - "Execute BODY (as a progn) with SEGMENT as the current segment." - (flet ((label-name-p (thing) - (and thing (symbolp thing)))) - (let* ((seg-var (gensym "SEGMENT-")) - (vop-var (gensym "VOP-")) - (visible-labels (remove-if-not #'label-name-p body)) - (inherited-labels - (multiple-value-bind - (expansion expanded) - (sb!xc:macroexpand '..inherited-labels.. env) - (if expanded expansion nil))) - (new-labels (append labels - (set-difference visible-labels - inherited-labels))) - (nested-labels (set-difference (append inherited-labels new-labels) - visible-labels))) - (when (intersection labels inherited-labels) - (error "duplicate nested labels: ~S" - (intersection labels inherited-labels))) - `(let* ((,seg-var ,(or segment '(%%current-segment%%))) - (,vop-var ,(or vop '(%%current-vop%%))) - ,@(when segment - `((**current-segment** ,seg-var))) - ,@(when vop - `((**current-vop** ,vop-var))) - ,@(mapcar (lambda (name) - `(,name (gen-label))) - new-labels)) - (declare (ignorable ,vop-var ,seg-var)) - (macrolet ((%%current-segment%% () ',seg-var) - (%%current-vop%% () ',vop-var)) - (symbol-macrolet (,@(when (or inherited-labels nested-labels) - `((..inherited-labels.. ,nested-labels)))) - ,@(mapcar (lambda (form) - (if (label-name-p form) - `(emit-label ,form) - form)) - body))))))) +;;; +;;; The above comment remains true, except that instead of a cut-and-paste +;;; copy we now have a macrolet. This is charitably called progress. +;;; -- NS 2008-09-19 +(macrolet + ((def (defmacro macroexpand) + `(,defmacro assemble ((&optional segment vop &key labels) &body body + &environment env) + #!+sb-doc + "Execute BODY (as a progn) with SEGMENT as the current segment." + (flet ((label-name-p (thing) + (and thing (symbolp thing)))) + (let* ((seg-var (gensym "SEGMENT-")) + (vop-var (gensym "VOP-")) + (visible-labels (remove-if-not #'label-name-p body)) + (inherited-labels + (multiple-value-bind (expansion expanded) + (,macroexpand '..inherited-labels.. env) + (if expanded expansion nil))) + (new-labels (append labels + (set-difference visible-labels + inherited-labels))) + (nested-labels (set-difference (append inherited-labels new-labels) + visible-labels))) + (when (intersection labels inherited-labels) + (error "duplicate nested labels: ~S" + (intersection labels inherited-labels))) + `(let* ((,seg-var ,(or segment '(%%current-segment%%))) + (,vop-var ,(or vop '(%%current-vop%%))) + ,@(when segment + `((**current-segment** ,seg-var))) + ,@(when vop + `((**current-vop** ,vop-var))) + ,@(mapcar (lambda (name) + `(,name (gen-label))) + new-labels)) + (declare (ignorable ,vop-var ,seg-var) + ;; Must be done so that contribs and user code doing + ;; low-level stuff don't need to worry about this. + (disable-package-locks %%current-segment%% %%current-vop%%)) + (macrolet ((%%current-segment%% () ',seg-var) + (%%current-vop%% () ',vop-var)) + ;; KLUDGE: Some host lisps (CMUCL 18e Sparc at least) + ;; can't deal with this declaration, so disable it on host. + ;; Ditto for later ENABLE-PACKAGE-LOCKS %%C-S%% declaration. + #-sb-xc-host + (declare (enable-package-locks %%current-segment%% %%current-vop%%)) + (symbol-macrolet (,@(when (or inherited-labels nested-labels) + `((..inherited-labels.. ,nested-labels)))) + ,@(mapcar (lambda (form) + (if (label-name-p form) + `(emit-label ,form) + form)) + body))))))))) + (def sb!int:def!macro macroexpand) + #+sb-xc-host + (def sb!xc:defmacro %macroexpand)) (defmacro inst (&whole whole instruction &rest args &environment env) #!+sb-doc @@ -1263,13 +1255,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 (pattern 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 ,pattern)) (defun label-position (label &optional if-after delta) #!+sb-doc @@ -1291,10 +1280,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) @@ -1396,12 +1385,12 @@ total-bits assembly-unit-bits)) quo)) (bytes (make-array num-bytes :initial-element nil)) - (segment-arg (gensym "SEGMENT-"))) + (segment-arg (sb!xc:gensym "SEGMENT-"))) (dolist (byte-spec-expr byte-specs) (let* ((byte-spec (eval byte-spec-expr)) (byte-size (byte-size byte-spec)) (byte-posn (byte-position byte-spec)) - (arg (gensym (format nil "~:@(ARG-FOR-~S-~)" byte-spec-expr)))) + (arg (sb!xc:gensym (format nil "~:@(ARG-FOR-~S-~)" byte-spec-expr)))) (when (ldb-test (byte byte-size byte-posn) overall-mask) (error "The byte spec ~S either overlaps another byte spec, or ~ extends past the end." @@ -1471,7 +1460,7 @@ (defun grovel-lambda-list (lambda-list vop-var) (let ((segment-name (car lambda-list)) - (vop-var (or vop-var (gensym "VOP-")))) + (vop-var (or vop-var (sb!xc:gensym "VOP")))) (sb!int:collect ((new-lambda-list)) (new-lambda-list segment-name) (new-lambda-list vop-var) @@ -1494,8 +1483,8 @@ (values (first param) (second param) (or (third param) - (gensym "SUPPLIED-P-"))) - (values param nil (gensym "SUPPLIED-P-"))) + (sb!xc:gensym "SUPPLIED-P-"))) + (values param nil (sb!xc:gensym "SUPPLIED-P-"))) (new-lambda-list (list name default supplied-p)) `(and ,supplied-p (cons ,(if (consp name) @@ -1508,8 +1497,8 @@ (values (first param) (second param) (or (third param) - (gensym "SUPPLIED-P-"))) - (values param nil (gensym "SUPPLIED-P-"))) + (sb!xc:gensym "SUPPLIED-P-"))) + (values param nil (sb!xc:gensym "SUPPLIED-P-"))) (new-lambda-list (list name default supplied-p)) (multiple-value-bind (key var) (if (consp name) @@ -1584,7 +1573,8 @@ (push (eval `(list (multiple-value-list ,(sb!disassem:gen-printer-def-forms-def-form name - (format nil "~@:(~A[~A]~)" name args) + (let ((*print-right-margin* 1000)) + (format nil "~@:(~A[~A]~)" name args)) (cdr option-spec))))) pdefs)) (:printer-list @@ -1597,7 +1587,8 @@ `(multiple-value-list ,(sb!disassem:gen-printer-def-forms-def-form ',name - (format nil "~@:(~A[~A]~)" ',name printer) + (let ((*print-right-margin* 1000)) + (format nil "~@:(~A[~A]~)" ',name printer)) printer nil))) ,(cadr option-spec)))))