forked from OSchip/llvm-project
Delete the directory, will try to resubmit later.
llvm-svn: 117751
This commit is contained in:
Johnny Chen
parent
5ef9e33137
commit
2ed83824af
|
|
@ -1,10 +0,0 @@
|
|||
The lldb-enhanced gud.el is based on the emacs 22.3.1 version from Aquamacs 1.8c
|
||||
distribution.
|
||||
|
||||
The gud-diffs.txt is the diff from the gud.el file from emacs 22.3.1.
|
||||
|
||||
To use it, load the file from within emacs and type 'M-x lldb' to invoke lldb.
|
||||
|
||||
The lldb-gud-window.tiff is a screen capture of the gud (with lldb) at work on
|
||||
Aquamacs distribution 2.1 by loading the gud.el in this directory and 'M-x lldb'
|
||||
on the ../../test/condition_break directory.
|
||||
|
|
@ -1,250 +0,0 @@
|
|||
--- /tmp/gud.el 2009-05-06 05:16:32.000000000 -0700
|
||||
+++ utils/emacs/gud.el 2010-10-29 16:41:53.000000000 -0700
|
||||
@@ -144,12 +144,12 @@
|
||||
(display-graphic-p)
|
||||
(fboundp 'x-show-tip))
|
||||
:visible (memq gud-minor-mode
|
||||
- '(gdbmi gdba dbx sdb xdb pdb))
|
||||
+ '(lldb gdbmi gdba dbx sdb xdb pdb))
|
||||
:button (:toggle . gud-tooltip-mode))
|
||||
([refresh] "Refresh" . gud-refresh)
|
||||
([run] menu-item "Run" gud-run
|
||||
:enable (not gud-running)
|
||||
- :visible (memq gud-minor-mode '(gdbmi gdb dbx jdb)))
|
||||
+ :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx jdb)))
|
||||
([go] menu-item (if gdb-active-process "Continue" "Run") gud-go
|
||||
:visible (and (not gud-running)
|
||||
(eq gud-minor-mode 'gdba)))
|
||||
@@ -167,18 +167,18 @@
|
||||
([tbreak] menu-item "Temporary Breakpoint" gud-tbreak
|
||||
:enable (not gud-running)
|
||||
:visible (memq gud-minor-mode
|
||||
- '(gdbmi gdba gdb sdb xdb)))
|
||||
+ '(lldb gdbmi gdba gdb sdb xdb)))
|
||||
([break] menu-item "Set Breakpoint" gud-break
|
||||
:enable (not gud-running)
|
||||
:visible (gud-tool-bar-item-visible-no-fringe))
|
||||
([up] menu-item "Up Stack" gud-up
|
||||
:enable (not gud-running)
|
||||
:visible (memq gud-minor-mode
|
||||
- '(gdbmi gdba gdb dbx xdb jdb pdb)))
|
||||
+ '(lldb gdbmi gdba gdb dbx xdb jdb pdb)))
|
||||
([down] menu-item "Down Stack" gud-down
|
||||
:enable (not gud-running)
|
||||
:visible (memq gud-minor-mode
|
||||
- '(gdbmi gdba gdb dbx xdb jdb pdb)))
|
||||
+ '(lldb gdbmi gdba gdb dbx xdb jdb pdb)))
|
||||
([pp] menu-item "Print S-expression" gud-pp
|
||||
:enable (and (not gud-running)
|
||||
gdb-active-process)
|
||||
@@ -188,7 +188,7 @@
|
||||
(eq gud-minor-mode 'gdba)))
|
||||
([print*] menu-item "Print Dereference" gud-pstar
|
||||
:enable (not gud-running)
|
||||
- :visible (memq gud-minor-mode '(gdbmi gdba gdb)))
|
||||
+ :visible (memq gud-minor-mode '(lldb gdbmi gdba gdb)))
|
||||
([print] menu-item "Print Expression" gud-print
|
||||
:enable (not gud-running))
|
||||
([watch] menu-item "Watch Expression" gud-watch
|
||||
@@ -197,13 +197,13 @@
|
||||
([finish] menu-item "Finish Function" gud-finish
|
||||
:enable (not gud-running)
|
||||
:visible (memq gud-minor-mode
|
||||
- '(gdbmi gdba gdb xdb jdb pdb)))
|
||||
+ '(lldb gdbmi gdba gdb xdb jdb pdb)))
|
||||
([stepi] menu-item "Step Instruction" gud-stepi
|
||||
:enable (not gud-running)
|
||||
- :visible (memq gud-minor-mode '(gdbmi gdba gdb dbx)))
|
||||
+ :visible (memq gud-minor-mode '(lldb gdbmi gdba gdb dbx)))
|
||||
([nexti] menu-item "Next Instruction" gud-nexti
|
||||
:enable (not gud-running)
|
||||
- :visible (memq gud-minor-mode '(gdbmi gdba gdb dbx)))
|
||||
+ :visible (memq gud-minor-mode '(lldb gdbmi gdba gdb dbx)))
|
||||
([step] menu-item "Step Line" gud-step
|
||||
:enable (not gud-running))
|
||||
([next] menu-item "Next Line" gud-next
|
||||
@@ -350,6 +350,7 @@
|
||||
%l -- Number of current source line.
|
||||
%e -- Text of the C lvalue or function-call expression surrounding point.
|
||||
%a -- Text of the hexadecimal address surrounding point.
|
||||
+ %b -- Text of the most recently created breakpoint id.
|
||||
%p -- Prefix argument to the command (if any) as a number.
|
||||
%c -- Fully qualified class name derived from the expression
|
||||
surrounding point (jdb only).
|
||||
@@ -930,6 +931,126 @@
|
||||
|
||||
|
||||
;; ======================================================================
|
||||
+;; lldb functions
|
||||
+
|
||||
+;; History of argument lists passed to lldb.
|
||||
+(defvar gud-lldb-history nil)
|
||||
+
|
||||
+;; Keeps track of breakpoint created. In the following case, the id is "1".
|
||||
+;; It is used to implement temporary breakpoint.
|
||||
+;; (lldb) b main.c:39
|
||||
+;; breakpoint set --file 'main.c' --line 39
|
||||
+;; Breakpoint created: 1: file ='main.c', line = 39, locations = 1
|
||||
+(defvar gud-breakpoint-id nil)
|
||||
+
|
||||
+(defun lldb-extract-breakpoint-id (string)
|
||||
+ ;; Search for "Breakpoint created: \\([^:\n]*\\):" pattern.
|
||||
+ (if (string-match "Breakpoint created: \\([^:\n]*\\):" string)
|
||||
+ (progn
|
||||
+ (setq gud-breakpoint-id (match-string 1 string))
|
||||
+ (message "breakpoint id: %s" gud-breakpoint-id)))
|
||||
+)
|
||||
+
|
||||
+(defun gud-lldb-marker-filter (string)
|
||||
+ (setq gud-marker-acc
|
||||
+ (if gud-marker-acc (concat gud-marker-acc string) string))
|
||||
+ (lldb-extract-breakpoint-id gud-marker-acc)
|
||||
+ (let (start)
|
||||
+ ;; Process all complete markers in this chunk
|
||||
+ (while (or
|
||||
+ ;; (lldb) r
|
||||
+ ;; Process 15408 launched: '/Volumes/data/lldb/svn/trunk/test/conditional_break/a.out' (x86_64)
|
||||
+ ;; (lldb) Process 15408 stopped
|
||||
+ ;; * thread #1: tid = 0x2e03, 0x0000000100000de8 a.out`c + 7 at main.c:39, stop reason = breakpoint 1.1, queue = com.apple.main-thread
|
||||
+ (string-match " at \\([^:\n]*\\):\\([0-9]*\\), stop reason = .*\n"
|
||||
+ gud-marker-acc start)
|
||||
+ ;; (lldb) frame select -r 1
|
||||
+ ;; frame #1: 0x0000000100000e09 a.out`main + 25 at main.c:44
|
||||
+ (string-match "\nframe.* at \\([^:\n]*\\):\\([0-9]*\\)\n"
|
||||
+ gud-marker-acc start))
|
||||
+ (setq gud-last-frame
|
||||
+ (cons (match-string 1 gud-marker-acc)
|
||||
+ (string-to-number (match-string 2 gud-marker-acc)))
|
||||
+ start (match-end 0)))
|
||||
+
|
||||
+ ;; Search for the last incomplete line in this chunk
|
||||
+ (while (string-match "\n" gud-marker-acc start)
|
||||
+ (setq start (match-end 0)))
|
||||
+
|
||||
+ ;; If we have an incomplete line, store it in gud-marker-acc.
|
||||
+ (setq gud-marker-acc (substring gud-marker-acc (or start 0))))
|
||||
+ string)
|
||||
+
|
||||
+;; Keeps track of whether the Python lldb_oneshot_break function definition has
|
||||
+;; been exec'ed.
|
||||
+(defvar lldb-oneshot-break-defined nil)
|
||||
+
|
||||
+;;;###autoload
|
||||
+(defun lldb (command-line)
|
||||
+ "Run lldb on program FILE in buffer *gud-FILE*.
|
||||
+The directory containing FILE becomes the initial working directory
|
||||
+and source-file directory for your debugger."
|
||||
+ (interactive (list (gud-query-cmdline 'lldb)))
|
||||
+
|
||||
+ (gud-common-init command-line nil 'gud-lldb-marker-filter)
|
||||
+ (set (make-local-variable 'gud-minor-mode) 'lldb)
|
||||
+ (setq lldb-oneshot-break-defined nil)
|
||||
+
|
||||
+ (gud-def gud-lbreak "breakpoint list"
|
||||
+ "l" "List all breakpoints.")
|
||||
+ (gud-def gud-break "breakpoint set -f %f -l %l"
|
||||
+ "\C-b" "Set breakpoint at current line.")
|
||||
+ (gud-def gud-tbreak
|
||||
+ (progn (gud-call "breakpoint set -f %f -l %l")
|
||||
+ (sit-for 1)
|
||||
+ (if (not lldb-oneshot-break-defined)
|
||||
+ (progn
|
||||
+ ;; The "\\n"'s are required to escape the newline chars
|
||||
+ ;; passed to the lldb process.
|
||||
+ (gud-call (concat "script exec \"def lldb_oneshot_break(frame, bp_loc):\\n"
|
||||
+ " target=frame.GetThread().GetProcess().GetTarget()\\n"
|
||||
+ " bp=bp_loc.GetBreakpoint()\\n"
|
||||
+ " print 'Deleting oneshot breakpoint:', bp\\n"
|
||||
+ " target.BreakpointDelete(bp.GetID())\""))
|
||||
+ (sit-for 1)
|
||||
+ ;; Set the flag since Python knows about the function def now.
|
||||
+ (setq lldb-oneshot-break-defined t)))
|
||||
+ (gud-call "breakpoint command add -p %b -o 'lldb_oneshot_break(frame, bp_loc)'"))
|
||||
+ "\C-t" "Set temporary breakpoint at current line.")
|
||||
+ (gud-def gud-remove "breakpoint clear -f %f -l %l"
|
||||
+ "\C-d" "Remove breakpoint at current line")
|
||||
+ (gud-def gud-step "thread step-in"
|
||||
+ "\C-s" "Step one source line with display.")
|
||||
+ (gud-def gud-stepi "thread step-inst"
|
||||
+ "\C-i" "Step one instruction with display.")
|
||||
+ (gud-def gud-next "thread step-over"
|
||||
+ "\C-n" "Step one line (skip functions).")
|
||||
+ (gud-def gud-nexti "thread step-inst-over"
|
||||
+ nil "Step one instruction (skip functions).")
|
||||
+ (gud-def gud-cont "process continue"
|
||||
+ "\C-r" "Continue with display.")
|
||||
+ (gud-def gud-finish "thread step-out"
|
||||
+ "\C-f" "Finish executing current function.")
|
||||
+ (gud-def gud-up "frame select -r %p"
|
||||
+ "<" "Up 1 stack frame.")
|
||||
+ (gud-def gud-down "frame select -r -%p"
|
||||
+ ">" "Down 1 stack frame.")
|
||||
+ (gud-def gud-print "expression -- %e"
|
||||
+ "\C-p" "Evaluate C expression at point.")
|
||||
+ (gud-def gud-pstar "expression -- *%e"
|
||||
+ nil "Evaluate C dereferenced pointer expression at point.")
|
||||
+ (gud-def gud-run "run"
|
||||
+ nil "Run the program.")
|
||||
+ (gud-def gud-stop-subjob "process kill"
|
||||
+ nil "Stop the program.")
|
||||
+
|
||||
+ (setq comint-prompt-regexp "\\(^\\|\n\\)\\*")
|
||||
+ (setq paragraph-start comint-prompt-regexp)
|
||||
+ (run-hooks 'lldb-mode-hook)
|
||||
+ )
|
||||
+
|
||||
+
|
||||
+;; ======================================================================
|
||||
;; sdb functions
|
||||
|
||||
;; History of argument lists passed to sdb.
|
||||
@@ -2372,9 +2493,10 @@
|
||||
"Major mode for interacting with an inferior debugger process.
|
||||
|
||||
You start it up with one of the commands M-x gdb, M-x sdb, M-x dbx,
|
||||
-M-x perldb, M-x xdb, or M-x jdb. Each entry point finishes by executing a
|
||||
-hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook',
|
||||
-`perldb-mode-hook', `xdb-mode-hook', or `jdb-mode-hook' respectively.
|
||||
+M-x perldb, M-x xdb, M-x jdb, or M-x lldb. Each entry point finishes by
|
||||
+executing a hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook',
|
||||
+`perldb-mode-hook', `xdb-mode-hook', `jdb-mode-hook', or `lldb-mode-hook'
|
||||
+respectively.
|
||||
|
||||
After startup, the following commands are available in both the GUD
|
||||
interaction buffer and any source buffer GUD visits due to a breakpoint stop
|
||||
@@ -2404,7 +2526,7 @@
|
||||
except that the breakpoint is temporary; that is, it is removed when
|
||||
execution stops on it.
|
||||
|
||||
-Under gdb, dbx, and xdb, \\[gud-up] pops up through an enclosing stack
|
||||
+Under gdb, dbx, xdb, and lldb, \\[gud-up] pops up through an enclosing stack
|
||||
frame. \\[gud-down] drops back down through one.
|
||||
|
||||
If you are using gdb or xdb, \\[gud-finish] runs execution to the return from
|
||||
@@ -2724,7 +2846,7 @@
|
||||
result)
|
||||
(while (and str
|
||||
(let ((case-fold-search nil))
|
||||
- (string-match "\\([^%]*\\)%\\([adefFlpc]\\)" str)))
|
||||
+ (string-match "\\([^%]*\\)%\\([abdefFlpc]\\)" str)))
|
||||
(let ((key (string-to-char (match-string 2 str)))
|
||||
subst)
|
||||
(cond
|
||||
@@ -2753,6 +2875,8 @@
|
||||
(setq subst (gud-find-expr)))
|
||||
((eq key ?a)
|
||||
(setq subst (gud-read-address)))
|
||||
+ ((eq key ?b)
|
||||
+ (setq subst gud-breakpoint-id))
|
||||
((eq key ?c)
|
||||
(setq subst
|
||||
(gud-find-class
|
||||
@@ -3372,6 +3496,8 @@
|
||||
(defun gud-tooltip-print-command (expr)
|
||||
"Return a suitable command to print the expression EXPR."
|
||||
(case gud-minor-mode
|
||||
+ ; '-o' to print the objc object description if available
|
||||
+ (lldb (concat "expression -o -- " expr))
|
||||
(gdba (concat "server print " expr))
|
||||
((dbx gdbmi) (concat "print " expr))
|
||||
((xdb pdb) (concat "p " expr))
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Loading…
Reference in New Issue