Changeset 12327


Ignore:
Timestamp:
Jun 29, 2009, 6:28:27 PM (10 years ago)
Author:
gz
Message:

Indentation, doc string changes, move *direct-methods-only* from xref to source-files, which is the only place it's used

Location:
trunk/source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/compiler/X86/x862.lisp

    r12300 r12327  
    89468946          (x862-form seg vreg xfer form)
    89478947          (with-note (form seg)
    8948           (let* ((ok (backend-get-next-label)))
    8949             (if (and (symbolp typespec) (non-nil-symbolp (type-predicate typespec)))
    8950               ;; Do this so can compile the lisp with typechecking even though typep
    8951               ;; doesn't get defined til fairly late.
    8952               (progn
    8953                 (x862-one-targeted-reg-form seg form ($ *x862-arg-z*))
    8954                 (x862-store-immediate seg (type-predicate typespec) ($ *x862-fname*))
    8955                 (x862-set-nargs seg 1)
    8956                 (x862-vpush-register seg ($ *x862-arg-z*)))
    8957               (progn
    8958                 (x862-one-targeted-reg-form seg form ($ *x862-arg-y*))
     8948            (let* ((ok (backend-get-next-label)))
     8949              (if (and (symbolp typespec) (non-nil-symbolp (type-predicate typespec)))
     8950                ;; Do this so can compile the lisp with typechecking even though typep
     8951                ;; doesn't get defined til fairly late.
     8952                (progn
     8953                  (x862-one-targeted-reg-form seg form ($ *x862-arg-z*))
     8954                  (x862-store-immediate seg (type-predicate typespec) ($ *x862-fname*))
     8955                  (x862-set-nargs seg 1)
     8956                  (x862-vpush-register seg ($ *x862-arg-z*)))
     8957                (progn
     8958                  (x862-one-targeted-reg-form seg form ($ *x862-arg-y*))
     8959                  (x862-store-immediate seg typespec ($ *x862-arg-z*))
     8960                  (x862-store-immediate seg 'typep ($ *x862-fname*))
     8961                  (x862-set-nargs seg 2)
     8962                  (x862-vpush-register seg ($ *x862-arg-y*))))
     8963              (! call-known-symbol ($ *x862-arg-z*))
     8964              (! compare-to-nil ($ *x862-arg-z*))
     8965              (x862-vpop-register seg ($ *x862-arg-y*))
     8966              (! cbranch-false (aref *backend-labels* ok) x86::x86-e-bits)
     8967              (target-arch-case
     8968               (:x8632
     8969                (let* ((*x862-vstack* *x862-vstack*)
     8970                       (*x862-top-vstack-lcell* *x862-top-vstack-lcell*))
     8971                  (! reserve-outgoing-frame)
     8972                  (incf *x862-vstack* (* 2 *x862-target-node-size*))
     8973                  (! vpush-fixnum (ash $XWRONGTYPE *x862-target-fixnum-shift*))
     8974                  (x862-store-immediate seg typespec ($ *x862-arg-z*))
     8975                  (x862-set-nargs seg 3)
     8976                  (! ksignalerr)))
     8977               (:x8664
     8978                (x862-lri seg ($ x8664::arg_x) (ash $XWRONGTYPE *x862-target-fixnum-shift*))
    89598979                (x862-store-immediate seg typespec ($ *x862-arg-z*))
    8960                 (x862-store-immediate seg 'typep ($ *x862-fname*))
    8961                 (x862-set-nargs seg 2)
    8962                 (x862-vpush-register seg ($ *x862-arg-y*))))
    8963             (! call-known-symbol ($ *x862-arg-z*))
    8964             (! compare-to-nil ($ *x862-arg-z*))
    8965             (x862-vpop-register seg ($ *x862-arg-y*))
    8966             (! cbranch-false (aref *backend-labels* ok) x86::x86-e-bits)
    8967             (target-arch-case
    8968              (:x8632
    8969               (let* ((*x862-vstack* *x862-vstack*)
    8970                      (*x862-top-vstack-lcell* *x862-top-vstack-lcell*))
    8971                 (! reserve-outgoing-frame)
    8972                 (incf *x862-vstack* (* 2 *x862-target-node-size*))
    8973                 (! vpush-fixnum (ash $XWRONGTYPE *x862-target-fixnum-shift*))
    8974                 (x862-store-immediate seg typespec ($ *x862-arg-z*))
    8975                 (x862-set-nargs seg 3)
    8976                 (! ksignalerr)))
    8977              (:x8664
    8978               (x862-lri seg ($ x8664::arg_x) (ash $XWRONGTYPE *x862-target-fixnum-shift*))
    8979               (x862-store-immediate seg typespec ($ *x862-arg-z*))
    8980               (x862-set-nargs seg 3)
    8981               (! ksignalerr)))
    8982             (@ ok)
    8983             (<- ($ *x862-arg-y*))
    8984             (^))))))))
     8980                (x862-set-nargs seg 3)
     8981                (! ksignalerr)))
     8982              (@ ok)
     8983              (<- ($ *x862-arg-y*))
     8984              (^))))))))
    89858985         
    89868986         
  • trunk/source/level-1/l1-init.lisp

    r12045 r12327  
    270270
    271271If :NO-TEXT we don't store a copy of the original source text.")
    272 (defparameter *record-pc-mapping* t)
     272
     273(defparameter *record-pc-mapping* t "True to record pc -> source mapping (but only if
     274*save-source-locations* is also true)")
    273275
    274276(defvar *modules* nil
  • trunk/source/lib/nfcomp.lisp

    r12300 r12327  
    196196                           (backend-target-fasl-pathname
    197197                            *target-backend*))))
    198       (let* ((*features* (append (if (listp features) features (list features)) (setup-target-features target-backend *features*)))
    199              (*fasl-deferred-warnings* nil) ; !!! WITH-COMPILATION-UNIT ...
    200              (*fasl-save-local-symbols* save-local-symbols)
    201              (*save-source-locations* save-source-locations)
    202              (*fasl-save-doc-strings* save-doc-strings)
    203              (*fasl-save-definitions* save-definitions)
    204              (*fasl-break-on-program-errors* break-on-program-errors)
    205              (*fcomp-warnings-header* nil)
    206              (*compile-file-pathname* orig-src)
    207              (*compile-file-truename* (truename src))
    208              (*package* *package*)
    209              (*readtable* *readtable*)
    210              (*compile-print* print)
    211              (*compile-verbose* verbose)
    212              (*fasl-target* (backend-name target-backend))
    213              (*fasl-backend* target-backend)
    214              (*fasl-target-big-endian* (arch::target-big-endian
    215                                         (backend-target-arch target-backend)))
    216              (*target-ftd* (backend-target-foreign-type-data target-backend))
    217              (defenv (new-definition-environment))
    218              (lexenv (new-lexical-environment defenv))
    219              (*fasl-compile-time-env* (new-lexical-environment (new-definition-environment)))
    220              (*fcomp-external-format* external-format)
    221              (forms nil))
     198    (let* ((*features* (append (if (listp features) features (list features)) (setup-target-features target-backend *features*)))
     199           (*fasl-deferred-warnings* nil) ; !!! WITH-COMPILATION-UNIT ...
     200           (*fasl-save-local-symbols* save-local-symbols)
     201           (*save-source-locations* save-source-locations)
     202           (*fasl-save-doc-strings* save-doc-strings)
     203           (*fasl-save-definitions* save-definitions)
     204           (*fasl-break-on-program-errors* break-on-program-errors)
     205           (*fcomp-warnings-header* nil)
     206           (*compile-file-pathname* orig-src)
     207           (*compile-file-truename* (truename src))
     208           (*package* *package*)
     209           (*readtable* *readtable*)
     210           (*compile-print* print)
     211           (*compile-verbose* verbose)
     212           (*fasl-target* (backend-name target-backend))
     213           (*fasl-backend* target-backend)
     214           (*fasl-target-big-endian* (arch::target-big-endian
     215                                      (backend-target-arch target-backend)))
     216           (*target-ftd* (backend-target-foreign-type-data target-backend))
     217           (defenv (new-definition-environment))
     218           (lexenv (new-lexical-environment defenv))
     219           (*fasl-compile-time-env* (new-lexical-environment (new-definition-environment)))
     220           (*fcomp-external-format* external-format)
     221           (forms nil))
    222222      (let ((current *outstanding-deferred-warnings*) last)
    223223        (when (and current
     
    966966  (when (consp expr)
    967967    (multiple-value-bind (lambda-expr name win)
    968         (cond ((and (eq (%car expr) 'nfunction)
    969                     (lambda-expression-p (cadr (%cdr expr))))
    970                (values (%caddr expr) (%cadr expr) t))
    971               ((and (eq (%car expr) 'function)
    972                     (lambda-expression-p (car (%cdr expr))))
    973                (values (%cadr expr) nil t)))
     968        (cond ((and (eq (%car expr) 'nfunction)
     969                    (lambda-expression-p (cadr (%cdr expr))))
     970               (values (%caddr expr) (%cadr expr) t))
     971              ((and (eq (%car expr) 'function)
     972                    (lambda-expression-p (car (%cdr expr))))
     973               (values (%cadr expr) nil t)))
    974974      (when win
    975975        (fcomp-named-function lambda-expr name env
  • trunk/source/lib/source-files.lisp

    r12040 r12327  
    4747                                        :size 13000
    4848                                        :rehash-threshold .95))
     49
     50
     51(defvar *direct-methods-only* nil
     52  "If true, method name source location lookup will find direct methods only.  If false,
     53   include all applicable methods")
     54
    4955
    5056;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/source/lib/xref.lisp

    r11813 r12327  
    258258        ,(xref-entry-method-specializers entry))
    259259    (xref-entry-name entry)))
    260 
    261 ;; edit-definition-p needs this - what is it for?
    262 (defvar *direct-methods-only* nil)
    263260
    264261;; %SOURCE-FILE-FOR-XREF-ENTRY -- internal
Note: See TracChangeset for help on using the changeset viewer.