6502/AtomBusMon
1
0
Fork 0
mirror of https://github.com/hoglet67/AtomBusMon.git synced 2024-12-22 01:30:18 +00:00
Code Issues Projects Releases Wiki Activity

6502: fix duplicate break/watchpoints when Rdy in use

Browse Source 
Change-Id: Idc566462c4496290d4d0a8e14fe568c05907a508
This commit is contained in:
David Banks 2020-06-17 17:14:00 +01:00
parent d38ae01d6f
commit e931e93dff
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/MOS6502CpuMonCore.vhd
View File

@ -82,8 +82,10 @@ architecture behavioral of MOS6502CpuMonCore is
signal Din_int : std_logic_vector(7 downto 0); signal Din_int : std_logic_vector(7 downto 0);
signal Dout_int : std_logic_vector(7 downto 0); signal Dout_int : std_logic_vector(7 downto 0);
signal R_W_n_int : std_logic; signal R_W_n_int : std_logic;
signal Rd_n_int : std_logic; signal Rd_n_mon : std_logic;
signal Wr_n_int : std_logic; signal Wr_n_mon : std_logic;
signal Sync_mon : std_logic;
signal Done_mon : std_logic;
signal Sync_int : std_logic; signal Sync_int : std_logic;
signal Addr_int : std_logic_vector(23 downto 0); signal Addr_int : std_logic_vector(23 downto 0);
@ -131,11 +133,11 @@ begin
cpu_clken => cpu_clken, cpu_clken => cpu_clken,
Addr => Addr_int(15 downto 0), Addr => Addr_int(15 downto 0),
Data => Data, Data => Data,
Rd_n => Rd_n_int, Rd_n => Rd_n_mon,
Wr_n => Wr_n_int, Wr_n => Wr_n_mon,
RdIO_n => '1', RdIO_n => '1',
WrIO_n => '1', WrIO_n => '1',
Sync => Sync_int, Sync => Sync_mon,
Rdy => open, Rdy => open,
nRSTin => Res_n, nRSTin => Res_n,
nRSTout => cpu_reset_n, nRSTout => cpu_reset_n,
@ -160,13 +162,16 @@ begin
AddrOut => memory_addr, AddrOut => memory_addr,
DataOut => memory_dout, DataOut => memory_dout,
DataIn => memory_din, DataIn => memory_din,
Done => memory_done, Done => Done_mon,
Special => special, Special => special,
SS_Step => SS_Step, SS_Step => SS_Step,
SS_Single => SS_Single SS_Single => SS_Single
); );
Wr_n_int <= R_W_n_int; Wr_n_mon <= Rdy and R_W_n_int;
Rd_n_int <= not R_W_n_int; Rd_n_mon <= Rdy and not R_W_n_int;
Sync_mon <= Rdy and Sync_int;
Done_mon <= Rdy and memory_done;
Data <= Din when R_W_n_int = '1' else Dout_int; Data <= Din when R_W_n_int = '1' else Dout_int;
NMI_n_masked <= NMI_n or special(1); NMI_n_masked <= NMI_n or special(1);
IRQ_n_masked <= IRQ_n or special(0); IRQ_n_masked <= IRQ_n or special(0);