6502/AtomBusMon
1
0
Fork 0
mirror of https://github.com/hoglet67/AtomBusMon.git synced 2024-06-13 00:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Removed interrupt and address commands; update LCD display in continue loop

Browse Source 
Change-Id: I3bc1b887a49f76c39ad8aeaeda4249808cc32228
This commit is contained in:
David Banks 2015-06-11 21:39:07 +01:00
parent 015dbac541
commit 151fd2af82
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
firmware/AtomBusMon.c
View File

@ -6,25 +6,25 @@
#include "hd44780.h" #include "hd44780.h"
#include "status.h" #include "status.h"
#define CTRL_PORT PORTB #define CTRL_PORT PORTB
#define CTRL_DDR DDRB #define CTRL_DDR DDRB
#define CTRL_DIN PINB #define CTRL_DIN PINB
#define STATUS_PORT PORTD #define STATUS_PORT PORTD
#define STATUS_DDR DDRD #define STATUS_DDR DDRD
#define STATUS_DIN PIND #define STATUS_DIN PIND
#define MUX_PORT PORTE #define MUX_PORT PORTE
#define MUX_DDR DDRE #define MUX_DDR DDRE
#define MUX_DIN PINE #define MUX_DIN PINE
#define OFFSET_IAL 0 #define OFFSET_IAL 0
#define OFFSET_IAH 1 #define OFFSET_IAH 1
#define OFFSET_BW_IAL 2 #define OFFSET_BW_IAL 2
#define OFFSET_BW_IAH 3 #define OFFSET_BW_IAH 3
#define OFFSET_BW_BAL 4 #define OFFSET_BW_BAL 4
#define OFFSET_BW_BAH 5 #define OFFSET_BW_BAH 5
#define OFFSET_BW_M 6 #define OFFSET_BW_M 6
// Commands // Commands
// 000x Enable/Disable single strpping // 000x Enable/Disable single strpping
@ -41,14 +41,14 @@
#define CMD_WATCH_READ 0x09 #define CMD_WATCH_READ 0x09
// Control bits // Control bits
#define CMD_MASK 0x1F #define CMD_MASK 0x1F
#define CMD_EDGE 0x10 #define CMD_EDGE 0x10
#define MUX_SEL_MASK 0xE0 #define MUX_SEL_MASK 0xE0
#define MUX_SEL_BIT 5 #define MUX_SEL_BIT 5
// Status bits // Status bits
#define INTERRUPTED_MASK 0x40 #define INTERRUPTED_MASK 0x40
#define BW_ACTIVE_MASK 0x80 #define BW_ACTIVE_MASK 0x80
// Breakpoint Modes // Breakpoint Modes
#define BRKPT_INSTR 0 #define BRKPT_INSTR 0
@ -71,9 +71,9 @@ char *modeStrings[7] = {
"Undefined", "Undefined",
}; };
#define VERSION "0.11" #define VERSION "0.20"
#define NUMCMDS 20 #define NUMCMDS 18
#define MAXBKPTS 8 #define MAXBKPTS 8
int numbkpts = 0; int numbkpts = 0;
@ -100,8 +100,6 @@ unsigned int modes[MAXBKPTS] = {
char *cmdStrings[NUMCMDS] = { char *cmdStrings[NUMCMDS] = {
"help", "help",
"reset", "reset",
"interrupt",
"address",
"step", "step",
"trace", "trace",
"blist", "blist",
@ -326,12 +324,6 @@ void doCmdReset(char *params) {
hwCmd(CMD_RESET, 0); hwCmd(CMD_RESET, 0);
} }
void doCmdInterrupt(char *params) {
setSingle(1);
doCmdAddr();
}
void doCmdTrace(char *params) { void doCmdTrace(char *params) {
long i; long i;
sscanf(params, "%ld", &i); sscanf(params, "%ld", &i);
@ -485,6 +477,7 @@ void shiftBreakpointRegister(unsigned int addr, unsigned int mode) {
void doCmdContinue(char *params) { void doCmdContinue(char *params) {
int i; int i;
int status; int status;
unsigned int i_addr;
// Step the 6502, otherwise the breakpoint happends again immediately // Step the 6502, otherwise the breakpoint happends again immediately
hwCmd(CMD_STEP, 0); hwCmd(CMD_STEP, 0);
@ -510,6 +503,10 @@ void doCmdContinue(char *params) {
log0("6502 free running...\n"); log0("6502 free running...\n");
int cont = 1; int cont = 1;
do { do {
// Update the LCD display
i_addr = hwRead16(OFFSET_IAL);
lcdAddr(i_addr);
status = STATUS_DIN; status = STATUS_DIN;
if (status & BW_ACTIVE_MASK) { if (status & BW_ACTIVE_MASK) {
cont = logDetails(); cont = logDetails();
@ -548,8 +545,6 @@ void initialize() {
void (*cmdFuncs[NUMCMDS])(char *params) = { void (*cmdFuncs[NUMCMDS])(char *params) = {
doCmdHelp, doCmdHelp,
doCmdReset, doCmdReset,
doCmdInterrupt,
doCmdAddr,
doCmdStep, doCmdStep,
doCmdTrace, doCmdTrace,
doCmdBList, doCmdBList,