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

Preparation for the memory & i/o breakpoints 2

This commit is contained in:
tudnai 2022-11-17 12:34:08 -08:00
parent 41d33c19c3
commit d6f49abbb4
5 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
A2Mac/DebuggerViewController.swift
View File

@ -414,11 +414,11 @@ N V - B D I Z C
let line = getLine(inView: Disass_Display, forY: location.y)
let addr = getAddr(forLine: line)
if m6502_dbg_bp_exists(breakpoints, bp_last_idx, addr) {
bp_last_idx = m6502_dbg_bp_del(breakpoints, bp_last_idx, addr)
if m6502_dbg_bp_exists(breakpoints, addr) {
m6502_dbg_bp_del(breakpoints, addr)
}
else {
bp_last_idx = m6502_dbg_bp_add(breakpoints, bp_last_idx, addr)
m6502_dbg_bp_add(breakpoints, addr)
}
// force regenerate disassembly

60
src/cpu/6502_bp.c
View File

@ -35,27 +35,25 @@
/// Array of addresses of active breakpoints
/// @note DEBUG_MAX_BREAKPOINTS controls its size
/// last index (size) is located at index 0
uint16_t bp_array[DEBUG_MAX_BREAKPOINTS];
/// Pointer to the bp_array
/// @note We have to do this way because of interfacing problem with Swift
uint16_t * breakpoints = bp_array;
/// Array of addresses of memory read breakpoints
/// @note DEBUG_MAX_BREAKPOINTS controls its size
/// last index (size) is located at index 0
uint16_t mem_rd_bp[DEBUG_MAX_BREAKPOINTS];
uint16_t * mem_read_breakpoints = mem_rd_bp;
/// Array of addresses of memory write breakpoints
/// @note DEBUG_MAX_BREAKPOINTS controls its size
/// last index (size) is located at index 0
uint16_t mem_wr_bp[DEBUG_MAX_BREAKPOINTS];
uint16_t * mem_write_breakpoints = mem_wr_bp;
/// Index of last valid breakpoint element in the array
int bp_last_idx = 0;
/// Index of last valid breakpoint element in the array
int bp_mem_read_last_idx = 0;
/// Index of last valid breakpoint element in the array
int bp_mem_write_last_idx = 0;
/// Index of current breapoint
/// @note It is more like a temporary variable
int bp_idx = 0;
int bp_next_idx = 0;
/// Swap 2 items
@ -152,9 +150,9 @@ int m6502_dbg_bp_get_last(uint16_t *bp, int i) {
/// Get first valid BP
/// @return addr of BP or 0 if non
uint16_t m6502_dbg_bp_get_next() {
while ( bp_idx < bp_last_idx ) {
uint16_t addr = breakpoints[++bp_idx];
uint16_t m6502_dbg_bp_get_next(uint16_t * bp) {
while ( bp_next_idx++ <= LAST_IDX(bp) ) {
uint16_t addr = bp[bp_next_idx];
if (addr) {
return addr;
}
@ -166,9 +164,9 @@ uint16_t m6502_dbg_bp_get_next() {
/// Get first valid BP
/// @return addr of BP or 0 if non
uint16_t m6502_dbg_bp_get_first() {
bp_idx = -1;
return m6502_dbg_bp_get_next();
uint16_t m6502_dbg_bp_get_first(uint16_t * bp) {
bp_next_idx = 0;
return m6502_dbg_bp_get_next(bp);
}
@ -202,20 +200,20 @@ int m6502_dbg_bp_get_not_empty() {
/// Move array down to eliminate leading zeros
/// @note: Array must be sorted before this!
/// @return last index
int m6502_dbg_bp_compact(uint16_t * bp, int last) {
int m6502_dbg_bp_compact(uint16_t * bp) {
int i = m6502_dbg_bp_get_not_empty();
memcpy(bp, bp + i, last * sizeof(uint16_t));
memset(bp + last - i + 1, 0, (DEBUG_MAX_BREAKPOINTS - last + i - 1) * sizeof(uint16_t));
return m6502_dbg_bp_get_last(bp, last);
memcpy(bp, bp + i, LAST_IDX(bp) * sizeof(uint16_t));
memset(bp + LAST_IDX(bp) - i + 1, 0, (DEBUG_MAX_BREAKPOINTS - LAST_IDX(bp) + i - 1) * sizeof(uint16_t));
return m6502_dbg_bp_get_last(bp, LAST_IDX(bp));
}
/// Check if BP exists
/// @param addr Address to check
/// @return 1 (true) if exists, 0 (false) if not
_Bool m6502_dbg_bp_exists(uint16_t * bp, int last, uint16_t addr) {
_Bool m6502_dbg_bp_exists(uint16_t * bp, uint16_t addr) {
if (addr) {
int i = m6502_dbg_bp_search(bp, 0, last, addr);
int i = m6502_dbg_bp_search(bp, 0, LAST_IDX(bp), addr);
return i >= 0;
}
@ -226,12 +224,12 @@ _Bool m6502_dbg_bp_exists(uint16_t * bp, int last, uint16_t addr) {
/// Add breakpoint
/// @param addr Address to add
/// @return Index of breakpoint or 0 if error
int m6502_dbg_bp_add(uint16_t * bp, int last, uint16_t addr) {
if (last < DEBUG_MAX_BREAKPOINTS - 1) {
bp[++last] = addr;
m6502_dbg_bp_sort(bp, 0, last);
last = m6502_dbg_bp_compact(bp, last);
return last;
int m6502_dbg_bp_add(uint16_t * bp, uint16_t addr) {
if (LAST_IDX(bp) < DEBUG_MAX_BREAKPOINTS - 1) {
bp[++LAST_IDX(bp)] = addr;
m6502_dbg_bp_sort(bp, 1, LAST_IDX(bp));
LAST_IDX(bp) = m6502_dbg_bp_compact(bp);
return LAST_IDX(bp);
}
// no empty slots
return 0;
@ -240,20 +238,20 @@ int m6502_dbg_bp_add(uint16_t * bp, int last, uint16_t addr) {
/// Remove a breakpoint
/// @param addr address to remove
int m6502_dbg_bp_del(uint16_t * bp, int last, uint16_t addr) {
int i = m6502_dbg_bp_search(bp, 0, last, addr);
int m6502_dbg_bp_del(uint16_t * bp, uint16_t addr) {
int i = m6502_dbg_bp_search(bp, 0, LAST_IDX(bp), addr);
if (i >= 0) {
bp[i] = 0;
m6502_dbg_bp_sort(breakpoints, 0, last);
last = m6502_dbg_bp_compact(bp, last);
m6502_dbg_bp_sort(breakpoints, 1, LAST_IDX(bp));
LAST_IDX(bp) = m6502_dbg_bp_compact(bp);
}
return last;
return LAST_IDX(bp);
}
/// Delete all breakpoints
void m6502_dbg_bp_del_all(uint16_t * bp) {
bp_idx = 0;
bp_next_idx = 0;
memset(bp, 0, sizeof(uint16_t) * DEBUG_MAX_BREAKPOINTS);
}

11
src/cpu/6502_bp.h
View File

@ -15,14 +15,13 @@
extern uint16_t * breakpoints;
extern uint16_t * mem_read_breakpoints;
extern uint16_t * mem_write_breakpoints;
extern int bp_last_idx;
extern int bp_mem_read_last_idx;
extern int bp_mem_write_last_idx;
extern int m6502_dbg_bp_add(uint16_t * bp, int last, uint16_t addr);
extern int m6502_dbg_bp_del(uint16_t * bp, int last, uint16_t addr);
#define LAST_IDX(bp) (bp)[0]
extern int m6502_dbg_bp_add(uint16_t * bp, uint16_t addr);
extern int m6502_dbg_bp_del(uint16_t * bp, uint16_t addr);
extern void m6502_dbg_bp_del_all(uint16_t * bp);
extern _Bool m6502_dbg_bp_exists(uint16_t * bp, int last, uint16_t addr);
extern _Bool m6502_dbg_bp_exists(uint16_t * bp, uint16_t addr);
#endif /* _6502_bp_h */

2
src/cpu/6502_dbg.c
View File

@ -188,7 +188,7 @@ void m6502_Debug(void) {
m6502.interrupt = NO_INT;
if ( m6502_dbg_bp_exists(breakpoints, bp_last_idx, m6502.PC) ) {
if ( m6502_dbg_bp_exists(breakpoints, m6502.PC) ) {
cpuState = cpuState_halted;
// m6502.debugger.wMask = 0;
// m6502.debugger.on = 0;

2
src/cpu/6502_dis.c
View File

@ -175,7 +175,7 @@ const char * disassemblyLine(_Bool highlight) {
static char line[256];
snprintf( line, sizeof(line), "%s %s: %-11s%-4s%s",
m6502_dbg_bp_exists(breakpoints, bp_last_idx, disassembly.addr) ? "*" : " ",
m6502_dbg_bp_exists(breakpoints, disassembly.addr) ? "*" : " ",
disassembly.hexAddr,
disassembly.opcode,
disassembly.inst,