mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle some more settings in gui debugger INI file.

Browse Source
This commit is contained in:
Volker Ruppert 2014-08-31 08:18:43 +00:00
parent a9347e5fba
commit d30d9bc667
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bochs/gui/enh_dbg.cc
View File

@ -76,6 +76,7 @@ bx_bool ignoreNxtT = TRUE; // Do not show "Next at t=" output lines
bx_bool ignSSDisasm = TRUE; // Do not show extra disassembly line at each break
int UprCase = 0; // 1 = convert all Asm, Register names, Register values to uppercase
int DumpInAsciiMode = 3; // bit 1 = show ASCII in dumps, bit 2 = show hex, value=0 is illegal
int DumpWSIndex = 0; // word size index for memory dump
bx_bool LogView = 0; // Send log to output window
bx_bool isLittleEndian = TRUE;
@ -2375,6 +2376,7 @@ void doNewWSize(int i)
if (j != i)
{
ToggleWSchecks(i, j);
DumpWSIndex = i;
DumpAlign = 1<<i;
if (DViewMode == VIEW_MEMDUMP && DumpInitted != FALSE)
{
@ -3501,6 +3503,8 @@ void ReadSettings()
}
i = atoi(&param[7]);
SeeReg[i] = !strcmp(val, "TRUE");
} else if (!strcmp(param, "SingleCPU")) {
SingleCPU = !strcmp(val, "TRUE");
} else if (!strcmp(param, "ShowIOWindows")) {
ShowIOWindows = !strcmp(val, "TRUE");
} else if (!strcmp(param, "ShowButtons")) {
@ -3513,6 +3517,14 @@ void ReadSettings()
ignSSDisasm = !strcmp(val, "TRUE");
} else if (!strcmp(param, "UprCase")) {
UprCase = atoi(val);
} else if (!strcmp(param, "DumpInAsciiMode")) {
DumpInAsciiMode = atoi(val);
} else if (!strcmp(param, "isLittleEndian")) {
isLittleEndian = !strcmp(val, "TRUE");
} else if (!strcmp(param, "DumpWSIndex")) {
DumpWSIndex = atoi(val);
DumpAlign = (1 << DumpWSIndex);
PrevDAD = 0;
} else {
// TODO: add more settings
fprintf(stderr, "bx_enh_dbg.ini: unknown option '%s'\n", line);
@ -3534,12 +3546,16 @@ void WriteSettings()
for (i = 0; i < 8; i++) {
fprintf(fd, "SeeReg[%d] = %s\n", i, SeeReg[i] ? "TRUE" : "FALSE");
}
fprintf(fd, "SingleCPU = %s\n", SingleCPU ? "TRUE" : "FALSE");
fprintf(fd, "ShowIOWindows = %s\n", ShowIOWindows ? "TRUE" : "FALSE");
fprintf(fd, "ShowButtons = %s\n", ShowButtons ? "TRUE" : "FALSE");
fprintf(fd, "SeeRegColors = %s\n", SeeRegColors ? "TRUE" : "FALSE");
fprintf(fd, "ignoreNxtT = %s\n", ignoreNxtT ? "TRUE" : "FALSE");
fprintf(fd, "ignSSDisasm = %s\n", ignSSDisasm ? "TRUE" : "FALSE");
fprintf(fd, "UprCase = %d\n", UprCase);
fprintf(fd, "DumpInAsciiMode = %d\n", DumpInAsciiMode);
fprintf(fd, "isLittleEndian = %s\n", isLittleEndian ? "TRUE" : "FALSE");
fprintf(fd, "DumpWSIndex = %d\n", DumpWSIndex);
// TODO: add more settings
fclose(fd);
}

1
bochs/gui/enh_dbg.h
View File

@ -168,6 +168,7 @@ extern bx_bool ignoreNxtT; // Do not show "Next at t=" output lines
extern bx_bool ignSSDisasm; // Do not show extra disassembly line at each break
extern int UprCase; // 1 = convert all Asm, Register names, Register values to uppercase
extern int DumpInAsciiMode; // bit 1 = show ASCII in dumps, bit 2 = show hex, value=0 is illegal
extern int DumpWSIndex; // word size index for memory dump
extern bx_bool LogView; // Send log to output window
extern bx_bool isLittleEndian;

2
bochs/gui/gtk_enh_dbg_osdep.cc
View File

@ -438,7 +438,7 @@ void InitMenus()
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ChkMIs[IGN_NT]), ignoreNxtT);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ChkMIs[R_CLR]), SeeRegColors);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ChkMIs[LOG_VIEW]), LogView);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ChkMIs[WSChkIdx]), TRUE);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ChkMIs[WSChkIdx+DumpWSIndex]), TRUE);
if (DumpInAsciiMode == 0) // prevent an illegal value
DumpInAsciiMode = 3;
// I don't know why, but the next 2 "set_active" commands blow up if moved into SpecialInit

2
bochs/gui/win32_enh_dbg_osdep.cc
View File

@ -634,7 +634,7 @@ void SpecialInit()
CheckMenuItem (hOptMenu, CMD_IOWIN, MF_CHECKED);
HMENU wsMenu = GetSubMenu (hOptMenu, WS_POPUP_IDX);
CheckMenuItem (wsMenu, CMD_WS_1, MF_CHECKED);
CheckMenuItem (wsMenu, CMD_WS_1+DumpWSIndex, MF_CHECKED);
EnableMenuItem (hOptMenu, CMD_TREG, MF_GRAYED); // not currently supported by bochs
EnableMenuItem (hViewMenu, CMD_PAGEV, MF_GRAYED);
#if BX_SUPPORT_FPU == 0