Changeset 9879


Ignore:
Timestamp:
Jul 2, 2008, 12:48:36 AM (11 years ago)
Author:
gz
Message:

Propagate r9620 to trunk from working-0711

Location:
trunk/source
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/compiler/X86/x86-backend.lisp

    r7859 r9879  
    5656    (let* ((name (string (car form)))
    5757           (templates (gethash name x86::*x86-opcode-template-lists*)))
    58       (declare (fixnum node-size))
    5958      (when templates
    6059        (flet ((optype (thing)
     
    149148               (error "Duplicate name ~s in vinsn ~s" vname vinsn-name)
    150149               (push vname name-list))))
    151       (declare (dynamic-extent valid-spec-name add-spec-name))
     150      (declare (dynamic-extent #'valid-spec-name #'add-spec-name))
    152151      (when (consp vinsn-name)
    153152        (setq attrs (encode-vinsn-attributes (cdr vinsn-name))
  • trunk/source/compiler/X86/x86-lap.lisp

    r8130 r9879  
    13711371         (code-words (ash code-bytes (- target::word-shift)))
    13721372         (function-vector (allocate-typed-vector :function code-words)))
    1373     (declare (fixnum num-constants code-bytes code-words))
     1373    (declare (fixnum code-bytes code-words))
    13741374    (let* ((target-offset 0))
    13751375      (declare (fixnum target-offset))
  • trunk/source/compiler/X86/x862.lisp

    r9256 r9879  
    49484948        (let* ((num-temp-frames 0)
    49494949               (num-c-frames 0))
    4950           (declare (fixnum numnlispareas num-c-frames))
     4950          (declare (fixnum num-temp-frames num-c-frames))
    49514951          (flet ((pop-temp-frames ()
    49524952                   (dotimes (i num-temp-frames)
     
    55055505           (reserved-lcells nil)
    55065506           (*x862-vstack* 0))
    5507       (declare (type (unsigned-byte 16) num-req num-opt num-inh reqvloc))
     5507      (declare (type (unsigned-byte 16) num-req num-opt num-inh))
    55085508      (with-x86-p2-declarations p2decls
    55095509        (setq *x862-inhibit-register-allocation*
     
    65896589           (*x862-top-vstack-lcell* *x862-top-vstack-lcell*)
    65906590           (nargs (x862-formlist seg (car arglist) (cadr arglist))))
    6591       (declare (fixnum args))
     6591      (declare (fixnum nargs))
    65926592      (when (> nargs 1)
    65936593        (x862-set-nargs seg (1- nargs))
     
    85478547         (ngpr-args 0)
    85488548         (simple-foreign-args nil))
    8549       (declare (fixnum   ngpr-args narg-words
     8549      (declare (fixnum  ngpr-args nother-words
    85508550                        gpr-offset other-offset))
    85518551      (dolist (argspec argspecs)
     
    86478647         (fp-loads ())
    86488648         (return-registers ()))
    8649       (declare (fixnum  nshort-floats ndouble-floats nfpr-args ngpr-args narg-words
     8649      (declare (fixnum  nsingle-floats ndouble-floats nfpr-args ngpr-args nother-words
    86508650                        gpr-offset other-offset single-float-offset double-float-offset))
    86518651      (dolist (argspec argspecs)
  • trunk/source/compiler/nx-basic.lisp

    r9255 r9879  
    500500    (:unknown-declaration . "Unknown declaration ~S")
    501501    (:unknown-type-declaration . "Unknown type ~S")
     502    (:unknown-declaration-variable . "~s declaration for unknown variable ~s")
    502503    (:macro-used-before-definition . "Macro function ~S was used before it was defined.")
    503504    (:unsettable . "Shouldn't assign to variable ~S")
  • trunk/source/compiler/nx0.lisp

    r9867 r9879  
    672672           (%cadr acode-expression)))))
    673673
     674(defun nx-check-vdecl-var-ref (decl)
     675  (unless (eq (cadr decl) 'special)
     676    (let* ((sym (car decl))
     677           (info (nx-lex-info sym)))
     678      (when (or (eq info :symbol-macro)
     679                (and (null info) (not (nx-proclaimed-special-p sym))))
     680        (nx1-whine :unknown-declaration-variable (cadr decl) sym)))))
     681
     682
    674683(defun nx-effect-other-decls (pending env)
    675684  (flet ((merge-decls (new old)
     
    682691          (dolist (decl vdecls (setf (lexenv.vdecls env) env-vdecls))
    683692            (unless (memq decl env-vdecls)
     693              (nx-check-vdecl-var-ref decl)
    684694              (when (eq (cadr decl) 'type)
    685695                (let* ((var (car decl))
  • trunk/source/compiler/vinsn.lisp

    r7941 r9879  
    370370         (*available-backend-crf-temps* *available-backend-crf-temps*))
    371371    (declare (fixnum nvp ntemps nsupp)
    372              (list result-specs temp-specs arg-specs))
     372             (list temp-specs))
    373373    (unless (= nsupp nra)
    374374      (error "Vinsn ~A expects ~D result/argument specs, received ~D ."
     
    611611(defun create-flow-graph (vinsns)
    612612  (let* ((nodes ()))
    613     (declare (fixnum id))
    614613    (flet ((label->fgn (label) (dll-node-pred label)))
    615614      (loop
     
    622621                             (make-condnode id)
    623622                             (make-jumpnode id)))))
     623              (declare (fixnum id))
    624624              (insert-dll-node-after label node last)
    625625              (push node nodes))))
  • trunk/source/level-0/l0-hash.lisp

    r9877 r9879  
    11491149         (vector-index (index->vector-index (fast-mod hash-code (ash count -1))))
    11501150         (table-key (%svref vector vector-index)))
    1151     (declare (fixnum hash-code length count entries vector-index))
     1151    (declare (fixnum hash-code length count vector-index))
    11521152    (if (or (eq key table-key)
    11531153            (eq table-key free-hash-key-marker))
  • trunk/source/level-0/l0-int.lisp

    r5079 r9879  
    125125                    )  ; warn
    126126               (declare (dynamic-extent temstring)
    127                         (fixnum i strlen rem))
     127                        (fixnum i strlen))
    128128               (flet ((do-it (newbig)
    129129                        (print-bignum-2 newbig radix temstring digit-string)))
  • trunk/source/level-0/l0-misc.lisp

    r8579 r9879  
    633633         (level *interrupt-level*)
    634634         (ptr (recursive-lock-ptr lock)))
    635     (declare (fixnum self val))
     635    (declare (fixnum self))
    636636    (note-lock-wait lock)
    637637    (without-interrupts
  • trunk/source/level-0/nfasload.lisp

    r7624 r9879  
    6565         (bufptr (%get-ptr buffer)))
    6666    (declare (dynamic-extent bufptr)
    67              (type macptr buffer bufptr pb))
     67             (type macptr buffer bufptr))
    6868    (%setf-macptr bufptr (%inc-ptr buffer target::node-size))
    6969    (setf (%get-ptr buffer) bufptr)
     
    161161         (n nchars)
    162162         (str (faslstate.faslstr s)))
    163     (declare (fixnum n nbytes))
     163    (declare (fixnum n nchars))
    164164    (if (> n (length str))
    165165        (setq str (make-string n :element-type 'base-char))
     
    197197
    198198(defun %fasl-vmake-symbol (s &optional idx)
    199   (declare (fixnum subtype))
    200199  (let* ((n (%fasl-read-count s))
    201200         (str (make-string n :element-type 'base-char)))
     
    207206
    208207(defun %fasl-nvmake-symbol (s &optional idx)
    209   (declare (fixnum subtype))
    210208  (let* ((n (%fasl-read-count s))
    211209         (str (make-string n :element-type 'base-char)))
     
    551549         (size-in-bytes (* element-count 4))
    552550         (num (%alloc-misc element-count target::subtag-bignum)))
    553     (declare (fixnum subtag element-count size-in-bytes))
     551    (declare (fixnum element-count size-in-bytes))
    554552    (%fasl-read-n-bytes s num 0 size-in-bytes)
    555553    (setq num (%normalize-bignum-2 t num))
  • trunk/source/level-1/l1-clos-boot.lisp

    r9844 r9879  
    24542454
    24552455(defmethod initialize-instance ((instance standard-object) &rest initargs)
    2456   (declare (dynamic-extent ini targs))
     2456  (declare (dynamic-extent initargs))
    24572457  (apply 'shared-initialize instance t initargs))
    24582458
     
    31053105         (new-object (allocate-instance new-class)))
    31063106    (declare (fixnum num-new-instance-slots)
    3107              (simple-vector new-instance-slots old-instance-slots))
     3107             (simple-vector new-instance-slots-vector old-instance-slots-vector))
    31083108    ;; Retain local slots shared between the new class and the old.
    31093109    (do* ((new-pos 0 (1+ new-pos))
    31103110          (new-slot-location 1 (1+ new-slot-location)))
    31113111         ((= new-pos num-new-instance-slots))
    3112       (declare (fixnum new-pos new-slot-vector-pos))
     3112      (declare (fixnum new-pos new-slot-location))
    31133113      (let* ((old-pos (position (svref new-instance-slots-vector new-pos)
    31143114                                old-instance-slots-vector :test #'eq)))
  • trunk/source/level-1/l1-io.lisp

    r8530 r9879  
    688688(defun print-a-float (float stream &optional exp-p nanning)
    689689  (let ((strlen 0) (exponent-char (float-exponent-char float)))
    690     (declare (fixnum exp strlen))
     690    (declare (fixnum strlen))
    691691    (setq stream (real-print-stream stream))
    692692    (if (and (not nanning)(nan-or-infinity-p float))
     
    694694      (multiple-value-bind (string before-pt #|after-pt|#)
    695695                           (flonum-to-string float)
    696         (declare (fixnum before-pt after-pt))
     696        (declare (fixnum before-pt #|after-pt|#))
    697697        (setq strlen (length string))
    698698        (when (minusp (float-sign float))
     
    936936        (i 0 (1+ i)))
    937937       ((= i limit))
    938     (declare (type fixnum last)) (declare (type fixnum limit) (type fixnum i))
     938    (declare (type fixnum limit) (type fixnum i))
    939939    (let* ((char (char string i))
    940940           (needs-escape? (%char-needs-escape-p char #\\ delim)))
     
    10231023                           (return nil))
    10241024                         (setq sofar c-case))))))))
    1025         (declare (dynamic-extent slashify? single-case-p))
     1025        (declare (dynamic-extent #'slashify? #'single-case-p))
    10261026        (block alice
    10271027          (let ((len (length name))
  • trunk/source/level-1/l1-processes.lisp

    r8130 r9879  
    166166                          (allocation-quantum (default-allocation-quantum)))
    167167  "Create and return a new process."
    168   (declare (ignore flavor))
    169168  (let* ((p (make-instance
    170169             class
  • trunk/source/level-1/l1-reader.lisp

    r8930 r9879  
    24032403        (let* ((string (token.string tb))
    24042404               (len (token.opos tb)))
    2405           (declare (fixnum len ndots nondots))
     2405          (declare (fixnum len))
    24062406          (if (not nondots)
    24072407            (if (= len 1)
  • trunk/source/level-1/l1-streams.lisp

    r9831 r9879  
    23762376        (rcf (ioblock-read-char-when-locked-function ioblock)))
    23772377       ((= i end) end)
    2378     (declare (fixnum i need))
     2378    (declare (fixnum i))
    23792379    (let* ((ch (funcall rcf ioblock)))
    23802380      (if (eq ch :eof)
     
    26652665;;; strings.
    26662666(defun %ioblock-write-simple-string-with-newline-translation (ioblock string start-pos num-chars)
    2667   (declare (fixnum start-char num-chars) (simple-string string))
     2667  (declare (fixnum start-pos num-chars) (simple-string string))
    26682668  (let* ((col (ioblock-charpos ioblock))
    26692669         (wcf (ioblock-write-char-when-locked-function ioblock)))
  • trunk/source/level-1/l1-symhash.lisp

    r6196 r9879  
    419419             (ivec (car itab))
    420420             (icount&limit (cdr itab)))
    421         (declare (type cons etab itab icount&limit))
     421        (declare (type cons itab icount&limit))
    422422        (setf (svref evec external-offset) (package-deleted-marker))
    423423        (setf (svref ivec internal-offset) (%symbol->symptr foundsym))
  • trunk/source/level-1/l1-unicode.lisp

    r9593 r9879  
    33323332             (index idx))
    33333333            ((= index end) index)
    3334          (declare (fixnum i len index))
     3334         (declare (fixnum i end index))
    33353335         (let* ((1st-unit (%native-u8-ref-u16 vector index)))
    33363336           (declare (type (unsigned-byte 16) 1st-unit))
     
    33763376             (index idx))
    33773377            ((>= index end) index)
    3378          (declare (fixnum i index p))
     3378         (declare (fixnum i index end))
    33793379         (let* ((1st-unit (%get-unsigned-word pointer index)))
    33803380           (declare (type (unsigned-byte 16) 1st-unit))
     
    34963496           (index idx))
    34973497          ((= index end) index)
    3498        (declare (fixnum i len index))
     3498       (declare (fixnum i end index))
    34993499       (let* ((1st-unit (%reversed-u8-ref-u16 vector index)))
    35003500         (declare (type (unsigned-byte 16) 1st-unit))
     
    35403540           (index idx))
    35413541          ((>= index end) index)
    3542        (declare (fixnum i index p))
     3542       (declare (fixnum i index end))
    35433543       (let* ((1st-unit (%swap-u16 (%get-unsigned-word pointer index))))
    35443544         (declare (type (unsigned-byte 16) 1st-unit))
     
    36733673             (index idx))
    36743674            ((= index end) index)
    3675          (declare (fixnum i len index))
     3675         (declare (fixnum i end index))
    36763676         (let* ((1st-unit (if swap
    36773677                            (%reversed-u8-ref-u16 vector index)
     
    37033703              (highbits (- code #x10000)))
    37043704         (declare (type (mod #x110000) code)
    3705                   (fixnum p highbits))
     3705                  (fixnum highbits))
    37063706         (cond ((< highbits 0)
    37073707                (setf (%get-unsigned-word pointer idx) #+big-endian-target code #+little-endian-target (%swap-u16 code))
     
    37213721   utf-16-memory-decode
    37223722   (lambda (pointer noctets idx string)
    3723      (declare (fixnum nunits idx))
     3723     (declare (fixnum noctets idx))
    37243724     (let* ((swap (when (> noctets 1)
    37253725                    (case (%get-unsigned-word pointer idx)
     
    37373737             (index idx ))
    37383738            ((>= index end) index)
    3739          (declare (fixnum i index p))
     3739         (declare (fixnum i index end))
    37403740         (let* ((1st-unit (%get-unsigned-word pointer index)))
    37413741           (declare (type (unsigned-byte 16) 1st-unit))
     
    38953895           (index idx (+ 2 index)))
    38963896          ((>= index end) index)
    3897        (declare (fixnum i len index))
     3897       (declare (fixnum i end index))
    38983898       (setf (schar string i)
    38993899             (or (code-char (%native-u8-ref-u16 vector index))
     
    39943994           (index idx (+ 2 index)))
    39953995          ((>= index end) index)
    3996        (declare (fixnum i len index))
     3996       (declare (fixnum i end index))
    39973997       (setf (schar string i)
    39983998             (or (code-char (%reversed-u8-ref-u16 vector index))
     
    40944094             (index idx (1+ index)))
    40954095            ((>= index end) index)
    4096          (declare (fixnum i len index))
     4096         (declare (fixnum i end index))
    40974097         (let* ((1st-unit (if swap
    40984098                            (%reversed-u8-ref-u16 vector index)
     
    42994299           (index idx (+ 4 index)))
    43004300          ((>= index end) index)
    4301        (declare (fixnum i len index))
     4301       (declare (fixnum i end index))
    43024302       (let* ((code (%native-u8-ref-u32 vector index)))
    43034303         (declare (type (unsigned-byte 32) code))
     
    43964396           (index idx (+ 4 index)))
    43974397          ((>= index end) index)
    4398        (declare (fixnum i len index))
     4398       (declare (fixnum i end index))
    43994399       (let* ((code (%reversed-u8-ref-u32 vector index)))
    44004400         (declare (type (unsigned-byte 32) code))
     
    44944494             (index idx (1+ index)))
    44954495            ((>= index end) index)
    4496          (declare (fixnum i len index))
     4496         (declare (fixnum i end index))
    44974497         (let* ((1st-unit (if swap
    44984498                            (%reversed-u8-ref-u32 vector index)
  • trunk/source/lib/dumplisp.lisp

    r9831 r9879  
    6666                         )
    6767  (declare (ignore toplevel-function error-handler application-class
    68                    resources clear-clos-caches init-file impurify
     68                   clear-clos-caches init-file impurify
    6969                   mode prepend-kernel))
    7070  (unless (probe-file (make-pathname :defaults nil
  • trunk/source/lib/macros.lisp

    r9831 r9879  
    23532353  (setq mname (require-type mname 'symbol))
    23542354  (let ((state (make-symbol "WITH-PACKAGE-ITERATOR_STATE")))
    2355     (declare (fixnum types))
    23562355    (dolist (type (push first-type other-types))
    23572356      (ecase type
  • trunk/source/lib/number-case-macro.lisp

    r2325 r9879  
    7070                       (append compound selectors-so-far))
    7171                 compound))))
    72       (declare (dynamic-extent maybe-compound))
     72      (declare (dynamic-extent #'maybe-compound))
    7373      `(block ,block
    7474         (tagbody
  • trunk/source/lib/sequences.lisp

    r9786 r9879  
    722722         (maxcnt (seq-dispatch result-sequence (length result-sequence) (array-total-size result-sequence)))
    723723         (rseq result-sequence))
    724     (declare (fixnum cnt nargs maxcnt))
     724    (declare (fixnum nargs maxcnt))
    725725    (declare (dynamic-extent temp))
    726726    ; this declaration is maybe bogus
     
    16821682        (count 0))
    16831683       ((= index end) count)
    1684     (declare (fixnum index count limit))
     1684    (declare (fixnum index count))
    16851685    (when (funcall test item  (funcall key (aref sequence index)))
    16861686      (incf count))))
     
    17011701        (count 0))
    17021702       ((= index end) count)
    1703     (declare (fixnum index count limit))
     1703    (declare (fixnum index count))
    17041704    (unless (funcall test-not item (funcall key (aref sequence index)))
    17051705      (incf count))))
  • trunk/source/lib/x86-backtrace.lisp

    r8130 r9879  
    219219             (p (- (%fixnum-ref fp target::xcf.backptr)
    220220                   (* target::node-size numinh))))
    221         (declare (fixnum numing nargs p))
     221        (declare (fixnum numinh nargs p))
    222222        (collect ((args))
    223223          (dotimes (i nargs (args))
     
    374374                       (ash 1 x8664::save2)
    375375                       (ash 1 x8664::save3))))
    376     (declare (fixnum have need)
     376    (declare (fixnum need)
    377377             (dynamic-extent locations))
    378378    (do* ((parent frame child)
  • trunk/source/xdump/xfasload.lisp

    r9006 r9879  
    491491    (setq subtag (type-keyword-code subtag)))
    492492  (locally
    493       (declare (fixnum subtype len))
     493      (declare (fixnum subtag len))
    494494      (multiple-value-bind (cell-addr data offset)
    495495          (target-word-size-case
     
    501501
    502502(defun xload-make-word-ivector (subtag len space)
    503   (declare (fixnum subtype len))
     503  (declare (fixnum subtag len))
    504504    (multiple-value-bind (cell-addr data offset) (xload-alloc-fullwords space  *xload-target-fulltag-misc* len)
    505505      (declare (fixnum offset))
     
    616616    (setq subtag (type-keyword-code subtag)))
    617617  (locally
    618       (declare (fixnum subtype nelements))
     618      (declare (fixnum subtag nelements))
    619619    (multiple-value-bind (addr v o) (xload-alloc space *xload-target-fulltag-misc* (xload-dnode-align (xload-subtag-bytes subtag nelements)))
    620620      (declare (fixnum o))
     
    815815(defun %xload-fasl-vreadstr (s)
    816816  (multiple-value-bind (str n new-p) (%fasl-vreadstr s)
    817     (declare (fixnum n subtype))
     817    (declare (fixnum n))
    818818    (values (xload-save-string str n) str n new-p)))
    819819
     
    822822(defun %xload-fasl-nvreadstr (s)
    823823  (multiple-value-bind (str n new-p) (%fasl-nvreadstr s)
    824     (declare (fixnum n subtype))
     824    (declare (fixnum n))
    825825    (values (xload-save-string str n) str n new-p)))
    826826
Note: See TracChangeset for help on using the changeset viewer.