X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fassem.lisp;h=5fa14f2d4b3b3392f05f9bcaa0659f7e16c95058;hb=95591ed483dbb8c0846c129953acac1554f28809;hp=b351d466490e89bd893d44a8530b80df9a7805ed;hpb=ca2d58fc8ab92eb5ab50ed4428af4b39866bd5f4;p=sbcl.git diff --git a/src/compiler/assem.lisp b/src/compiler/assem.lisp index b351d46..5fa14f2 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) @@ -1145,97 +1145,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 sb!xc:macroexpand)) (defmacro inst (&whole whole instruction &rest args &environment env) #!+sb-doc @@ -1393,12 +1359,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." @@ -1468,7 +1434,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) @@ -1491,8 +1457,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) @@ -1505,8 +1471,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) @@ -1581,7 +1547,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 @@ -1594,7 +1561,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)))))