Apple-2-Tools
/
Steve2
mirror of https://github.com/trudnai/Steve2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renamed DISASSEMBLER to DISASS_TRACE

This commit is contained in:
tudnai 2022-11-16 19:37:15 -08:00
parent 65e6d498ee
commit d935c168d6
6 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
A2Mac.xcodeproj/project.pbxproj
View File

@ -2025,7 +2025,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 0.85;
OTHER_CFLAGS = (
"-DDISASSEMBLER",
"-DDISASS_TRACE",
"-D_NO_INTERRUPT_CHECK_PER_STEP",
"-D_NO_CLK_ABSOLUTE_PRECISE",
);
@ -2068,7 +2068,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 0.85;
OTHER_CFLAGS = (
"-DDISASSEMBLER",
"-DDISASS_TRACE",
"-D_NO_INTERRUPT_CHECK_PER_STEP",
"-D_NO_CLK_ABSOLUTE_PRECISE",
);
@ -2222,7 +2222,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 0.86;
OTHER_CFLAGS = (
"-D_NO_DISASSEMBLER",
"-D_NO_DISASS_TRACE",
"-D_NO_INTERRUPT_CHECK_PER_STEP",
"-D_NO_CLK_ABSOLUTE_PRECISE",
);
@ -2264,7 +2264,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 0.86;
OTHER_CFLAGS = (
"-D_NO_DISASSEMBLER",
"-D_NO_DISASS_TRACE",
"-D_NO_INTERRUPT_CHECK_PER_STEP",
"-D_NO_CLK_ABSOLUTE_PRECISE",
);

2
src/cpu/6502.c
View File

@ -604,7 +604,7 @@ void rom_loadFile( const char * bundlePath, const char * filename ) {
void openLog() {
#ifdef DISASSEMBLER
#ifdef DISASS_TRACE
outdev = fopen("/Users/trudnai/Library/Containers/com.trudnai.steveii/Data/disassembly_new.log", "w+");
#endif
// for DEBUG ONLY!!! -- use stdout if could not create log file

10
src/dev/mem/mmio.c
View File

@ -1017,6 +1017,16 @@ INLINE uint8_t _memread( uint16_t addr ) {
// return memread8(addr);
}
INLINE uint8_t _memread_dbg( uint16_t addr ) {
if (addr >= 0xC000) {
// return memread8_paged(addr);
return memread8_high(addr);
}
// return memread8_paged(addr);
return memread8_low(addr);
// return memread8(addr);
}
INLINE uint8_t _memread_dis( uint16_t addr ) {
if (addr >= 0xC000) {
// return memread8_paged(addr);

2
src/util/common.h
View File

@ -37,7 +37,7 @@
#endif
#ifdef DISASSEMBLER
#ifdef DISASS_TRACE
//#define dbgPrintf(format, ...) if(outdev) fprintf(outdev, format, ## __VA_ARGS__)
#define dbgPrintf(format, ...)
#define dbgPrintf2(format, ...) if(outdev) fprintf(outdev, format, ## __VA_ARGS__)

4
src/util/disassembler.c
View File

@ -89,7 +89,7 @@ void _disNewInstruction(void) {
#ifdef DISASSEMBLER
#ifdef DISASS_TRACE
void printDisassembly( FILE * f ) {
if ( m6502.debugger.mask.trace && f ) {
// fprintf( f, "%s: %-14s%-6s%-14s%-16s A:%02X X:%02X Y:%02X S:%02X P:%02X (%c%c%c%c%c%c%c%c)\n",
@ -168,7 +168,7 @@ void printDisassembly( FILE * f ) {
}
}
#endif // DISASSEMBLER
#endif // DISASS_TRACE
const char * disassemblyLine(_Bool highlight) {

12
src/util/disassembler.h
View File

@ -47,8 +47,8 @@ typedef struct disassembly_s {
extern disassembly_t disassembly;
//#define DISASSEMBLER
//#undef DISASSEMBLER
//#define DISASS_TRACE
//#undef DISASS_TRACE
extern unsigned long long discnt;
//extern unsigned long long int clktime;
@ -59,7 +59,7 @@ extern void _disPuts( char ** s, const char * from );
extern void _disPrintf( char * s, const size_t n, const char * fmt, ... );
extern void _disNewInstruction(void);
#if defined(DISASSEMBLER) || defined(DEBUGGER)
#if defined(DISASS_TRACE) || defined(DEBUGGER)
#define disHexB( s, b ) _disHexB( &(s), (b) )
#define disHexW( s, w ) _disHexW( &(s), (w) )
@ -70,12 +70,12 @@ extern void _disNewInstruction(void);
#define disNewInstruction() _disNewInstruction()
#ifdef DISASSEMBLER
#ifdef DISASS_TRACE
extern void printDisassembly( FILE * f );
#endif
#else // DISASSEMBLER
#else // DISASS_TRACE
#define disHexB( to, b )
#define disHexW( to, w )
@ -84,7 +84,7 @@ extern void printDisassembly( FILE * f );
#define disNewInstruction()
#define printDisassembly( f )
#endif // DISASSEMBLER
#endif // DISASS_TRACE
extern const char * disassemblyLine(_Bool higlight);