Skip to content

Commit 5d8c85c

Browse files
author
ejaquay
committed
Fix disasembler stepping 0xfe00 - 0xfeff strangeness
Now we can see disassembly when stepping 0xfe00 - 0xeff Note: Can not set breakpoints this area. This may not be fixable.
1 parent d13b61f commit 5d8c85c

File tree

5 files changed

+3
-16
lines changed

5 files changed

+3
-16
lines changed

DebuggerUtils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ namespace VCC { namespace Debugger
100100
unsigned long addr = PC + block * 0x2000;
101101
return (unsigned char) GetMem(addr);
102102
} else {
103-
return DisMemRead8(PC);
103+
return SafeMemRead8(PC);
104104
}
105105
}
106106

Disassembler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ unsigned char GetCondMem(unsigned long addr) {
10731073
if (RealAdrMode) {
10741074
return (unsigned char) GetMem(addr);
10751075
} else {
1076-
return DisMemRead8((unsigned short) addr);
1076+
return SafeMemRead8((unsigned short) addr);
10771077
}
10781078
}
10791079

Vcc.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
548548
CAPTION "Disassembler"
549549
FONT 8, "MS Sans Serif", 0, 0, 0x0
550550
BEGIN
551-
CONTROL "Real memory", IDC_BTN_REAL, "Button",BS_AUTOCHECKBOX,15, 4,55,10
551+
CONTROL "Real Address", IDC_BTN_REAL, "Button",BS_AUTOCHECKBOX,15, 4,55,10
552552
LTEXT "Address",IDC_ADRTXT, 10,18, 25,9
553553
EDITTEXT IDC_EDIT_PC_ADDR, 38,18, 35,10
554554
CONTROL "Os9 Mode", IDC_BTN_OS9, "Button",BS_AUTOCHECKBOX,92, 4,65,10

tcc1014mmu.c

-12
Original file line numberDiff line numberDiff line change
@@ -325,18 +325,6 @@ void MemWrite8(unsigned char data,unsigned short address)
325325
return;
326326
}
327327

328-
unsigned char DisMemRead8( unsigned short address)
329-
// Disassembler mem read. Ram and carts okay. Ports return 0xFF.
330-
{
331-
if (address<0xFE00) {
332-
if (MemPageOffsets[MmuRegisters[MmuState][address>>13]]==1)
333-
return(MemPages[MmuRegisters[MmuState][address>>13]][address & 0x1FFF]);
334-
else
335-
return( PackMem8Read( MemPageOffsets[MmuRegisters[MmuState][address>>13]] + (address & 0x1FFF) ));
336-
}
337-
return 0xFF;
338-
}
339-
340328
// Returns TRUE if address is writable RAM (Not Cart, Not a Port)
341329
bool MemCheckWrite(unsigned short address)
342330
{

tcc1014mmu.h

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ unsigned char * Getint_rom_pointer(void);
5252
unsigned char * Getext_rom_pointer(void);
5353
unsigned short GetMem(unsigned long);
5454
void SetMem(unsigned long, unsigned short);
55-
unsigned char DisMemRead8(short unsigned int);
5655
bool MemCheckWrite(unsigned short address);
5756

5857
void __fastcall fMemWrite8(unsigned char,unsigned short );

0 commit comments

Comments
 (0)