Mercurial > hg > xemacs-beta
annotate dynodump/README @ 4697:0d6d0edf1253
lisp beginning-end-of-defun-function Changelog entry
hg diff
diff -r ecc468b62551 lisp/ChangeLog
--- a/lisp/ChangeLog Mon Sep 21 21:40:35 2009 +0200
+++ b/lisp/ChangeLog Tue Sep 22 21:11:51 2009 +0200
@@ -1,3 +1,12 @@ 2009-09-20 Aidan Kehoe <kehoea@parhasa
+2009-09-22 Andreas Roehler <andreas.roehler@online.de>
+
+ * lisp.el (beginning-of-defun-raw):
+ new variable: beginning-of-defun-function,
+ beginning-of-defun may call FUNCTION determining start position
+ * lisp.el (end-of-defun):
+ new variable: end-of-defun-function,
+ end-of-defun may call FUNCTION determining the end position
+
;;;;;;;;;;;;;;;;;;;;;;;;
hg diff -p -r 4695 -r 4696
diff -r fee33ab25966 -r ecc468b62551 lisp/lisp.el
--- a/lisp/lisp.el Sun Sep 20 23:50:05 2009 +0100
+++ b/lisp/lisp.el Mon Sep 21 21:40:35 2009 +0200
@@ -155,6 +155,21 @@ Negative arg -N means kill N sexps after
(interactive "p")
(kill-sexp (- (or arg 1))))
+
+;; derived stuff from GNU Emacs
+(defvar beginning-of-defun-function nil
+ "If non-nil, function for `beginning-of-defun-raw' to call.
+This is used to find the beginning of the defun instead of using the
+normal recipe (see `beginning-of-defun'). Modes can define this
+if defining `defun-prompt-regexp' is not sufficient to handle the mode's
+needs.")
+
+(defvar end-of-defun-function nil
+ "If non-nil, function for `end-of-defun' to call.
+This is used to find the end of the defun instead of using the normal
+recipe (see `end-of-defun'). Modes can define this if the
+normal method is not appropriate.")
+
(defun beginning-of-defun (&optional arg)
"Move backward to the beginning of a defun.
With argument, do it that many times. Negative arg -N
@@ -175,13 +190,17 @@ This is identical to beginning-of-defun,
This is identical to beginning-of-defun, except that point does not move
to the beginning of the line when `defun-prompt-regexp' is non-nil."
(interactive "p")
- (and arg (< arg 0) (not (eobp)) (forward-char 1))
- (and (re-search-backward (if defun-prompt-regexp
- (concat "^\\s(\\|"
- "\\(" defun-prompt-regexp "\\)\\s(")
- "^\\s(")
- nil 'move (or arg 1))
- (progn (goto-char (1- (match-end 0)))) t))
+ ;; (and arg (< arg 0) (not (eobp)) (forward-char 1))
+ (unless arg (setq arg 1))
+ (cond
+ (beginning-of-defun-function
+ (funcall beginning-of-defun-function arg))
+ (t (re-search-backward (if defun-prompt-regexp
+ (concat "^\\s(\\|"
+ "\\(" defun-prompt-regexp "\\)\\s(")
+ "^\\s(")
+ nil 'move (or arg 1))
+ (progn (goto-char (1- (match-end 0)))) t)))
;; XEmacs change (optional buffer parameter)
(defun buffer-end (arg &optional buffer)
@@ -198,6 +217,10 @@ the open-parenthesis that starts a defun
;; XEmacs change (for zmacs regions)
(interactive "_p")
(if (or (null arg) (= arg 0)) (setq arg 1))
+ (if end-of-defun-function
+ (if (> arg 0)
+ (dotimes (i arg)
+ (funcall end-of-defun-function)))
(let ((first t))
(while (and (> arg 0) (< (point) (point-max)))
(let ((pos (point))) ; XEmacs -- remove unused npos.
@@ -229,7 +252,7 @@ the open-parenthesis that starts a defun
(if (looking-at "\\s<\\|\n")
(forward-line 1)))
(goto-char (point-min)))))
- (setq arg (1+ arg)))))
+ (setq arg (1+ arg))))))
(defun mark-defun ()
"Put mark at end of this defun, point at beginning.
| author | Andreas Roehler <andreas.roehler@online.de> |
|---|---|
| date | Tue, 22 Sep 2009 21:14:03 +0200 |
| parents | 376386a54a3c |
| children |
| rev | line source |
|---|---|
| 0 | 1 DYNODUMP |
| 2 -------- | |
| 3 | |
| 4 Dynodump, not to be confused with DinoTurd (as seen in Jurassic Park), | |
| 5 is a shared object that provides one function: | |
| 6 | |
| 7 int dynodump(char *new_file); | |
| 8 | |
| 9 dynodump(), called from a running program will write a new executable | |
| 10 in new_file a la unexec() in GNU Emacs. The difference lies in the | |
| 11 relocations. | |
| 12 | |
| 13 dynodump() will create an image with any relocations (which were | |
| 14 performed by the run-time dynamic linker) undone. This allows the new | |
| 15 image to be run in a different environment. There is, however, one | |
| 16 potentially major caveat. If a symbol reference gets updated during | |
| 17 the running of the calling program, its updated value will be lost. | |
| 18 An example (with additional blank lines for legibility): | |
| 19 | |
| 20 $ cat lib.c | |
| 21 char _foo[] = "hello"; | |
| 22 char _bar[] = "world"; | |
| 23 | |
| 24 $ cc -G -o lib.so lib.c | |
| 25 | |
| 26 $ cat prog.c | |
| 27 extern char _foo, _bar; | |
| 28 | |
| 29 int beenhere = 0; | |
| 30 char * foo = &_foo; | |
| 31 char * bar = &_bar; | |
| 32 | |
| 33 int | |
| 34 main(void) | |
| 35 { | |
| 36 (void) printf("%d: foo = %x\n", beenhere, foo); | |
| 37 (void) printf("%d: bar = %x, ", beenhere, bar); | |
| 38 | |
| 39 if (!beenhere) { | |
| 40 beenhere = 1; | |
| 41 bar++; | |
| 42 dynodump("newfile"); | |
| 43 } | |
| 44 (void) printf("%x\n", bar); | |
| 45 } | |
| 46 | |
| 47 $ cc -o prog prog.c -R. lib.so dynodump.so | |
| 48 | |
| 49 $ ./prog | |
| 50 0: foo = ef7503cc | |
| 51 0: bar = ef7503d2, ef7503d3 | |
| 52 | |
| 53 $ ./newfile | |
| 54 1: foo = ef7503cc | |
| 55 1: bar = ef7503d2, ef7503d2 | |
| 56 | |
| 57 Notice that in the run of newfile, bar points at "world" instead of | |
| 58 the perhaps expected "orld". | |
| 59 | |
| 60 Dynodump supports sparc, intel, and power pc architectures. | |
| 61 | |
| 62 Dynodump is buildable with GNU make and gcc. If it works for you | |
| 63 with these tools, let me know. | |
| 64 | |
| 65 unexec() | |
| 66 -------- | |
| 67 | |
| 68 Also supplied is an unexsol2.c which belongs in the XEmacs src | |
| 69 directory with the other unex*.c files. The src/s/sol2.h should be | |
| 70 have the following added to it: | |
| 71 | |
| 72 #ifdef UNEXEC | |
| 73 #undef UNEXEC | |
| 74 #endif | |
| 75 #define UNEXEC unexsol2.o | |
| 76 | |
| 77 This unexec() will attempt to dlopen() the dynodump.so to find the | |
| 78 dynodump function. The default is "../dynodump/dynodump.so" which | |
| 79 should be appropriate for the typical XEmacs build (unless you used | |
| 80 configure to set up separate build and source trees). You may change | |
| 81 it by setting the DYNODUMP environment variable to the full path of | |
| 82 the dynodump shared object. | |
| 83 | |
| 84 Other notes: | |
| 85 | |
| 86 If you're using the 4.0 C compiler from Sun, you should arrange to | |
| 87 shut off the incremental linker. This is done with the -xildoff | |
| 88 option to the compiler. The common.mk and testsuite/Makefile files | |
| 89 have commentary and ready made lines for uncommenting for this | |
| 90 purpose. | |
| 91 | |
| 92 If you're interested in playing with the UltraSPARC specific options | |
| 93 to the aforementioned compiler, then the same makefiles have some | |
| 94 commentary and flags settings to point you in that direction. | |
| 95 | |
| 96 Questions: | |
| 97 | |
| 98 dynodump() was developed by Rod.Evans@Eng.Sun.COM and | |
| 99 Georg.Nikodym@Canada.Sun.COM. If you have questions, feel free to ask | |
| 100 them but be aware that Rod, "don't know jack about emacs." | |
| 101 |