Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Felix Münchhalfen
wine
Commits
40c11ebf
Commit
40c11ebf
authored
26 years ago
by
Marcus Meissner
Committed by
Alexandre Julliard
26 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Allow switching off/on of debugmsgs in the debugger.
parent
a7894d93
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
debugger/dbg.y
+5
-3
5 additions, 3 deletions
debugger/dbg.y
debugger/debug.l
+3
-0
3 additions, 0 deletions
debugger/debug.l
debugger/info.c
+1
-1
1 addition, 1 deletion
debugger/info.c
include/main.h
+1
-0
1 addition, 0 deletions
include/main.h
misc/main.c
+5
-2
5 additions, 2 deletions
misc/main.c
with
15 additions
and
6 deletions
debugger/dbg.y
+
5
−
3
View file @
40c11ebf
...
...
@@ -23,6 +23,7 @@
#include "debugger.h"
#include "neexe.h"
#include "process.h"
#include "main.h"
#include "ts_xlib.h"
#include "expr.h"
...
...
@@ -56,13 +57,13 @@ extern void VIRTUAL_Dump(void); /* memory/virtual.c */
}
%token tCONT tSTEP tLIST tNEXT tQUIT tHELP tBACKTRACE tINFO tWALK tUP tDOWN
%token tENABLE tDISABLE tBREAK tDELETE tSET tMODE tPRINT tEXAM tABORT
%token tENABLE tDISABLE tBREAK tDELETE tSET tMODE tPRINT tEXAM tABORT
tDEBUGMSG
%token tCLASS tMAPS tMODULE tSTACK tSEGMENTS tREGS tWND tQUEUE tLOCAL
%token tEOL tSTRING
%token tEOL tSTRING
tDEBUGSTR
%token tFRAME tSHARE tCOND tDISPLAY tUNDISPLAY tDISASSEMBLE
%token tSTEPI tNEXTI tFINISH tSHOW tDIR
%token <string> tPATH
%token <string> tIDENTIFIER tSTRING
%token <string> tIDENTIFIER tSTRING
tDEBUGSTR
%token <integer> tNUM tFORMAT
%token <reg> tREG
...
...
@@ -154,6 +155,7 @@ command:
| tUNDISPLAY tEOL { DEBUG_DelDisplay( -1 ); }
| tCOND tNUM tEOL { DEBUG_AddBPCondition($2, NULL); }
| tCOND tNUM expr tEOL { DEBUG_AddBPCondition($2, $3); }
| tDEBUGMSG tDEBUGSTR tEOL { MAIN_ParseDebugOptions($2); }
| list_command
| disassemble_command
| set_command
...
...
This diff is collapsed.
Click to expand it.
debugger/debug.l
+
3
−
0
View file @
40c11ebf
...
...
@@ -46,6 +46,7 @@ STRING \"[^\n"]+\"
%s WALK_CMD
%s SHOW_CMD
%s NOCMD
%s DEBUGSTR
%%
...
...
@@ -78,6 +79,7 @@ STRING \"[^\n"]+\"
<FORMAT_EXPECTED>"/"{FORMAT} { yylval.integer = (1 << 8) | yytext[1]; return tFORMAT; }
{STRING} { yylval.string = make_symbol(yytext); return tSTRING; }
<DEBUGSTR>[a-z+\-,]* { yylval.string = yytext; return tDEBUGSTR; }
$pc { yylval.reg = REG_EIP; return tREG; }
$flags { yylval.reg = REG_EFL; return tREG; }
...
...
@@ -112,6 +114,7 @@ $gs { yylval.reg = REG_GS; return tREG; }
<INITIAL>frame|fram|fra|fr { BEGIN(NOCMD); return tFRAME; }
<INITIAL>list|lis|li|l { BEGIN(PATH_EXPECTED); return tLIST; }
<INITIAL>enable|enabl|enab|ena { BEGIN(NOCMD); return tENABLE;}
<INITIAL>debugmsg|debugms|debugm|debug|debu|deb { BEGIN(DEBUGSTR); return tDEBUGMSG;}
<INITIAL>disable|disabl|disab|disa|dis { BEGIN(NOCMD); return tDISABLE; }
<INITIAL>disassemble|disassembl|disassemb|disassem|disasse|disass|disas { BEGIN(NOCMD); return tDISASSEMBLE; }
<INITIAL,INFO_CMD,DEL_CMD>display|displa|displ|disp { BEGIN(FORMAT_EXPECTED); return tDISPLAY; }
...
...
This diff is collapsed.
Click to expand it.
debugger/info.c
+
1
−
1
View file @
40c11ebf
...
...
@@ -138,7 +138,7 @@ void DEBUG_Help(void)
" frame <n> finish"
,
" show dir dir <path>"
,
" display <expr> undisplay <disnum>"
,
" delete display <disnum>
\n
"
,
" delete display <disnum>
debugmsg <class>[-+]<type>
\n
"
,
"Wine-specific commands:"
,
" mode [16,32] walk [wnd,class,queue,module]"
,
...
...
This diff is collapsed.
Click to expand it.
include/main.h
+
1
−
0
View file @
40c11ebf
...
...
@@ -10,6 +10,7 @@ extern BOOL32 MAIN_MainInit(void);
extern
BOOL32
MAIN_WineInit
(
int
*
argc
,
char
*
argv
[]
);
extern
HINSTANCE32
MAIN_WinelibInit
(
int
*
argc
,
char
*
argv
[]
);
extern
int
MAIN_GetLanguageID
(
char
*
lang
,
char
*
country
,
char
*
charset
,
char
*
dialect
);
extern
BOOL32
MAIN_ParseDebugOptions
(
char
*
options
);
extern
BOOL32
RELAY_Init
(
void
);
extern
int
RELAY_ShowDebugmsgRelay
(
const
char
*
func
);
...
...
This diff is collapsed.
Click to expand it.
misc/main.c
+
5
−
2
View file @
40c11ebf
...
...
@@ -225,7 +225,7 @@ static int MAIN_GetResource( XrmDatabase db, char *name, XrmValue *value )
* RETURNS
* TRUE if parsing was successful
*/
static
BOOL32
MAIN_ParseDebugOptions
(
char
*
options
)
BOOL32
MAIN_ParseDebugOptions
(
char
*
options
)
{
/* defined in relay32/relay386.c */
extern
char
**
debug_relay_includelist
;
...
...
@@ -235,8 +235,11 @@ static BOOL32 MAIN_ParseDebugOptions(char *options)
extern
char
**
debug_snoop_excludelist
;
int
l
,
cls
;
if
(
strlen
(
options
)
<
3
)
l
=
strlen
(
options
);
if
(
l
<
3
)
return
FALSE
;
if
(
options
[
l
-
1
]
==
'\n'
)
options
[
l
-
1
]
=
'\0'
;
do
{
if
((
*
options
!=
'+'
)
&&
(
*
options
!=
'-'
)){
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment