6502/AtomBusMon
1
0
Fork 0
mirror of https://github.com/hoglet67/AtomBusMon.git synced 2025-08-13 02:25:20 +00:00
Code Issues Projects Releases Wiki Activity

All: fix issues at low cpu clock speeds using proper handshaking instead of fixed delays

Browse Source 
Change-Id: I86370255634e1919ed79eeafd2b1252c625911f9
This commit is contained in:
David Banks
2019-11-04 10:43:54 +00:00
parent 8724119101
commit 197642d262
2 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/AtomBusMon.c
View File

@@ -126,7 +126,7 @@ void (*cmdFuncs[])(char *params) = {
#define CMD_EDGE 0x20 #define CMD_EDGE 0x20
// Commands are placed on bits 4..0 // Commands are placed on bits 4..0
#define CMD_MASK 0x3F #define CMD_MASK 0x1F
// Bits 7..6 are the special function output bits // Bits 7..6 are the special function output bits
// On the 6502, these are used to mask IRQ and NMI // On the 6502, these are used to mask IRQ and NMI
@@ -186,8 +186,8 @@ void (*cmdFuncs[])(char *params) = {
#define STATUS_DDR DDRD #define STATUS_DDR DDRD
#define STATUS_DIN PIND #define STATUS_DIN PIND
// This bit indicates the interrupt button on the hardware has been pressed // This bit changing indicates the command has been completed
#define INTERRUPTED_MASK 0x40 #define CMD_ACK_MASK 0x40
// This bit indicates the hardware FIFO contains data // This bit indicates the hardware FIFO contains data
// which will be either a watch or a breakpoint event // which will be either a watch or a breakpoint event
@@ -444,12 +444,12 @@ void readCmd(char *cmd) {
// Send a single hardware command // Send a single hardware command
void hwCmd(unsigned int cmd, unsigned int param) { void hwCmd(unsigned int cmd, unsigned int param) {
unsigned int status = STATUS_DIN;
cmd |= param; cmd |= param;
CTRL_PORT &= ~CMD_MASK; CTRL_PORT &= ~CMD_MASK;
CTRL_PORT |= cmd; CTRL_PORT ^= cmd | CMD_EDGE;
Delay_us(2); // Wait for the CMD_ACK bit to toggle
CTRL_PORT |= CMD_EDGE; while (!((STATUS_DIN ^ status) & CMD_ACK_MASK));
Delay_us(2);
} }
// Read an 8-bit register via the Mux // Read an 8-bit register via the Mux
@@ -934,9 +934,6 @@ int pollForEvents() {
hwCmd(CMD_WATCH_READ, 0); hwCmd(CMD_WATCH_READ, 0);
Delay_us(10); Delay_us(10);
} }
if (STATUS_DIN & INTERRUPTED_MASK) {
cont = 0;
}
if (Serial_ByteRecieved0()) { if (Serial_ByteRecieved0()) {
// Interrupt on a return, ignore other characters // Interrupt on a return, ignore other characters
if (Serial_RxByte0() == 13) { if (Serial_RxByte0() == 13) {

52
src/BusMonCore.vhd
View File

@@ -120,6 +120,9 @@ architecture behavioral of BusMonCore is
signal cmd_edge : std_logic; signal cmd_edge : std_logic;
signal cmd_edge1 : std_logic; signal cmd_edge1 : std_logic;
signal cmd_edge2 : std_logic; signal cmd_edge2 : std_logic;
signal cmd_ack : std_logic;
signal cmd_ack1 : std_logic;
signal cmd_ack2 : std_logic;
signal cmd : std_logic_vector(4 downto 0); signal cmd : std_logic_vector(4 downto 0);
signal addr_sync : std_logic_vector(15 downto 0); signal addr_sync : std_logic_vector(15 downto 0);
@@ -148,7 +151,8 @@ architecture behavioral of BusMonCore is
signal fifo_din : std_logic_vector(fifo_width - 1 downto 0); signal fifo_din : std_logic_vector(fifo_width - 1 downto 0);
signal fifo_dout : std_logic_vector(fifo_width - 1 downto 0); signal fifo_dout : std_logic_vector(fifo_width - 1 downto 0);
signal fifo_empty : std_logic; signal fifo_empty : std_logic;
signal fifo_empty_n : std_logic; signal fifo_not_empty1 : std_logic;
signal fifo_not_empty2 : std_logic;
signal fifo_rd : std_logic; signal fifo_rd : std_logic;
signal fifo_rd_en : std_logic; signal fifo_rd_en : std_logic;
signal fifo_wr : std_logic; signal fifo_wr : std_logic;
@@ -168,7 +172,7 @@ architecture behavioral of BusMonCore is
signal unused_d7 : std_logic; signal unused_d7 : std_logic;
signal last_done : std_logic; signal last_done : std_logic;
signal inc_addr : std_logic; signal cmd_done : std_logic;
signal reset_counter : std_logic_vector(9 downto 0); signal reset_counter : std_logic_vector(9 downto 0);
@@ -226,8 +230,8 @@ begin
portdin(3) => '0', portdin(3) => '0',
portdin(4) => '0', portdin(4) => '0',
portdin(5) => '0', portdin(5) => '0',
portdin(6) => '0', portdin(6) => cmd_ack2,
portdin(7) => fifo_empty_n, portdin(7) => fifo_not_empty2,
portdout(0) => muxsel(0), portdout(0) => muxsel(0),
portdout(1) => muxsel(1), portdout(1) => muxsel(1),
@@ -248,8 +252,19 @@ begin
rxd => avr_RxD, rxd => avr_RxD,
txd => avr_TxD txd => avr_TxD
); );
fifo_empty_n <= not fifo_empty;
-- Syncronise signals crossing busmon_clk / clock_avr boundary
process (clock_avr)
begin
if rising_edge(clock_avr) then
fifo_not_empty1 <= not fifo_empty;
fifo_not_empty2 <= fifo_not_empty1;
cmd_ack1 <= cmd_ack;
cmd_ack2 <= cmd_ack1;
end if;
end process;
WatchEvents_inst : entity work.WatchEvents port map( WatchEvents_inst : entity work.WatchEvents port map(
clk => busmon_clk, clk => busmon_clk,
@@ -392,7 +407,7 @@ begin
end process; end process;
-- CPU Control Commands -- CPU Control Commands
-- 0000x Enable/Disable single strpping -- 0000x Enable/Disable single stepping
-- 0001x Enable/Disable breakpoints / watches -- 0001x Enable/Disable breakpoints / watches
-- 0010x Load breakpoint / watch register -- 0010x Load breakpoint / watch register
-- 0011x Reset CPU -- 0011x Reset CPU
@@ -435,7 +450,7 @@ begin
io_rd <= '0'; io_rd <= '0';
io_wr <= '0'; io_wr <= '0';
SS_Step <= '0'; SS_Step <= '0';
if (cmd_edge2 = '0' and cmd_edge1 = '1') then if (cmd_edge2 /= cmd_edge1) then
if (cmd(4 downto 1) = "0000") then if (cmd(4 downto 1) = "0000") then
single <= cmd(0); single <= cmd(0);
end if; end if;
@@ -484,11 +499,20 @@ begin
auto_inc <= cmd(0); auto_inc <= cmd(0);
end if; end if;
-- Acknowlege certain commands immediately
if cmd(4) = '0' then
cmd_ack <= not cmd_ack;
end if;
end if; end if;
-- Auto increment the memory address reg the cycle after a rd/wr if cmd_done = '1' then
if (auto_inc = '1' and inc_addr = '1') then -- Acknowlege memory access commands when thet complete
addr_dout_reg(23 downto 8) <= addr_dout_reg(23 downto 8) + 1; cmd_ack <= not cmd_ack;
-- Auto increment the memory address reg the cycle after a rd/wr
if auto_inc = '1' then
addr_dout_reg(23 downto 8) <= addr_dout_reg(23 downto 8) + 1;
end if;
end if; end if;
-- Single Stepping -- Single Stepping
@@ -496,7 +520,7 @@ begin
single <= '1'; single <= '1';
end if; end if;
if ((single = '0') or (cmd_edge2 = '0' and cmd_edge1 = '1' and cmd = "01000")) then if ((single = '0') or (cmd_edge2 /= cmd_edge1 and cmd = "01000")) then
Rdy_int <= (not brkpt_active); Rdy_int <= (not brkpt_active);
SS_Step <= (not brkpt_active); SS_Step <= (not brkpt_active);
else else
@@ -533,9 +557,9 @@ begin
-- Delay the increnting of the address by one cycle -- Delay the increnting of the address by one cycle
last_done <= Done; last_done <= Done;
if Done = '1' and last_done = '0' then if Done = '1' and last_done = '0' then
inc_addr <= '1'; cmd_done <= '1';
else else
inc_addr <= '0'; cmd_done <= '0';
end if; end if;
end if; end if;
end if; end if;