2015-09-03 15:15:11 -04:00
|
|
|
;;; disass.el --- disassembler for compiled Emacs Lisp code -*- lexical-binding:t -*-
|
1992-07-17 08:15:29 +00:00
|
|
|
|
2024-01-02 09:47:10 +08:00
|
|
|
;; Copyright (C) 1986, 1991, 2002-2024 Free Software Foundation, Inc.
|
1992-07-22 04:22:30 +00:00
|
|
|
|
1992-07-17 08:15:29 +00:00
|
|
|
;; Author: Doug Cutting <doug@csli.stanford.edu>
|
|
|
|
;; Jamie Zawinski <jwz@lucid.com>
|
2019-05-25 13:43:06 -07:00
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
1993-03-18 21:29:42 +00:00
|
|
|
;; Keywords: internal
|
1992-07-17 08:15:29 +00:00
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:21:21 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1992-07-10 22:06:47 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:21:21 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
1992-07-17 08:15:29 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
1993-03-22 03:27:18 +00:00
|
|
|
;; The single entry point, `disassemble', disassembles a code object generated
|
|
|
|
;; by the Emacs Lisp byte-compiler. This doesn't invert the compilation
|
|
|
|
;; operation, not by a long shot, but it's useful for debugging.
|
|
|
|
|
|
|
|
;;
|
|
|
|
;; Original version by Doug Cutting (doug@csli.stanford.edu)
|
|
|
|
;; Substantially modified by Jamie Zawinski <jwz@lucid.com> for
|
|
|
|
;; the new lapcode-based byte compiler.
|
1992-07-17 08:15:29 +00:00
|
|
|
|
|
|
|
;;; Code:
|
1992-07-10 22:06:47 +00:00
|
|
|
|
2012-06-07 15:25:48 -04:00
|
|
|
(require 'macroexp)
|
2019-06-13 13:56:16 +02:00
|
|
|
(require 'cl-lib)
|
2012-06-07 15:25:48 -04:00
|
|
|
|
2015-09-03 15:15:11 -04:00
|
|
|
;; The variable byte-code-vector is defined by the new bytecomp.el.
|
|
|
|
;; The function byte-decompile-lapcode is defined in byte-opt.el.
|
|
|
|
;; Since we don't use byte-decompile-lapcode, let's try not loading byte-opt.
|
1992-11-16 01:28:48 +00:00
|
|
|
(require 'byte-compile "bytecomp")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
2019-12-23 11:51:33 +01:00
|
|
|
(declare-function comp-c-func-name "comp.el")
|
|
|
|
|
1994-07-20 05:33:14 +00:00
|
|
|
(defvar disassemble-column-1-indent 8 "*")
|
1992-07-10 22:06:47 +00:00
|
|
|
(defvar disassemble-column-2-indent 10 "*")
|
|
|
|
|
|
|
|
(defvar disassemble-recursive-indent 3 "*")
|
|
|
|
|
1993-01-26 01:58:16 +00:00
|
|
|
;;;###autoload
|
1992-07-10 22:06:47 +00:00
|
|
|
(defun disassemble (object &optional buffer indent interactive-p)
|
|
|
|
"Print disassembled code for OBJECT in (optional) BUFFER.
|
|
|
|
OBJECT can be a symbol defined as a function, or a function itself
|
2024-03-04 23:42:50 -05:00
|
|
|
\(a lambda expression or a byte-code-function object).
|
1992-07-10 22:06:47 +00:00
|
|
|
If OBJECT is not already compiled, we compile it, but do not
|
|
|
|
redefine OBJECT if it is a symbol."
|
2016-03-31 19:34:05 -04:00
|
|
|
(interactive
|
|
|
|
(let* ((fn (function-called-at-point))
|
|
|
|
(def (and fn (symbol-name fn))))
|
Use `format-prompt' when prompting with default values
* lisp/woman.el (woman-file-name):
* lisp/wid-edit.el (widget-file-prompt-value)
(widget-coding-system-prompt-value):
* lisp/w32-fns.el (w32-set-system-coding-system):
* lisp/vc/vc.el (vc-print-root-log):
* lisp/vc/vc-annotate.el (vc-annotate):
* lisp/vc/emerge.el (emerge-read-file-name):
* lisp/vc/ediff.el (ediff-directories)
(ediff-directory-revisions, ediff-directories3)
(ediff-merge-directories, )
(ediff-merge-directories-with-ancestor)
(ediff-merge-directory-revisions)
(ediff-merge-directory-revisions-with-ancestor)
(ediff-merge-revisions, ediff-merge-revisions-with-ancestor)
(ediff-revision):
* lisp/vc/ediff-util.el (ediff-toggle-regexp-match):
* lisp/vc/ediff-mult.el (ediff-filegroup-action):
* lisp/vc/add-log.el (prompt-for-change-log-name):
* lisp/textmodes/table.el (table-insert-row-column)
(table-span-cell, table-split-cell-horizontally)
(table-split-cell, table-justify, table-generate-source)
(table-insert-sequence, table-capture)
(table--read-from-minibuffer, table--query-justification):
* lisp/textmodes/sgml-mode.el (sgml-tag, sgml-tag-help):
* lisp/textmodes/reftex-ref.el (reftex-goto-label):
* lisp/textmodes/refer.el (refer-get-bib-files):
* lisp/textmodes/css-mode.el (css-lookup-symbol):
* lisp/term.el (serial-read-name, serial-read-speed):
* lisp/speedbar.el (speedbar-change-initial-expansion-list):
* lisp/simple.el (previous-matching-history-element)
(set-variable):
* lisp/ses.el (ses-read-cell, ses-set-column-width):
* lisp/replace.el (query-replace-read-from)
(occur-read-primary-args):
* lisp/rect.el (string-rectangle, string-insert-rectangle):
* lisp/progmodes/tcl.el (tcl-help-on-word):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/python.el (python-eldoc-at-point):
* lisp/progmodes/octave.el (octave-completing-read)
(octave-update-function-file-comment, octave-insert-defun):
* lisp/progmodes/inf-lisp.el (lisp-symprompt):
* lisp/progmodes/cperl-mode.el (cperl-info-on-command)
(cperl-perldoc):
* lisp/progmodes/compile.el (compilation-find-file):
* lisp/net/rcirc.el (rcirc-prompt-for-encryption):
* lisp/net/eww.el (eww):
* lisp/net/browse-url.el (browse-url-with-browser-kind):
* lisp/man.el (man):
* lisp/mail/sendmail.el (sendmail-query-user-about-smtp):
* lisp/mail/mailalias.el (build-mail-aliases):
* lisp/mail/mailabbrev.el (merge-mail-abbrevs)
(rebuild-mail-abbrevs):
* lisp/locate.el (locate-prompt-for-search-string):
* lisp/isearch.el (isearch-occur):
* lisp/international/ogonek.el (ogonek-read-encoding)
(ogonek-read-prefix):
* lisp/international/mule.el (read-buffer-file-coding-system)
(set-terminal-coding-system, set-keyboard-coding-system)
(set-next-selection-coding-system, recode-region):
* lisp/international/mule-cmds.el ()
(universal-coding-system-argument, search-unencodable-char)
(select-safe-coding-system-interactively):
* lisp/info.el (Info-search, Info-search-backward, Info-menu):
* lisp/info-look.el (info-lookup-interactive-arguments):
* lisp/imenu.el (imenu--completion-buffer):
* lisp/ibuf-ext.el (mode, used-mode, ibuffer-mark-by-mode):
* lisp/hi-lock.el (hi-lock-unface-buffer)
(hi-lock-read-face-name):
* lisp/help.el (view-emacs-news, where-is):
* lisp/help-fns.el (describe-variable, describe-symbol)
(describe-keymap):
* lisp/gnus/mm-decode.el (mm-save-part):
* lisp/gnus/gnus-sum.el (gnus-summary-browse-url):
* lisp/gnus/gnus-group.el (gnus-group--read-bug-ids)
(gnus-group-set-current-level):
* lisp/frame.el (make-frame-on-monitor)
(close-display-connection, select-frame-by-name):
* lisp/format.el (format-encode-buffer, format-encode-region):
* lisp/files.el (recode-file-name):
* lisp/files-x.el (read-file-local-variable)
(read-file-local-variable-value, )
(read-file-local-variable-mode):
* lisp/ffap.el (ffap-menu-ask):
* lisp/faces.el (face-read-string):
* lisp/facemenu.el (facemenu-set-charset):
* lisp/erc/erc-dcc.el (erc-dcc-do-GET-command):
* lisp/emulation/edt-mapper.el (edt-mapper):
* lisp/emacs-lisp/trace.el (trace--read-args)
(trace-function-foreground, trace-function-background):
* lisp/emacs-lisp/smie.el (smie-config-set-indent):
* lisp/emacs-lisp/re-builder.el (reb-change-syntax):
* lisp/emacs-lisp/package.el (describe-package):
* lisp/emacs-lisp/find-func.el (read-library-name)
(find-function-read):
* lisp/emacs-lisp/ert.el (ert-read-test-name)
(ert-run-tests-interactively):
* lisp/emacs-lisp/disass.el (disassemble):
* lisp/emacs-lisp/debug.el (debug-on-entry)
(debug-on-variable-change):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-read-regexp):
* lisp/dired-x.el (dired--mark-suffix-interactive-spec):
* lisp/dired-aux.el (dired-diff):
* lisp/cus-edit.el (custom-variable-prompt, customize-mode)
(customize-changed-options):
* lisp/completion.el (interactive-completion-string-reader):
* lisp/calendar/timeclock.el (timeclock-ask-for-project):
* lisp/calc/calcalg3.el (calc-get-fit-variables):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-bin.el (calc-word-size):
* lisp/bookmark.el (bookmark-set-internal):
* lisp/abbrev.el (read-abbrev-file): Use `format-prompt' for
prompting (bug#12443).
2020-09-06 16:56:44 +02:00
|
|
|
(list (intern (completing-read (format-prompt "Disassemble function" fn)
|
|
|
|
obarray 'fboundp t nil nil def))
|
2016-03-31 19:34:05 -04:00
|
|
|
nil 0 t)))
|
2023-06-24 17:53:41 -04:00
|
|
|
(let ((lb lexical-binding))
|
2024-05-01 14:14:01 -04:00
|
|
|
(when (and (consp object) (not (eq (car object) 'lambda)))
|
|
|
|
(setq object
|
|
|
|
(if (eq (car object) 'byte-code)
|
|
|
|
(apply #'make-byte-code 0 (cdr object))
|
|
|
|
`(lambda () ,object))))
|
2023-06-24 17:53:41 -04:00
|
|
|
(or indent (setq indent 0)) ;Default indent to zero
|
|
|
|
(save-excursion
|
|
|
|
(if (or interactive-p (null buffer))
|
|
|
|
(with-output-to-temp-buffer "*Disassemble*"
|
2024-03-04 23:42:50 -05:00
|
|
|
(set-buffer standard-output)
|
2023-06-24 17:53:41 -04:00
|
|
|
(let ((lexical-binding lb))
|
|
|
|
(disassemble-internal object indent (not interactive-p))))
|
|
|
|
(set-buffer buffer)
|
|
|
|
(let ((lexical-binding lb))
|
|
|
|
(disassemble-internal object indent nil)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
nil)
|
|
|
|
|
2020-12-04 22:31:36 +01:00
|
|
|
(declare-function native-comp-unit-file "data.c")
|
|
|
|
(declare-function subr-native-comp-unit "data.c")
|
2019-12-23 11:51:33 +01:00
|
|
|
(cl-defun disassemble-internal (obj indent interactive-p)
|
1992-07-10 22:06:47 +00:00
|
|
|
(let ((macro 'nil)
|
2015-09-03 15:15:11 -04:00
|
|
|
(name (when (symbolp obj)
|
|
|
|
(prog1 obj
|
|
|
|
(setq obj (indirect-function obj)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
args)
|
2015-09-03 15:15:11 -04:00
|
|
|
(setq obj (autoload-do-load obj name))
|
1992-07-10 22:06:47 +00:00
|
|
|
(if (subrp obj)
|
Redirect calls to `subr-native-elisp-p` to `native-comp-function-p`
* test/src/comp-tests.el (comp-tests-bootstrap, lambda-return)
(lambda-return2, free-fun, free-fun2, free-fun-silly-name, speed--1)
(compile-forms, comp-test-defsubst, primitive-redefine-compile-44221)
(48029-1, 61917-1, tco, fw-prop-1, pure):
* test/lisp/help-fns-tests.el (help-fns-test-lisp-defun):
* lisp/subr.el (subr-primitive-p, primitive-function-p, symbol-file):
* lisp/help-fns.el (find-lisp-object-file-name):
* lisp/emacs-lisp/disass.el (disassemble-internal):
* lisp/emacs-lisp/comp.el (comp--call-optim-form-call):
* lisp/emacs-lisp/comp-run.el (comp-warn-primitives):
* lisp/emacs-lisp/comp-common.el (comp-function-type-spec):
* lisp/emacs-lisp/byte-opt.el (side-effect-free-fns):
* lisp/emacs-lisp/bytecomp.el (<trailer>): Rename `subr-native-elisp-p`
to `native-comp-function-p`.
2024-05-22 14:45:35 -04:00
|
|
|
(if (and (fboundp 'native-comp-function-p)
|
|
|
|
(native-comp-function-p obj))
|
2019-12-23 11:51:33 +01:00
|
|
|
(progn
|
|
|
|
(require 'comp)
|
2023-08-27 16:51:16 +02:00
|
|
|
(let ((eln (native-comp-unit-file (subr-native-comp-unit obj))))
|
|
|
|
(if (file-exists-p eln)
|
|
|
|
(call-process "objdump" nil (current-buffer) t "-S" eln)
|
|
|
|
(error "Missing eln file for #<subr %s>" name)))
|
2019-12-23 11:51:33 +01:00
|
|
|
(goto-char (point-min))
|
2023-08-27 18:59:40 +02:00
|
|
|
(re-search-forward (concat "^.*<_?"
|
2019-12-23 11:51:33 +01:00
|
|
|
(regexp-quote
|
2023-08-27 18:59:40 +02:00
|
|
|
(comp-c-func-name
|
|
|
|
(subr-name obj) "F" t))
|
|
|
|
">:"))
|
2019-12-23 11:51:33 +01:00
|
|
|
(beginning-of-line)
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
(when (re-search-forward "^.*<.*>:" nil t 2)
|
|
|
|
(delete-region (match-beginning 0) (point-max)))
|
|
|
|
(asm-mode)
|
2019-12-26 08:35:01 +01:00
|
|
|
(setq buffer-read-only t)
|
2019-12-23 11:51:33 +01:00
|
|
|
(cl-return-from disassemble-internal))
|
|
|
|
(error "Can't disassemble #<subr %s>" name)))
|
2012-07-25 21:27:33 -04:00
|
|
|
(if (eq (car-safe obj) 'macro) ;Handle macros.
|
1992-07-10 22:06:47 +00:00
|
|
|
(setq macro t
|
|
|
|
obj (cdr obj)))
|
2024-04-29 13:47:15 -04:00
|
|
|
(when (or (consp obj) (interpreted-function-p obj))
|
2021-09-14 07:55:56 +02:00
|
|
|
(unless (functionp obj) (error "Not a function"))
|
2024-04-29 13:47:15 -04:00
|
|
|
(if interactive-p (message (if name
|
|
|
|
"Compiling %s's definition..."
|
|
|
|
"Compiling definition...")
|
|
|
|
name))
|
|
|
|
(setq obj (byte-compile obj))
|
|
|
|
(if interactive-p (message "Done compiling. Disassembling...")))
|
1992-07-10 22:06:47 +00:00
|
|
|
(cond ((consp obj)
|
2015-09-03 15:15:11 -04:00
|
|
|
(setq args (help-function-arglist obj)) ;save arg list
|
1992-07-10 22:06:47 +00:00
|
|
|
(setq obj (cdr obj)) ;throw lambda away
|
|
|
|
(setq obj (cdr obj)))
|
Use a dedicated type to represent interpreted-function values
Change `function` so that when evaluating #'(lambda ...)
we return an object of type `interpreted-function` rather than
a list starting with one of `lambda` or `closure`.
The new type reuses the existing PVEC_CLOSURE (nee PVEC_COMPILED)
tag and tries to align the corresponding elements:
- the arglist, the docstring, and the interactive-form go in the
same slots as for byte-code functions.
- the body of the function goes in the slot used for the bytecode string.
- the lexical context goes in the slot used for the constants of
bytecoded functions.
The first point above means that `help-function-arglist`,
`documentation`, and `interactive-form`s don't need to
distinguish interpreted and bytecode functions any more.
Main benefits of the change:
- We can now reliably distinguish a list from a function value.
- `cl-defmethod` can dispatch on `interactive-function` and `closure`.
Dispatch on `function` also works now for interpreted functions but still
won't work for functions represented as lists or as symbols, of course.
- Function values are now self-evaluating. That was alrready the case
when byte-compiled, but not when interpreted since
(eval '(closure ...)) signals a void-function error.
That also avoids false-positive warnings about "don't quote your lambdas"
when doing things like `(mapcar ',func ...)`.
* src/eval.c (Fmake_interpreted_closure): New function.
(Ffunction): Use it and change calling convention of
`Vinternal_make_interpreted_closure_function`.
(FUNCTIONP, Fcommandp, eval_sub, funcall_general, funcall_lambda)
(Ffunc_arity, lambda_arity): Simplify.
(funcall_lambda): Adjust to new representation.
(syms_of_eval): `defsubr` the new function. Remove definition of `Qclosure`.
* lisp/emacs-lisp/cconv.el (cconv-make-interpreted-closure):
Change calling convention and use `make-interpreted-closure`.
* src/data.c (Fcl_type_of): Distinguish `byte-code-function`s from
`interpreted-function`s.
(Fclosurep, finterpreted_function_p): New functions.
(Fbyte_code_function_p): Don't be confused by `interpreted-function`s.
(Finteractive_form, Fcommand_modes): Simplify.
(syms_of_data): Define new type symbols and `defsubr` the two
new functions.
* lisp/emacs-lisp/cl-print.el (cl-print-object) <interpreted-function>:
New method.
* lisp/emacs-lisp/oclosure.el (oclosure): Refine the parent
to be `closure`.
(oclosure--fix-type, oclosure-type): Simplify.
(oclosure--copy, oclosure--get, oclosure--set): Adjust to
new representation.
* src/callint.c (Fcall_interactively): Adjust to new representation.
* src/lread.c (bytecode_from_rev_list):
* lisp/simple.el (function-documentation):
* lisp/help.el (help-function-arglist): Remove the old `closure` case
and adjust the byte-code case so it handles `interpreted-function`s.
* lisp/emacs-lisp/cl-preloaded.el (closure): New type.
(byte-code-function): Add it as a parent.
(interpreted-function): Adjust parent (the type itself was already
added earlier by accident).
* lisp/emacs-lisp/bytecomp.el (byte-compile--reify-function): Adjust to
new representation.
(byte-compile): Use `interpreted-function-p`.
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand): Adjust to
new representation.
(side-effect-free-fns): Add `interpreted-function-p` and `closurep`.
* src/profiler.c (trace_hash, ffunction_equal): Simplify.
* lisp/profiler.el (profiler-function-equal): Simplify.
* lisp/emacs-lisp/nadvice.el (advice--interactive-form-1):
Use `interpreted-function-p`; adjust to new representation; and take
advantage of the fact that function values are now self-evaluating.
* lisp/emacs-lisp/lisp-mode.el (closure):
Remove `lisp-indent-function` property.
* lisp/emacs-lisp/disass.el (disassemble-internal): Adjust to
new representation.
* lisp/emacs-lisp/edebug.el (edebug--strip-instrumentation):
Use `interpreted-function-p`.
* lisp/emacs-lisp/comp-common.el (comp-known-type-specifiers):
Add `closurep` and `interpreted-function-p`.
* test/lisp/help-fns-tests.el (help-fns-test-lisp-defun): Adjust to
more precise type info in `describe-function`.
* test/lisp/erc/resources/erc-d/erc-d-tests.el (erc-d--render-entries):
Use `interpreted-function-p`.
* test/lisp/emacs-lisp/macroexp-resources/vk.el (vk-f4, vk-f5):
Don't hardcode function values.
* doc/lispref/functions.texi (Anonymous Functions): Don't suggest that
function values are lists. Reword "self-quoting" to reflect the
fact that #' doesn't return the exact same object. Update examples
with the new shape of the return value.
* doc/lispref/variables.texi (Lexical Binding):
* doc/lispref/lists.texi (Rearrangement):
* doc/lispref/control.texi (Handling Errors): Update examples to reflect
new representation of function values.
2024-03-11 16:12:26 -04:00
|
|
|
((closurep obj)
|
2015-09-03 15:15:11 -04:00
|
|
|
(setq args (help-function-arglist obj)))
|
1996-04-08 15:36:48 +00:00
|
|
|
(t (error "Compilation failed")))
|
1992-07-10 22:06:47 +00:00
|
|
|
(if (zerop indent) ; not a nested function
|
|
|
|
(progn
|
|
|
|
(indent-to indent)
|
|
|
|
(insert (format "byte code%s%s%s:\n"
|
|
|
|
(if (or macro name) " for" "")
|
|
|
|
(if macro " macro" "")
|
|
|
|
(if name (format " %s" name) "")))))
|
|
|
|
(let ((doc (if (consp obj)
|
|
|
|
(and (stringp (car obj)) (car obj))
|
1995-10-30 19:22:23 +00:00
|
|
|
;; Use documentation to get lazy-loaded doc string
|
|
|
|
(documentation obj t))))
|
1992-07-10 22:06:47 +00:00
|
|
|
(if (and doc (stringp doc))
|
|
|
|
(progn (and (consp obj) (setq obj (cdr obj)))
|
|
|
|
(indent-to indent)
|
|
|
|
(princ " doc: " (current-buffer))
|
|
|
|
(if (string-match "\n" doc)
|
|
|
|
(setq doc (concat (substring doc 0 (match-beginning 0))
|
|
|
|
" ...")))
|
|
|
|
(insert doc "\n"))))
|
|
|
|
(indent-to indent)
|
|
|
|
(insert " args: ")
|
|
|
|
(prin1 args (current-buffer))
|
|
|
|
(insert "\n")
|
2015-09-03 15:15:11 -04:00
|
|
|
(let ((interactive (interactive-form obj)))
|
1992-07-10 22:06:47 +00:00
|
|
|
(if interactive
|
|
|
|
(progn
|
|
|
|
(setq interactive (nth 1 interactive))
|
|
|
|
(if (eq (car-safe (car-safe obj)) 'interactive)
|
|
|
|
(setq obj (cdr obj)))
|
|
|
|
(indent-to indent)
|
|
|
|
(insert " interactive: ")
|
|
|
|
(if (eq (car-safe interactive) 'byte-code)
|
|
|
|
(progn
|
|
|
|
(insert "\n")
|
|
|
|
(disassemble-1 interactive
|
|
|
|
(+ indent disassemble-recursive-indent)))
|
|
|
|
(let ((print-escape-newlines t))
|
|
|
|
(prin1 interactive (current-buffer))))
|
|
|
|
(insert "\n"))))
|
2024-04-29 13:47:15 -04:00
|
|
|
(cond ((byte-code-function-p obj)
|
1992-07-10 22:06:47 +00:00
|
|
|
(disassemble-1 obj indent))
|
|
|
|
(t
|
|
|
|
(insert "Uncompiled body: ")
|
|
|
|
(let ((print-escape-newlines t))
|
Use a dedicated type to represent interpreted-function values
Change `function` so that when evaluating #'(lambda ...)
we return an object of type `interpreted-function` rather than
a list starting with one of `lambda` or `closure`.
The new type reuses the existing PVEC_CLOSURE (nee PVEC_COMPILED)
tag and tries to align the corresponding elements:
- the arglist, the docstring, and the interactive-form go in the
same slots as for byte-code functions.
- the body of the function goes in the slot used for the bytecode string.
- the lexical context goes in the slot used for the constants of
bytecoded functions.
The first point above means that `help-function-arglist`,
`documentation`, and `interactive-form`s don't need to
distinguish interpreted and bytecode functions any more.
Main benefits of the change:
- We can now reliably distinguish a list from a function value.
- `cl-defmethod` can dispatch on `interactive-function` and `closure`.
Dispatch on `function` also works now for interpreted functions but still
won't work for functions represented as lists or as symbols, of course.
- Function values are now self-evaluating. That was alrready the case
when byte-compiled, but not when interpreted since
(eval '(closure ...)) signals a void-function error.
That also avoids false-positive warnings about "don't quote your lambdas"
when doing things like `(mapcar ',func ...)`.
* src/eval.c (Fmake_interpreted_closure): New function.
(Ffunction): Use it and change calling convention of
`Vinternal_make_interpreted_closure_function`.
(FUNCTIONP, Fcommandp, eval_sub, funcall_general, funcall_lambda)
(Ffunc_arity, lambda_arity): Simplify.
(funcall_lambda): Adjust to new representation.
(syms_of_eval): `defsubr` the new function. Remove definition of `Qclosure`.
* lisp/emacs-lisp/cconv.el (cconv-make-interpreted-closure):
Change calling convention and use `make-interpreted-closure`.
* src/data.c (Fcl_type_of): Distinguish `byte-code-function`s from
`interpreted-function`s.
(Fclosurep, finterpreted_function_p): New functions.
(Fbyte_code_function_p): Don't be confused by `interpreted-function`s.
(Finteractive_form, Fcommand_modes): Simplify.
(syms_of_data): Define new type symbols and `defsubr` the two
new functions.
* lisp/emacs-lisp/cl-print.el (cl-print-object) <interpreted-function>:
New method.
* lisp/emacs-lisp/oclosure.el (oclosure): Refine the parent
to be `closure`.
(oclosure--fix-type, oclosure-type): Simplify.
(oclosure--copy, oclosure--get, oclosure--set): Adjust to
new representation.
* src/callint.c (Fcall_interactively): Adjust to new representation.
* src/lread.c (bytecode_from_rev_list):
* lisp/simple.el (function-documentation):
* lisp/help.el (help-function-arglist): Remove the old `closure` case
and adjust the byte-code case so it handles `interpreted-function`s.
* lisp/emacs-lisp/cl-preloaded.el (closure): New type.
(byte-code-function): Add it as a parent.
(interpreted-function): Adjust parent (the type itself was already
added earlier by accident).
* lisp/emacs-lisp/bytecomp.el (byte-compile--reify-function): Adjust to
new representation.
(byte-compile): Use `interpreted-function-p`.
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand): Adjust to
new representation.
(side-effect-free-fns): Add `interpreted-function-p` and `closurep`.
* src/profiler.c (trace_hash, ffunction_equal): Simplify.
* lisp/profiler.el (profiler-function-equal): Simplify.
* lisp/emacs-lisp/nadvice.el (advice--interactive-form-1):
Use `interpreted-function-p`; adjust to new representation; and take
advantage of the fact that function values are now self-evaluating.
* lisp/emacs-lisp/lisp-mode.el (closure):
Remove `lisp-indent-function` property.
* lisp/emacs-lisp/disass.el (disassemble-internal): Adjust to
new representation.
* lisp/emacs-lisp/edebug.el (edebug--strip-instrumentation):
Use `interpreted-function-p`.
* lisp/emacs-lisp/comp-common.el (comp-known-type-specifiers):
Add `closurep` and `interpreted-function-p`.
* test/lisp/help-fns-tests.el (help-fns-test-lisp-defun): Adjust to
more precise type info in `describe-function`.
* test/lisp/erc/resources/erc-d/erc-d-tests.el (erc-d--render-entries):
Use `interpreted-function-p`.
* test/lisp/emacs-lisp/macroexp-resources/vk.el (vk-f4, vk-f5):
Don't hardcode function values.
* doc/lispref/functions.texi (Anonymous Functions): Don't suggest that
function values are lists. Reword "self-quoting" to reflect the
fact that #' doesn't return the exact same object. Update examples
with the new shape of the return value.
* doc/lispref/variables.texi (Lexical Binding):
* doc/lispref/lists.texi (Rearrangement):
* doc/lispref/control.texi (Handling Errors): Update examples to reflect
new representation of function values.
2024-03-11 16:12:26 -04:00
|
|
|
(prin1 (macroexp-progn (if (interpreted-function-p obj)
|
|
|
|
(aref obj 1)
|
|
|
|
obj))
|
1992-07-10 22:06:47 +00:00
|
|
|
(current-buffer))))))
|
|
|
|
(if interactive-p
|
|
|
|
(message "")))
|
|
|
|
|
|
|
|
|
|
|
|
(defun disassemble-1 (obj indent)
|
2021-09-14 07:55:56 +02:00
|
|
|
"Print the byte-code call OBJ in the current buffer.
|
1992-07-10 22:06:47 +00:00
|
|
|
OBJ should be a call to BYTE-CODE generated by the byte compiler."
|
|
|
|
(let (bytes constvec)
|
|
|
|
(if (consp obj)
|
|
|
|
(setq bytes (car (cdr obj)) ;the byte code
|
|
|
|
constvec (car (cdr (cdr obj)))) ;constant vector
|
1998-08-11 11:05:51 +00:00
|
|
|
(setq bytes (aref obj 1)
|
1992-07-10 22:06:47 +00:00
|
|
|
constvec (aref obj 2)))
|
2019-06-13 13:54:53 +02:00
|
|
|
(cl-assert (not (multibyte-string-p bytes)))
|
|
|
|
(let ((lap (byte-decompile-bytecode bytes constvec))
|
1994-07-20 05:33:14 +00:00
|
|
|
op arg opname pc-value)
|
1992-07-10 22:06:47 +00:00
|
|
|
(let ((tagno 0)
|
|
|
|
tmp
|
|
|
|
(lap lap))
|
|
|
|
(while (setq tmp (assq 'TAG lap))
|
|
|
|
(setcar (cdr tmp) (setq tagno (1+ tagno)))
|
|
|
|
(setq lap (cdr (memq tmp lap)))))
|
|
|
|
(while lap
|
1994-07-20 05:33:14 +00:00
|
|
|
;; Take off the pc value of the next thing
|
|
|
|
;; and put it in pc-value.
|
|
|
|
(setq pc-value nil)
|
|
|
|
(if (numberp (car lap))
|
|
|
|
(setq pc-value (car lap)
|
|
|
|
lap (cdr lap)))
|
|
|
|
;; Fetch the next op and its arg.
|
1992-07-10 22:06:47 +00:00
|
|
|
(setq op (car (car lap))
|
|
|
|
arg (cdr (car lap)))
|
1994-07-20 05:33:14 +00:00
|
|
|
(setq lap (cdr lap))
|
1992-07-10 22:06:47 +00:00
|
|
|
(indent-to indent)
|
|
|
|
(if (eq 'TAG op)
|
1994-07-20 05:33:14 +00:00
|
|
|
(progn
|
|
|
|
;; We have a label. Display it, but first its pc value.
|
|
|
|
(if pc-value
|
|
|
|
(insert (format "%d:" pc-value)))
|
|
|
|
(insert (int-to-string (car arg))))
|
|
|
|
;; We have an instruction. Display its pc value first.
|
|
|
|
(if pc-value
|
|
|
|
(insert (format "%d" pc-value)))
|
1992-07-10 22:06:47 +00:00
|
|
|
(indent-to (+ indent disassemble-column-1-indent))
|
|
|
|
(if (and op
|
|
|
|
(string-match "^byte-" (setq opname (symbol-name op))))
|
|
|
|
(setq opname (substring opname 5))
|
|
|
|
(setq opname "<not-an-opcode>"))
|
|
|
|
(if (eq op 'byte-constant2)
|
|
|
|
(insert " #### shouldn't have seen constant2 here!\n "))
|
|
|
|
(insert opname)
|
|
|
|
(indent-to (+ indent disassemble-column-1-indent
|
|
|
|
disassemble-column-2-indent
|
|
|
|
-1))
|
|
|
|
(insert " ")
|
|
|
|
(cond ((memq op byte-goto-ops)
|
|
|
|
(insert (int-to-string (nth 1 arg))))
|
|
|
|
((memq op '(byte-call byte-unbind
|
2010-06-13 16:36:17 -04:00
|
|
|
byte-listN byte-concatN byte-insertN
|
|
|
|
byte-stack-ref byte-stack-set byte-stack-set2
|
|
|
|
byte-discardN byte-discardN-preserve-tos))
|
1992-07-10 22:06:47 +00:00
|
|
|
(insert (int-to-string arg)))
|
|
|
|
((memq op '(byte-varref byte-varset byte-varbind))
|
|
|
|
(prin1 (car arg) (current-buffer)))
|
|
|
|
((memq op '(byte-constant byte-constant2))
|
|
|
|
;; it's a constant
|
|
|
|
(setq arg (car arg))
|
2017-01-26 01:02:16 +05:30
|
|
|
;; if the succeeding op is byte-switch, display the jump table
|
|
|
|
;; used
|
|
|
|
(cond ((eq (car-safe (car-safe (cdr lap))) 'byte-switch)
|
2024-03-04 23:42:50 -05:00
|
|
|
(insert (format "<jump-table-%s (" (hash-table-test arg)))
|
|
|
|
(let ((first-time t))
|
|
|
|
(maphash #'(lambda (value tag)
|
|
|
|
(if first-time
|
|
|
|
(setq first-time nil)
|
|
|
|
(insert " "))
|
|
|
|
(insert (format "%s %s" value (cadr tag))))
|
|
|
|
arg))
|
|
|
|
(insert ")>"))
|
|
|
|
;; if the value of the constant is compiled code, then
|
|
|
|
;; recursively disassemble it.
|
|
|
|
((or (byte-code-function-p arg)
|
1992-07-10 22:06:47 +00:00
|
|
|
(and (eq (car-safe arg) 'macro)
|
2024-03-04 23:42:50 -05:00
|
|
|
(byte-code-function-p (cdr arg))))
|
1993-01-26 01:58:16 +00:00
|
|
|
(cond ((byte-code-function-p arg)
|
2024-05-01 14:14:01 -04:00
|
|
|
(insert "<byte-code-function>\n"))
|
1992-07-10 22:06:47 +00:00
|
|
|
(t (insert "<compiled macro>\n")))
|
|
|
|
(disassemble-internal
|
|
|
|
arg
|
|
|
|
(+ indent disassemble-recursive-indent 1)
|
|
|
|
nil))
|
|
|
|
((eq (car-safe arg) 'byte-code)
|
|
|
|
(insert "<byte code>\n")
|
|
|
|
(disassemble-1 ;recurse on byte-code object
|
|
|
|
arg
|
|
|
|
(+ indent disassemble-recursive-indent)))
|
|
|
|
((eq (car-safe (car-safe arg)) 'byte-code)
|
2024-04-29 13:47:15 -04:00
|
|
|
;; FIXME: I'm 99% sure bytecomp never generates
|
|
|
|
;; this any more.
|
1992-07-10 22:06:47 +00:00
|
|
|
(insert "(<byte code>...)\n")
|
2024-03-04 23:42:50 -05:00
|
|
|
(mapc ;Recurse on list of byte-code objects.
|
2011-05-23 14:57:17 -03:00
|
|
|
(lambda (obj)
|
|
|
|
(disassemble-1
|
|
|
|
obj
|
|
|
|
(+ indent disassemble-recursive-indent)))
|
1992-07-10 22:06:47 +00:00
|
|
|
arg))
|
|
|
|
(t
|
|
|
|
;; really just a constant
|
|
|
|
(let ((print-escape-newlines t))
|
|
|
|
(prin1 arg (current-buffer))))))
|
|
|
|
)
|
1994-07-20 05:33:14 +00:00
|
|
|
(insert "\n")))))
|
1992-07-10 22:06:47 +00:00
|
|
|
nil)
|
1992-07-17 08:15:29 +00:00
|
|
|
|
2023-10-13 15:21:26 +02:00
|
|
|
(defun re-disassemble (regexp &optional case-table)
|
|
|
|
"Describe the compiled form of REGEXP in a separate window.
|
|
|
|
If CASE-TABLE is non-nil, use it as translation table for case-folding.
|
|
|
|
|
|
|
|
This function is mainly intended for maintenance of Emacs itself
|
|
|
|
and may change at any time. It requires Emacs to be built with
|
|
|
|
`--enable-checking'."
|
|
|
|
(interactive "XRegexp (Lisp expression): ")
|
|
|
|
(let ((desc (with-temp-buffer
|
|
|
|
(when case-table
|
|
|
|
(set-case-table case-table))
|
|
|
|
(let ((case-fold-search (and case-table t)))
|
|
|
|
(re--describe-compiled regexp)))))
|
|
|
|
(with-output-to-temp-buffer "*Regexp-disassemble*"
|
|
|
|
(with-current-buffer standard-output
|
|
|
|
(insert desc)))))
|
|
|
|
|
1997-06-22 18:57:55 +00:00
|
|
|
(provide 'disass)
|
|
|
|
|
1992-07-17 08:15:29 +00:00
|
|
|
;;; disass.el ends here
|