diff options
| author | 2007-12-17 16:41:39 +0000 | |
|---|---|---|
| committer | 2007-12-17 16:41:39 +0000 | |
| commit | 507ca2d27520118151a2556d96b9a15aac768876 (patch) | |
| tree | 46bb2585f4114b1dfc157c3bfe60238d23877e7a /src/emu/debug | |
| parent | df34329a478833efbd542a424ce1813a11214d4a (diff) | |
Changes for MAME 0.121u4.mame0121u4
Diffstat (limited to 'src/emu/debug')
| -rw-r--r-- | src/emu/debug/debugcmd.c | 4 | ||||
| -rw-r--r-- | src/emu/debug/debugcpu.c | 4 | ||||
| -rw-r--r-- | src/emu/debug/debughlp.c | 4 | ||||
| -rw-r--r-- | src/emu/debug/express.c | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c index 41fe159e064..75c444a6d00 100644 --- a/src/emu/debug/debugcmd.c +++ b/src/emu/debug/debugcmd.c @@ -1275,7 +1275,7 @@ static void execute_wpdisenable(int ref, int params, const char *param[]) static void execute_wplist(int ref, int params, const char *param[]) { - static const char *spacenames[ADDRESS_SPACES] = { "program", "data", "I/O" }; + static const char *const spacenames[ADDRESS_SPACES] = { "program", "data", "I/O" }; int cpunum, printed = 0; char buffer[256]; @@ -1292,7 +1292,7 @@ static void execute_wplist(int ref, int params, const char *param[]) { if (cpuinfo->space[spacenum].first_wp) { - static const char *types[] = { "unkn ", "read ", "write", "r/w " }; + static const char *const types[] = { "unkn ", "read ", "write", "r/w " }; debug_cpu_watchpoint *wp; debug_console_printf("CPU %d %s space watchpoints:\n", cpunum, spacenames[spacenum]); diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index 81099acd348..3d25239aaac 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -42,7 +42,7 @@ FILE *debug_source_file; symbol_table *global_symtable; -static const char *address_space_name[] = { "program", "data", "I/O" }; +static const char *const address_space_name[] = { "program", "data", "I/O" }; static UINT64 wpdata; static UINT64 wpaddr; @@ -1317,7 +1317,7 @@ static void check_watchpoints(int cpunum, int spacenum, int type, offs_t address /* if we do, evaluate the condition */ if (wp->condition == NULL || (expression_execute(wp->condition, &result) == EXPRERR_NONE && result)) { - static const char *sizes[] = + static const char *const sizes[] = { "0bytes", "byte", "word", "3bytes", "dword", "5bytes", "6bytes", "7bytes", "qword" }; diff --git a/src/emu/debug/debughlp.c b/src/emu/debug/debughlp.c index 68e188130da..d1241aab076 100644 --- a/src/emu/debug/debughlp.c +++ b/src/emu/debug/debughlp.c @@ -53,7 +53,7 @@ struct _help_item TABLE OF HELP ***************************************************************************/ -static help_item static_help_list[] = +static const help_item static_help_list[] = { { "", @@ -1035,7 +1035,7 @@ static help_item static_help_list[] = const char *debug_get_help(const char *tag) { static char ambig_message[1024]; - help_item *found = NULL; + const help_item *found = NULL; int i, msglen, foundcount = 0; int taglen = (int)strlen(tag); char tagcopy[256]; diff --git a/src/emu/debug/express.c b/src/emu/debug/express.c index 22aa49d9782..8694c8751d9 100644 --- a/src/emu/debug/express.c +++ b/src/emu/debug/express.c @@ -1158,6 +1158,12 @@ static EXPRERR execute_tokens(parsed_expression *expr, UINT64 *result) /* reset the token stack */ init_token_stack(expr); + /* Initialize t1, t2 to keep gcc's warnings-as-errors happy */ + t1.type = TOK_INVALID; + t1.offset = 0; + t2.type = TOK_INVALID; + t2.offset = 0; + /* create a temporary token for holding intermediate number and memory values */ tempnum.type = TOK_NUMBER; tempnum.offset = 0; |
