X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-misc.lisp;h=65fe84dd4f4a564a8e5a6b0a1ec6b54deab06dfd;hb=c457d41e87e7ab27bb92f59f0e7839fe23b9d020;hp=37bb400cf75db294e7c7cb23f47a2f9bbbfed6be;hpb=d0552bdb80b50eb2c600de19b89b2d7139c4841c;p=sbcl.git diff --git a/src/code/target-misc.lisp b/src/code/target-misc.lisp index 37bb400..65fe84d 100644 --- a/src/code/target-misc.lisp +++ b/src/code/target-misc.lisp @@ -25,51 +25,59 @@ NAME is some name (for debugging only) or NIL if there is no name." (declare (type function fun)) (let* ((fun (%simple-fun-self fun)) - (name (%fun-name fun)) - (code (sb!di::fun-code-header fun)) - (info (sb!kernel:%code-debug-info code))) + (name (%fun-name fun)) + (code (sb!di::fun-code-header fun)) + (info (sb!kernel:%code-debug-info code))) (if info - (let ((source (first (sb!c::compiled-debug-info-source info)))) + (let ((source (sb!c::debug-info-source info))) (cond ((and (eq (sb!c::debug-source-from source) :lisp) - (eq (sb!c::debug-source-info source) fun)) + (eq (sb!c::debug-source-function source) fun)) (values (svref (sb!c::debug-source-name source) 0) nil - name)) - ;; FIXME: shouldn't these two clauses be the other way - ;; round? Using VALID-FUNCTION-NAME-P to see if we - ;; want to find an inline-expansion? - ((stringp name) - (values nil t name)) - (t + name)) + ((legal-fun-name-p name) (let ((exp (fun-name-inline-expansion name))) - (if exp - (values exp nil name) - (values nil t name)))))) + (values exp (not exp) name))) + (t + (values nil t name)))) (values nil t name)))) +(defun closurep (object) + (= sb!vm:closure-header-widetag (widetag-of object))) + +(defun %fun-fun (function) + (declare (function function)) + (case (widetag-of function) + (#.sb!vm:simple-fun-header-widetag + function) + (#.sb!vm:closure-header-widetag + (%closure-fun function)) + (#.sb!vm:funcallable-instance-header-widetag + (%fun-fun (funcallable-instance-fun function))))) + +(defun %closure-values (object) + (declare (function object)) + (loop for index from 0 + below (- (get-closure-length object) (1- sb!vm:closure-info-offset)) + collect (%closure-index-ref object index))) + +(defun %fun-lambda-list (object) + (%simple-fun-arglist (%fun-fun object))) + ;;; a SETFable function to return the associated debug name for FUN ;;; (i.e., the third value returned from CL:FUNCTION-LAMBDA-EXPRESSION), ;;; or NIL if there's none -(defun %fun-name (fun) - (case (widetag-of fun) - (#.sb!vm:closure-header-widetag - (%simple-fun-name (%closure-fun fun))) - ((#.sb!vm:simple-fun-header-widetag - #.sb!vm:closure-fun-header-widetag) - ;; KLUDGE: The pun that %SIMPLE-FUN-NAME is used for closure - ;; functions is left over from CMU CL (modulo various renaming - ;; that's gone on since the fork). - (%simple-fun-name fun)) - (#.sb!vm:funcallable-instance-header-widetag - (%simple-fun-name - (funcallable-instance-fun fun))))) +(defun %fun-name (function) + (%simple-fun-name (%fun-fun function))) + +(defun %fun-type (function) + (%simple-fun-type (%fun-fun function))) (defun (setf %fun-name) (new-name fun) (aver nil) ; since this is unsafe 'til bug 137 is fixed (let ((widetag (widetag-of fun))) (case widetag - ((#.sb!vm:simple-fun-header-widetag - #.sb!vm:closure-fun-header-widetag) + (#.sb!vm:simple-fun-header-widetag ;; KLUDGE: The pun that %SIMPLE-FUN-NAME is used for closure ;; functions is left over from CMU CL (modulo various renaming ;; that's gone on since the fork). @@ -84,7 +92,7 @@ ;; When/if weak hash tables become supported ;; again, it'll become easy to fix this, but for now there ;; seems to be no easy way (short of the ugly way of adding a - ;; slot to every single closure header), so we don't. + ;; slot to every single closure header), so we don't. ;; ;; Meanwhile, users might encounter this problem by doing DEFUN ;; in a non-null lexical environment, so we try to give a @@ -98,7 +106,7 @@ ;; user-level code, so we can give a implementor-level ;; "error" (warning) message. (warn "can't set function name ((~S function)=~S), leaving it unchanged" - 'widetag-of widetag)))) + 'widetag-of widetag)))) new-name) (defun %fun-doc (x) @@ -132,7 +140,7 @@ are running on, or NIL if we can't find any useful information." (unless (boundp '*machine-version*) (setf *machine-version* (get-machine-version))) *machine-version*) - + ;;; FIXME: Don't forget to set these in a sample site-init file. ;;; FIXME: Perhaps the functions could be SETFable instead of having the ;;; interface be through special variables? As far as I can tell @@ -153,6 +161,24 @@ are running on, or NIL if we can't find any useful information." "Return a string with the long form of the site name, or NIL if not known." *long-site-name*) +;;;; ED +(defvar *ed-functions* nil + "See function documentation for ED.") + +(defun ed (&optional x) + "Starts the editor (on a file or a function if named). Functions +from the list *ED-FUNCTIONS* are called in order with X as an argument +until one of them returns non-NIL; these functions are responsible for +signalling a FILE-ERROR to indicate failure to perform an operation on +the file system." + (dolist (fun *ed-functions* + (error 'extension-failure + :format-control "Don't know how to ~S ~A" + :format-arguments (list 'ed x) + :references (list '(:sbcl :variable *ed-functions*)))) + (when (funcall fun x) + (return t)))) + ;;;; dribble stuff ;;; Each time we start dribbling to a new stream, we put it in @@ -176,34 +202,47 @@ are running on, or NIL if we can't find any useful information." record of further I/O to that file. Without an argument, it closes the dribble file, and quits logging." (cond (pathname - (let* ((new-dribble-stream - (open pathname - :direction :output - :if-exists if-exists - :if-does-not-exist :create)) - (new-standard-output - (make-broadcast-stream *standard-output* new-dribble-stream)) - (new-error-output - (make-broadcast-stream *error-output* new-dribble-stream)) - (new-standard-input - (make-echo-stream *standard-input* new-dribble-stream))) - (push (list *dribble-stream* *standard-input* *standard-output* - *error-output*) - *previous-dribble-streams*) - (setf *dribble-stream* new-dribble-stream) - (setf *standard-input* new-standard-input) - (setf *standard-output* new-standard-output) - (setf *error-output* new-error-output))) - ((null *dribble-stream*) - (error "not currently dribbling")) - (t - (let ((old-streams (pop *previous-dribble-streams*))) - (close *dribble-stream*) - (setf *dribble-stream* (first old-streams)) - (setf *standard-input* (second old-streams)) - (setf *standard-output* (third old-streams)) - (setf *error-output* (fourth old-streams))))) + (let* ((new-dribble-stream + (open pathname + :direction :output + :if-exists if-exists + :if-does-not-exist :create)) + (new-standard-output + (make-broadcast-stream *standard-output* new-dribble-stream)) + (new-error-output + (make-broadcast-stream *error-output* new-dribble-stream)) + (new-standard-input + (make-echo-stream *standard-input* new-dribble-stream))) + (push (list *dribble-stream* *standard-input* *standard-output* + *error-output*) + *previous-dribble-streams*) + (setf *dribble-stream* new-dribble-stream) + (setf *standard-input* new-standard-input) + (setf *standard-output* new-standard-output) + (setf *error-output* new-error-output))) + ((null *dribble-stream*) + (error "not currently dribbling")) + (t + (let ((old-streams (pop *previous-dribble-streams*))) + (close *dribble-stream*) + (setf *dribble-stream* (first old-streams)) + (setf *standard-input* (second old-streams)) + (setf *standard-output* (third old-streams)) + (setf *error-output* (fourth old-streams))))) (values)) (defun %byte-blt (src src-start dst dst-start dst-end) (%byte-blt src src-start dst dst-start dst-end)) + +;;;; some *LOAD-FOO* variables + +(defvar *load-print* nil + #!+sb-doc + "the default for the :PRINT argument to LOAD") + +(defvar *load-verbose* nil + ;; Note that CMU CL's default for this was T, and ANSI says it's + ;; implementation-dependent. We choose NIL on the theory that it's + ;; a nicer default behavior for Unix programs. + #!+sb-doc + "the default for the :VERBOSE argument to LOAD")