LIV2/WinUAE
1
0
Fork 0
mirror of https://github.com/LIV2/WinUAE.git synced 2025-12-06 00:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #260 from midwan/minor-fixes

Browse Source 
Minor fixes
This commit is contained in:
Toni Wilen 2023-11-04 15:41:36 +02:00 committed by GitHub
commit 6ebfdfb9d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
custom.cpp
View File

@ -1684,7 +1684,7 @@ static void decide_hdiw(int hpos, bool halfcycle = false)
}
}
#else
decide_hdiw2(hpos);
decide_hdiw2(hpos, halfcycle);
#endif
}
@ -8063,7 +8063,9 @@ static void VHPOSW_delayed(uae_u32 v)
#endif
}
vpos = newvpos;
#ifdef DEBUGGER
record_dma_denise(hnew, hdiw_denisecounter >> 2);
#endif
vb_check();
decide_vline(hnew);
vhposw_modified = true;

12
gencpu.cpp
View File

@ -7040,7 +7040,9 @@ static void gen_opcode (unsigned int opcode)
out("opcode |= 0x20000;\n");
}
if (using_debugmem) {
out("#ifdef DEBUGGER\n");
out("branch_stack_pop_rte(oldpc);\n");
out("#endif\n");
}
} else if (cpu_level == 1 && using_prefetch) {
// 68010
@ -7088,7 +7090,9 @@ static void gen_opcode (unsigned int opcode)
out("newsr = sr; newpc = pc;\n");
setpc ("newpc");
if (using_debugmem) {
out("#ifdef DEBUGGER\n");
out("branch_stack_pop_rte(oldpc);\n");
out("#endif\n");
}
} else {
out("uaecptr oldpc = %s;\n", getpc);
@ -7202,7 +7206,9 @@ static void gen_opcode (unsigned int opcode)
out("}\n");
setpc ("newpc");
if (using_debugmem) {
out("#ifdef DEBUGGER\n");
out("branch_stack_pop_rte(oldpc);\n");
out("#endif\n");
}
}
/* PC is set and prefetch filled. */
@ -7358,9 +7364,11 @@ static void gen_opcode (unsigned int opcode)
count_readl++;
}
if (using_debugmem) {
out("#ifdef DEBUGGER\n");
out("if (debugmem_trace) {\n");
out("branch_stack_pop_rts(oldpc);\n");
out("}\n");
out("#endif\n");
}
out("if (%s & 1) {\n", getpc);
out("uaecptr faultpc = %s;\n", getpc);
@ -7595,9 +7603,11 @@ static void gen_opcode (unsigned int opcode)
if (cpu_level >= 4)
out("m68k_areg(regs, 7) -= 4;\n");
if (using_debugmem) {
out("#ifdef DEBUGGER\n");
out("if (debugmem_trace) {\n");
out("branch_stack_push(oldpc, nextpc);\n");
out("}\n");
out("#endif\n");
}
}
fill_prefetch_full_020();
@ -7752,9 +7762,11 @@ static void gen_opcode (unsigned int opcode)
out("}\n");
}
if (using_debugmem) {
out("#ifdef DEBUGGER\n");
out("if (debugmem_trace) {\n");
out("branch_stack_push(oldpc, nextpc);\n");
out("}\n");
out("#endif\n");
}
clear_m68k_offset();
if (using_prefetch || using_ce) {

2
inputdevice.cpp
View File

@ -5073,8 +5073,6 @@ static bool inputdevice_handle_inputcode2(int monid, int code, int state, const
_tcscpy (changed_prefs.floppyslots[code - AKS_DISKSWAPPER_INSERT0].df, currprefs.dfxlist[swapperslot]);
set_config_changed ();
break;
break;
case AKS_INPUT_CONFIG_1:
case AKS_INPUT_CONFIG_2:
case AKS_INPUT_CONFIG_3: