Eric Pouech : winedbg: Rename 'info exception' into 'info frame' ( which is somehow closer to what it does).

Alexandre Julliard julliard at winehq.org
Tue Nov 23 09:38:23 CST 2010


Module: wine
Branch: master
Commit: 9261ef2d0a5d9fa31aa304c53d73f814900547e9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9261ef2d0a5d9fa31aa304c53d73f814900547e9

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sun Nov 21 22:19:34 2010 +0100

winedbg: Rename 'info exception' into 'info frame' (which is somehow closer to what it does).

---

 programs/winedbg/dbg.y          |    4 ++--
 programs/winedbg/debug.l        |    2 +-
 programs/winedbg/debugger.h     |    2 +-
 programs/winedbg/info.c         |    4 ++--
 programs/winedbg/winedbg.man.in |    6 ++++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y
index 336f993..3fec9b7 100644
--- a/programs/winedbg/dbg.y
+++ b/programs/winedbg/dbg.y
@@ -287,8 +287,8 @@ info_command:
     | tINFO '*' tWND expr_rvalue { info_win32_window((HWND)$4, TRUE); }
     | tINFO tPROCESS            { info_win32_processes(); }
     | tINFO tTHREAD             { info_win32_threads(); }
-    | tINFO tEXCEPTION          { info_win32_exceptions(dbg_curr_tid); }
-    | tINFO tEXCEPTION expr_rvalue { info_win32_exceptions($3); }
+    | tINFO tFRAME              { info_win32_frame_exceptions(dbg_curr_tid); }
+    | tINFO tFRAME expr_rvalue  { info_win32_frame_exceptions($3); }
     | tINFO tMAPS               { info_win32_virtual(dbg_curr_pid); }
     | tINFO tMAPS expr_rvalue   { info_win32_virtual($3); }
     ;
diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l
index 2e87ddb..4348140 100644
--- a/programs/winedbg/debug.l
+++ b/programs/winedbg/debug.l
@@ -166,7 +166,7 @@ STRING     \"[^\n"]+\"
 <INITIAL,NOPROCESS>info|inf|in		{ BEGIN(INFO_CMD); return tINFO; }
 <INITIAL>up				{ BEGIN(NOCMD); return tUP; }
 <INITIAL>down|dow|do			{ BEGIN(NOCMD); return tDOWN; }
-<INITIAL>frame|fram|fra|fr		{ BEGIN(NOCMD); return tFRAME; }
+<INITIAL,INFO_CMD>frame|fram|fra|fr	{ BEGIN(NOCMD); return tFRAME; }
 <INITIAL>list|lis|li|l			{ BEGIN(PATH_ACCEPTED); return tLIST; }
 <INITIAL>enable|enabl|enab|ena		{ BEGIN(BD_CMD); return tENABLE;}
 <INITIAL>disable|disabl|disab|disa|dis  { BEGIN(BD_CMD); return tDISABLE; }
diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h
index ae949f2..807a341 100644
--- a/programs/winedbg/debugger.h
+++ b/programs/winedbg/debugger.h
@@ -351,7 +351,7 @@ extern void             info_win32_class(HWND hWnd, const char* clsName);
 extern void             info_win32_window(HWND hWnd, BOOL detailed);
 extern void             info_win32_processes(void);
 extern void             info_win32_threads(void);
-extern void             info_win32_exceptions(DWORD tid);
+extern void             info_win32_frame_exceptions(DWORD tid);
 extern void             info_win32_virtual(DWORD pid);
 extern void             info_win32_segments(DWORD start, int length);
 extern void             info_wine_dbg_channel(BOOL add, const char* chnl, const char* name);
diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
index a09af5d..844bcbc 100644
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@@ -543,11 +543,11 @@ void info_win32_threads(void)
 }
 
 /***********************************************************************
- *           info_win32_exceptions
+ *           info_win32_frame_exceptions
  *
  * Get info on the exception frames of a given thread.
  */
-void info_win32_exceptions(DWORD tid)
+void info_win32_frame_exceptions(DWORD tid)
 {
     struct dbg_thread*  thread;
     void*               next_frame;
diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in
index fb91d6b..8b26e32 100644
--- a/programs/winedbg/winedbg.man.in
+++ b/programs/winedbg/winedbg.man.in
@@ -366,8 +366,10 @@ Prints information of Window of handle \fBN\fR
 Lists all w-processes in Wine session
 .IP \fBinfo\ thread\fR
 Lists all w-threads in Wine session
-.IP \fBinfo\ exception\fR
-Lists the exception frames (starting from current stack frame)
+.IP \fBinfo\ frame\fR
+Lists the exception frames (starting from current stack frame). You
+can also pass, as optional argument, a thread id (instead of current
+thread) to examine its exception frames.
 .PP
 Debug messages can be turned on and off as you are debugging using
 the \fBset\fR command, but only for channels initialized with the




More information about the wine-cvs mailing list