MEGA65: CPUaddr2Linear little hack + cleanups #140

lgblgblgb · Mar 16, 2022 · 50293c0 · 50293c0
1 parent 2b6b403
commit 50293c0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 107 deletions.
diff --git a/targets/mega65/Makefile b/targets/mega65/Makefile
@@ -1,6 +1,6 @@
 ## A work-in-progess MEGA65 (Commodore-65 clone origins) emulator
 ## Part of the Xemu project, please visit: https://github.com/lgblgblgb/xemu
-## Copyright (C)2016-2021 LGB (Gábor Lénárt) <[email protected]>
+## Copyright (C)2016-2022 LGB (Gábor Lénárt) <[email protected]>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/targets/mega65/TODO b/targets/mega65/TODO
diff --git a/targets/mega65/cpu_custom_functions.h b/targets/mega65/cpu_custom_functions.h
@@ -1,6 +1,6 @@
 /* A work-in-progess MEGA65 (Commodore 65 clone origins) emulator
    Part of the Xemu project, please visit: https://github.com/lgblgblgb/xemu
-   Copyright (C)2016-2021 LGB (Gábor Lénárt) <[email protected]>
+   Copyright (C)2016-2022 LGB (Gábor Lénárt) <[email protected]>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -77,6 +77,8 @@ extern Uint32 cpu65_read_linear_long_opcode_callback  ( const Uint8 index );
 
 extern void  cpu65_illegal_opcode_callback ( void );
 
+extern int memory_cpurd2linear_xlat ( Uint16 cpu_addr);
+
 CPU_CUSTOM_FUNCTIONS_INLINE_DECORATOR Uint8 cpu65_read_callback ( Uint16 addr ) {
 	return CALL_MEMORY_READER(addr >> 8, addr);
 }

diff --git a/targets/mega65/memory_mapper.c b/targets/mega65/memory_mapper.c
@@ -963,6 +963,12 @@ void  memory_debug_write_phys_addr ( int addr, Uint8 data )
 	CALL_MEMORY_WRITER(MEM_SLOT_DEBUG_RESOLVER, addr, data);
 }
 
+int   memory_cpurd2linear_xlat ( Uint16 cpu_addr)
+{
+	int slot = cpu_addr >> 8;
+	return mem_page_rd_o[slot] + mem_page_refp[slot]->start + (int)(cpu_addr & 0xFF);
+}
+
 /* the same as above but for CPU addresses */
 Uint8 memory_debug_read_cpu_addr   ( Uint16 addr )
 {

diff --git a/targets/mega65/xemu-target.h b/targets/mega65/xemu-target.h
@@ -3,9 +3,9 @@
 #define CPU_65CE02
 #define MEGA65
 #define CPU65_65CE02_6502NMOS_TIMING_EMULATION
-#define XEMU_SNAPSHOT_SUPPORT "MEGA65"
+//#define XEMU_SNAPSHOT_SUPPORT "MEGA65"
 #define CPU_STEP_MULTI_OPS
-#define DEBUG_CPU
+//#define DEBUG_CPU
 #define CPU_CUSTOM_MEMORY_FUNCTIONS_H "cpu_custom_functions.h"
 #define CPU65 cpu65
 //#define CPU65_DISCRETE_PF_NZ

diff --git a/xemu/cpu65.c b/xemu/cpu65.c
@@ -1,5 +1,5 @@
 /* Part of the Xemu project, please visit: https://github.com/lgblgblgb/xemu
-   Copyright (C)2016-2021 LGB (Gábor Lénárt) <[email protected]>
+   Copyright (C)2016-2022 LGB (Gábor Lénárt) <[email protected]>
 
    THIS IS AN UGLY PIECE OF SOURCE REALLY.
 
@@ -876,9 +876,12 @@ int cpu65_step (
 	case 0x00:	/* BRK Implied */
 #ifdef DEBUG_CPU
 			DEBUG("CPU: WARN: BRK is about executing at PC=$%04X" NL, (CPU65.pc - 1) & 0xFFFF);
+#ifdef MEGA65
+			DEBUG("CPU: BRK opcode linear address is $%X" NL, memory_cpurd2linear_xlat((CPU65.pc - 1) & 0xFFFF));
+#endif
 #endif
 			pushWord(CPU65.pc + 1);
-			push(cpu65_get_pf() | CPU65_PF_B);	// BRK always pushes 'B' bit set (like PHP too, unlike hardware interrupts
+			push(cpu65_get_pf() | CPU65_PF_B);	// BRK always pushes 'B' bit set (like PHP too, unlike hardware interrupts)
 			CPU65.pf_d = 0;				// actually, NMOS CPU does not do this for real, only 65C02+
 			CPU65.pf_i = 1;
 			CPU65.pc = readWord(0xFFFE);