X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fassem.lisp;h=83c2157c41d87e51a6cafb87021c7a8fe18fb277;hb=dfa55a883f94470267b626dae77ce7e7dfac3df6;hp=83c957c4f88430dd7119cb2aaf658948162f3873;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git diff --git a/src/compiler/assem.lisp b/src/compiler/assem.lisp index 83c957c..83c2157 100644 --- a/src/compiler/assem.lisp +++ b/src/compiler/assem.lisp @@ -25,7 +25,7 @@ ;;;; the SEGMENT structure ;;; This structure holds the state of the assembler. -(defstruct segment +(defstruct (segment (:copier nil)) ;; the name of this segment (for debugging output and stuff) (name "Unnamed" :type simple-base-string) ;; Ordinarily this is a vector where instructions are written. If @@ -146,7 +146,8 @@ (defstruct (instruction (:include sset-element) (:conc-name inst-) - (:constructor make-instruction (number emitter attributes delay))) + (:constructor make-instruction (number emitter attributes delay)) + (:copier nil)) ;; The function to envoke to actually emit this instruction. Gets called ;; with the segment as its one argument. (emitter (required-argument) :type (or null function)) @@ -310,12 +311,12 @@ (inst-write-dependencies inst)) (writes write)) (writes))) - (assert (segment-run-scheduler segment)) + (aver (segment-run-scheduler segment)) (let ((countdown (segment-branch-countdown segment))) (when countdown (decf countdown) - (assert (not (instruction-attributep (inst-attributes inst) - variable-length)))) + (aver (not (instruction-attributep (inst-attributes inst) + variable-length)))) (cond ((instruction-attributep (inst-attributes inst) branch) (unless countdown (setf countdown (inst-delay inst))) @@ -335,7 +336,7 @@ ;;; instructions would sit there until the scheduler was turned back ;;; on, and emitted in the wrong place). (defun schedule-pending-instructions (segment) - (assert (segment-run-scheduler segment)) + (aver (segment-run-scheduler segment)) ;; Quick blow-out if nothing to do. (when (and (sset-empty (segment-emittable-insts-sset segment)) @@ -564,8 +565,8 @@ p ;; the branch has two dependents and one of them dpends on ;;; remove this instruction from their dependents list. If we were the ;;; last dependent, then that dependency can be emitted now. (defun note-resolved-dependencies (segment inst) - (assert (sset-empty (inst-read-dependents inst))) - (assert (sset-empty (inst-write-dependents inst))) + (aver (sset-empty (inst-read-dependents inst))) + (aver (sset-empty (inst-write-dependents inst))) (do-sset-elements (dep (inst-write-dependencies inst)) ;; These are the instructions who have to be completed before our ;; write fires. Doesn't matter how far before, just before. @@ -627,14 +628,16 @@ p ;; the branch has two dependents and one of them dpends on ;;;; structure used during output emission ;;; common supertype for all the different kinds of annotations -(defstruct (annotation (:constructor nil)) +(defstruct (annotation (:constructor nil) + (:copier nil)) ;; Where in the raw output stream was this annotation emitted. (index 0 :type index) ;; What position does that correspond to. (posn nil :type (or index null))) (defstruct (label (:include annotation) - (:constructor gen-label ())) + (:constructor gen-label ()) + (:copier nil)) ;; (doesn't need any additional information beyond what is in the ;; annotation structure) ) @@ -649,7 +652,8 @@ p ;; the branch has two dependents and one of them dpends on (:include annotation) (:conc-name alignment-) (:predicate alignment-p) - (:constructor make-alignment (bits size fill-byte))) + (:constructor make-alignment (bits size fill-byte)) + (: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. @@ -661,7 +665,8 @@ p ;; the branch has two dependents and one of them dpends on ;;; we actually know what label positions, etc. are (defstruct (back-patch (:include annotation) - (:constructor make-back-patch (size function))) + (:constructor make-back-patch (size function)) + (:copier nil)) ;; The area effected by this back-patch. (size 0 :type index) ;; The function to use to generate the real data @@ -674,41 +679,37 @@ p ;; the branch has two dependents and one of them dpends on (defstruct (chooser (:include annotation) (:constructor make-chooser - (size alignment maybe-shrink worst-case-fun))) - ;; the worst case size for this chooser. There is this much space allocated - ;; in the output buffer. + (size alignment maybe-shrink worst-case-fun)) + (:copier nil)) + ;; the worst case size for this chooser. There is this much space + ;; allocated in the output buffer. (size 0 :type index) ;; the worst case alignment this chooser is guaranteed to preserve (alignment 0 :type alignment) - ;; the function to call to determine of we can use a shorter sequence. It - ;; returns NIL if nothing shorter can be used, or emits that sequence and - ;; returns T. + ;; the function to call to determine of we can use a shorter + ;; sequence. It returns NIL if nothing shorter can be used, or emits + ;; that sequence and returns T. (maybe-shrink nil :type function) - ;; the function to call to generate the worst case sequence. This is used - ;; when nothing else can be condensed. + ;; the function to call to generate the worst case sequence. This is + ;; used when nothing else can be condensed. (worst-case-fun nil :type function)) -;;; This is used internally when we figure out a chooser or alignment doesn't -;;; really need as much space as we initially gave it. +;;; This is used internally when we figure out a chooser or alignment +;;; doesn't really need as much space as we initially gave it. (defstruct (filler (:include annotation) - (:constructor make-filler (bytes))) + (:constructor make-filler (bytes)) + (:copier nil)) ;; the number of bytes of filler here (bytes 0 :type index)) ;;;; output functions -;;; interface: Emit the supplied BYTE to SEGMENT, growing SEGMENT if necessary. +;;; interface: Emit the supplied BYTE to SEGMENT, growing SEGMENT if +;;; necessary. (defun emit-byte (segment byte) (declare (type segment segment)) - ;; We could use DECLARE instead of CHECK-TYPE here, but (1) CMU CL's - ;; inspired decision to treat DECLARE as ASSERT by default has not - ;; been copied by other compilers, and this code runs in the - ;; cross-compilation host Common Lisp, not just CMU CL, and (2) - ;; classic CMU CL allowed more things here than this, and I haven't - ;; tried to proof-read all the calls to EMIT-BYTE to ensure that - ;; they're passing appropriate. -- WHN 19990323 - (check-type byte possibly-signed-assembly-unit) + (declare (type possibly-signed-assembly-unit byte)) (vector-push-extend (logand byte assembly-unit-mask) (segment-buffer segment)) (incf (segment-current-posn segment)) @@ -845,7 +846,7 @@ p ;; the branch has two dependents and one of them dpends on (emit-skip segment (- (ash 1 alignment) slop) fill-byte))) (let ((size (logand (1- (ash 1 bits)) (lognot (1- (ash 1 alignment)))))) - (assert (> size 0)) + (aver (> size 0)) (emit-annotation segment (make-alignment bits size fill-byte)) (emit-skip segment size fill-byte)) (setf (segment-alignment segment) bits) @@ -990,7 +991,7 @@ p ;; the branch has two dependents and one of them dpends on (size (- new-posn posn)) (old-size (alignment-size note)) (additional-delta (- old-size size))) - (assert (<= 0 size old-size)) + (aver (<= 0 size old-size)) (unless (zerop additional-delta) (setf (segment-last-annotation segment) prev) (incf delta additional-delta) @@ -1379,7 +1380,7 @@ p ;; the branch has two dependents and one of them dpends on (let ((forms nil)) (dotimes (i num-bytes) (let ((pieces (svref bytes i))) - (assert pieces) + (aver pieces) (push `(emit-byte ,segment-arg ,(if (cdr pieces) `(logior ,@pieces) @@ -1437,8 +1438,7 @@ p ;; the branch has two dependents and one of them dpends on (multiple-value-bind (key var) (if (consp name) (values (first name) (second name)) - (values (intern (symbol-name name) :keyword) - name)) + (values (keywordicate name) name)) `(append (and ,supplied-p (list ',key ,var)) ,(grovel state (cdr lambda-list)))))) (&rest