joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5854 from maron2000/warn_dynamic

Browse Source 
Debugger: Warn single-stepping may not work as expected with Dynamic core
This commit is contained in:
Jonathan Campbell
2025-09-21 20:58:25 -07:00
committed by GitHub
parent e016af8108 3599e071f9
commit 2132738795
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/debug/debug.cpp
View File

@@ -186,6 +186,8 @@ void DEBUG_EndPagedContent(void);
Bitu MEM_PageMaskActive(void);
Bitu MEM_TotalPages(void);
Bitu MEM_PageMask(void);
void DEBUG_WarnDynamic(void);
int CPU_IsDynamicCore(void); // cpu.cpp 0=normal, 1=dynamic, 2=dynamic core with assembler
static void LogEMUMachine(void) {
DEBUG_BeginPagedContent();
@@ -313,6 +315,8 @@ static bool debug_running = false;
static bool check_rescroll = false;
static FPU_rec oldfpu;
static bool warn_dynamic = false;
void VGA_DebugRedraw(void);
@@ -4306,7 +4310,12 @@ uint32_t DEBUG_CheckKeys(void) {
break;
case KEY_F(10): // Step over inst
DrawRegistersUpdateOld();
if (StepOver()) {
if(!CPU_IsDynamicCore()) warn_dynamic = false;
else if(!warn_dynamic) {
DEBUG_WarnDynamic();
warn_dynamic = true;
}
if (StepOver()) {
mustCompleteInstruction = true;
inhibit_int_breakpoint = true;
ret = DEBUG_Run(1,false);
@@ -4319,6 +4328,11 @@ uint32_t DEBUG_CheckKeys(void) {
/* FALLTHROUGH */
case KEY_F(11): // trace into
DrawRegistersUpdateOld();
if(!CPU_IsDynamicCore()) warn_dynamic = false;
else if(!warn_dynamic) {
DEBUG_WarnDynamic();
warn_dynamic = true;
}
exitLoop = false;
mustCompleteInstruction = true;
ret = DEBUG_Run(1,true);
@@ -4511,6 +4525,11 @@ Bitu DEBUG_Loop(void) {
void DEBUG_FlushInput(void);
void DEBUG_WarnDynamic(void) {
DEBUG_ShowMsg("Warning: Single-stepping may not work correctly with \"Dynamic core\".");
DEBUG_ShowMsg(" If you encounter problems, switch the CPU core to \"Normal core\".");
}
bool tohide=true;
static bool hidedebugger=false;
void DEBUG_Enable_Handler(bool pressed) {
@@ -4602,8 +4621,12 @@ void DEBUG_Enable_Handler(bool pressed) {
DEBUG_DrawScreen();
DOSBOX_SetLoop(&DEBUG_Loop);
mainMenu.get_item("mapper_debugger").check(true).refresh_item(mainMenu);
if (!showhelp) {
showhelp=true;
if(!warn_dynamic) {
DEBUG_WarnDynamic();
warn_dynamic = true;
}
if (!showhelp) {
showhelp=true;
DEBUG_ShowMsg("***| TYPE HELP (+ENTER) TO GET AN OVERVIEW OF ALL COMMANDS |***\n");
}
//KEYBOARD_ClrBuffer();