Changeset 8521


Ignore:
Timestamp:
Feb 20, 2008, 2:32:55 PM (13 years ago)
Author:
mb
Message:

Make fixes out of my boot straping script and into the source tree.

silly mistake, big time waste...

Location:
branches/mb-coverage-merge
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/mb-coverage-merge/compiler/X86/x862.lisp

    r8519 r8521  
    613613                                      (when (and *compiler-record-source* *definition-source-note*)
    614614                                        (list 'function-source-note 
    615                                               (source-note-for-%lfun-info *definition-source-note* :form nil :children nil)))
     615                                              (source-note-for-%lfun-info *definition-source-note* :form nil :subform-notes nil)))
    616616                                      (when *x862-recorded-symbols*
    617617                                        (list 'function-symbol-map (x862-digest-symbols)))
     
    687687(defun x862-generate-pc-source-map (definition-source-note emitted-source-notes)
    688688  (when *compiler-record-source*
    689     (let ((def-start (source-note-start definition-source-note))
     689    (let ((def-start (source-note-start-pos definition-source-note))
    690690          (vec (make-array (length emitted-source-notes))))
    691691      (loop
     
    693693        for pc-start = (x862-vinsn-note-label-address start t)
    694694        for pc-end   = (x862-vinsn-note-label-address (vinsn-note-peer start) nil)
    695         for text-start = (- (source-note-start (aref (vinsn-note-info start) 0)) def-start)
    696         for text-end = (- (source-note-end (aref (vinsn-note-info start) 0)) def-start)
     695        for text-start = (- (source-note-start-pos (aref (vinsn-note-info start) 0)) def-start)
     696        for text-end = (- (source-note-end-pos (aref (vinsn-note-info start) 0)) def-start)
    697697        for index upfrom 0
    698698        for mapping = (cond
  • branches/mb-coverage-merge/compiler/nx0.lisp

    r8519 r8521  
    16511651                  (when (and note (not (gethash (source-note-form note) map)))
    16521652                    (setf (gethash (source-note-form note) map) note)
    1653                     (walk (source-note-children note))
    1654                     (setf (source-note-children note) '())))
     1653                    (walk (source-note-subform-notes note))
     1654                    (setf (source-note-subform-notes note) '())))
    16551655                 ((null note) '())
    16561656                 (t (error "Don't know how to deal with a source note like ~S."
     
    16581658      (walk source-note))
    16591659    map))
    1660 
    1661 (defun compute-children-text (source-note stream source-note-map)
    1662   (when source-note
    1663     (unless (source-note-%text source-note)
    1664       (setf (source-note-%text source-note)
    1665             (substream stream (source-note-start source-note) (source-note-end source-note))))
    1666     (dolist (nested (source-note-children source-note))
    1667       (when nested
    1668         (unless (source-note-%text nested)
    1669           (setf (source-note-%text nested)
    1670                 (make-array (- (source-note-end nested) (source-note-start nested))
    1671                             :displaced-to (source-note-%text source-note)
    1672                             :displaced-index-offset (- (source-note-start nested)
    1673                                                        (source-note-start source-note)))))
    1674         (setf (gethash (source-note-form nested) source-note-map) nested)
    1675         (compute-children-text nested nil source-note-map))))
    1676   source-note)
    16771660
    16781661(defun nx1-source-note (nx1-code)
  • branches/mb-coverage-merge/level-1/l1-boot-2.lisp

    r8519 r8521  
    267267      (bin-load-provide "DESCRIBE" "describe")
    268268      (bin-load-provide "SOURCE-FILES" "source-files")
    269       (bin-load-provide "COVER" "cover")
     269;      (bin-load-provide "COVER" "cover")
    270270      (bin-load-provide "MCL-COMPAT" "mcl-compat")
    271271      (require "LOOP")
  • branches/mb-coverage-merge/level-1/l1-reader.lisp

    r8519 r8521  
    30113011;;; we don't actually store source-note structs in the fasl since that runs into problems dumping
    30123012;;; the struct.
    3013 (defun source-note-for-%lfun-info (note &key (start t) (end t) (text t) (form t) (children t) (file-name t))
    3014   (append (when start (list :start (source-note-start note)))
    3015           (when end   (list :end  (source-note-end   note)))
    3016           (when text  (list :%text (%fast-compact (source-note-%text  note))))
     3013(defun source-note-for-%lfun-info (note &key (start t) (end t) (text t) (form t) (subform-notes t) (file-name t))
     3014  (append (when start (list :start (source-note-start-pos note)))
     3015          (when end   (list :end  (source-note-end-pos note)))
     3016          (when text
     3017            (let ((source (source-note-source note)))
     3018              (%fast-compact
     3019               (etypecase source
     3020                 (string source)
     3021                 (source-note (source-note-source source))
     3022                 (code-note (code-note-source source))))))
    30173023          (when form  (list :form (source-note-form  note)))
    3018           (when children (list :children (source-note-children note)))
     3024          (when subform-notes (list :subform-notes (source-note-subform-notes note)))
    30193025          (when file-name (list :file-name (source-note-file-name note)))))
    30203026
     
    30243030                       :start-pos (getf note-plist :start)
    30253031                       :end-pos (getf note-plist :end)
    3026                        :text (%fast-uncompact (getf note-plist :%text)))))
     3032                       :text (%fast-uncompact (getf note-plist :%text))
     3033                       )))
    30273034
    30283035
  • branches/mb-coverage-merge/lib/nfcomp.lisp

    r8519 r8521  
    857857                                     (compiler-function-overflow)))
    858858                          ,@forms)))))
    859       (record-form-source-equivalent/list lambda forms)
     859      (dolist (form forms)
     860        (record-form-source-equivalent lambda forms))
    860861      (setq *fcomp-toplevel-forms* '())
    861862      ;(format t "~& Random toplevel form: ~s" lambda)
Note: See TracChangeset for help on using the changeset viewer.