Changeset 12242 for branches


Ignore:
Timestamp:
Jun 10, 2009, 1:49:55 PM (11 years ago)
Author:
gz
Message:

r11384 r11391 r11586 r12037 from trunk

Location:
branches/working-0711/ccl
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/compiler/nx0.lisp

    r12236 r12242  
    12971297                                 (%ilsl $vbitpuntable 1)
    12981298                                 (%i- varbits varcount)))
     1299          (setf (var-refs var) (+ (var-refs var) (var-refs boundto)))
    12991300          (nx-set-var-bits
    13001301           boundto
     
    18011802                (progn
    18021803                  (when (not inherited-p)
    1803                     (nx-set-var-bits info (%ilogior2 (%ilsl $vbitreffed 1) (nx-var-bits info)))
    1804                     (nx-adjust-ref-count info))
     1804                    (nx-set-var-bits info (%ilogior2 (%ilsl $vbitreffed 1) (nx-var-bits info))))
     1805                  (nx-adjust-ref-count info)
    18051806                  (make-acode (%nx1-operator lexical-reference) info)))
    18061807              (make-acode
     
    18341835
    18351836(defun nx1-whine (about &rest forms)
    1836   (if #-BOOTSTRAPPED (fboundp 'compiler-warning-source-note) #+BOOTSTRAPPED T
    1837     (push (make-condition (or (cdr (assq about *compiler-whining-conditions*)) 'compiler-warning)
    1838                           :function-name (list *nx-cur-func-name*)
    1839                           :source-note *nx-current-note*
    1840                           :warning-type about
    1841                           :args (or forms (list nil)))
    1842           *nx-warnings*)
    1843    
    1844     (push (make-condition (or (cdr (assq about *compiler-whining-conditions*)) 'compiler-warning)
    1845                           :function-name (list *nx-cur-func-name*)
    1846                           :warning-type about
    1847                           :args (or forms (list nil)))
    1848           *nx-warnings*))
    1849   nil)
     1837  (push (make-condition (or (cdr (assq about *compiler-whining-conditions*)) 'compiler-warning)
     1838                        :function-name (list *nx-cur-func-name*)
     1839                        :source-note *nx-current-note*
     1840                        :warning-type about
     1841                        :args (or forms (list nil)))
     1842        *nx-warnings*))
    18501843
    18511844(defun p2-whine (afunc about &rest forms)
     
    19321925                                 (nx-error . 0)
    19331926                                 (compiler-bug . 0)))
    1934 
    1935 #-BOOTSTRAPPED (unless (fboundp 'nx1-check-format-call) (fset 'nx1-check-format-call (lambda (&rest x) (declare (ignore x)))))
    19361927
    19371928;;; Wimpy.
     
    24122403         (by (if temp-p 1 (expt  4 *nx-loop-nesting-level*)))
    24132404         (new (%imin (%i+ (%ilogand2 $vrefmask bits) by) 255)))
     2405    (setf (var-refs var) (+ (var-refs var) by))
    24142406    (nx-set-var-bits var (%ilogior (%ilogand (%ilognot $vrefmask) bits) new))
    24152407    new))
  • branches/working-0711/ccl/compiler/nx1.lisp

    r12073 r12242  
    14011401         (vals ())
    14021402         (register-spec-seen nil)
    1403          (monitor (eq (car arg-specs-and-result-spec) :monitor-exception-ports))
    14041403         (arg-specs (butlast arg-specs-and-result-spec))
    14051404         (result-spec (car (last arg-specs-and-result-spec))))
    1406     (if monitor
    1407       (setq arg-specs (cdr arg-specs)))
    14081405    (unless (evenp (length arg-specs))
    14091406      (error "odd number of arg-specs"))
     
    14331430                (mapcar #'nx1-form (nreverse vals))
    14341431                result-spec
    1435                 monitor)))
     1432                nil)))
    14361433 
    14371434(defnx1 nx1-block block (blockname &body forms)
  • branches/working-0711/ccl/compiler/nxenv.lisp

    r12073 r12242  
    573573    (when catchp
    574574      (nx-set-var-bits var (%ilogior2 bits (%ilsl $vbitnoreg 1))))
     575    (setf (var-refs var) (+ (the fixnum (var-refs var)) by))
    575576    new))
    576577
  • branches/working-0711/ccl/level-1/l1-reader.lisp

    r12236 r12242  
    31783178                      ((consp prev) (cons note prev))
    31793179                      (t (list note prev))))
    3180           (loop for sub in subform-notes as subnote = (require-type sub 'source-note)
     3180          (loop for subnote in subform-notes
    31813181            do (when (source-note-source subnote) (error "Subnote ~s already owned?" subnote))
    31823182            do (setf (source-note-source subnote) note))
  • branches/working-0711/ccl/lib/nfcomp.lisp

    r12154 r12242  
    4444(require "X8664-ARCH")
    4545) ;eval-when (:compile-toplevel :execute)
    46 
    47 ;; Temp, for loading into a lisp that doesn't have the report-deferred-warnings change
    48 ;; in level-1 yet.
    49 #-BOOTSTRAPPED (when (eql 0 (ldb $lfbits-numopt (lfun-bits #'report-deferred-warnings)))
    50                  (%fhave 'report-deferred-warnings (lambda (&optional x) x nil)))
    5146
    5247
  • branches/working-0711/ccl/xdump/xfasload.lisp

    r12075 r12242  
    18051805         (any (not (null force)))
    18061806         (outpath (merge-pathnames dir (backend-target-fasl-pathname backend)))
    1807          (*nx-speed* 1)
    1808          (*nx-safety* 1))
     1807         (*nx-speed* (max 1 *nx-speed*))
     1808         (*nx-safety* (min 1 *nx-safety*)))
    18091809    (in-development-mode
    18101810     (dolist (src (sort (directory (merge-pathnames dir "*.lisp"))
Note: See TracChangeset for help on using the changeset viewer.