From b6309838f1fc1a609b404e72d425bc922c74137f Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Fri, 10 Oct 2008 21:33:10 +0000 Subject: [PATCH] Minor changes git-svn-id: http://moon:8086/svn/vhdl/trunk@46 cc03376c-175c-47c8-b038-4cd826a8556b --- projects/mips_sys/src/mips_sys.vhd | 6 +++++- projects/mips_sys/src/mips_sys_sim.vhd | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/projects/mips_sys/src/mips_sys.vhd b/projects/mips_sys/src/mips_sys.vhd index 2e049e5..519cd70 100644 --- a/projects/mips_sys/src/mips_sys.vhd +++ b/projects/mips_sys/src/mips_sys.vhd @@ -119,6 +119,7 @@ ARCHITECTURE behavior OF mips_sys IS COMPONENT mips_top Port ( + debug : out unsigned(1 downto 0); RST_I : in STD_LOGIC; CLK_I : in STD_LOGIC; ACK_I : in STD_LOGIC; @@ -326,6 +327,8 @@ ARCHITECTURE behavior OF mips_sys IS signal gpi0 : unsigned(31 downto 0); signal gpi1 : unsigned(31 downto 0); + signal debug : unsigned(1 downto 0); + -- DDR SDRAM constant BURST_LEN : natural := 2; @@ -343,7 +346,7 @@ BEGIN gpi0(4 downto 0) <= sys_btn; gpi1(7 downto 0) <= sys_dip; sys_led <= gpo0(8 downto 0); - sys_error <= gpo0(31 downto 30); + sys_error <= debug; rst_in <= not sys_rst_n_in; rst <= not locked; sys_usb_rstn <= not gpo1(0); @@ -459,6 +462,7 @@ urom_ack_register: inst_mips_top: mips_top PORT MAP ( + debug => debug, RST_I => rst, CLK_I => clk, ACK_I => ACK_I, diff --git a/projects/mips_sys/src/mips_sys_sim.vhd b/projects/mips_sys/src/mips_sys_sim.vhd index bf7d752..5f88c3b 100644 --- a/projects/mips_sys/src/mips_sys_sim.vhd +++ b/projects/mips_sys/src/mips_sys_sim.vhd @@ -125,6 +125,7 @@ ARCHITECTURE behavior OF mips_sys IS COMPONENT mips_top Port ( + debug : out unsigned(1 downto 0); RST_I : in STD_LOGIC; CLK_I : in STD_LOGIC; ACK_I : in STD_LOGIC; @@ -332,6 +333,8 @@ ARCHITECTURE behavior OF mips_sys IS signal gpi0 : unsigned(31 downto 0); signal gpi1 : unsigned(31 downto 0); + signal debug : unsigned(1 downto 0); + -- DDR SDRAM constant BURST_LEN : natural := 2; @@ -349,8 +352,7 @@ BEGIN gpi0(4 downto 0) <= sys_btn; gpi1(7 downto 0) <= sys_dip; sys_led <= gpo0(8 downto 0); - sys_error <= gpo0(31 downto 30); - int <= "000" & sys_usb_int & int_uart_rx & sys_btn(4); + sys_error <= debug; rst_in <= not sys_rst_n_in; rst <= not locked; sys_usb_rstn <= not gpo1(0); @@ -358,6 +360,13 @@ BEGIN usb_addr <= X"0000000" & "00" & ADDR_O(3 downto 2); flash_addr <= "0000000" & ADDR_O(25 downto 2) & '0'; +int_sample: + process(clk) + begin + if rising_edge(clk) then + int <= "000" & sys_usb_int & int_uart_rx & sys_btn(4); + end if; + end process; mem_mux: process(ADDR_O) @@ -459,6 +468,7 @@ urom_ack_register: inst_mips_top: mips_top PORT MAP ( + debug => debug, RST_I => rst, CLK_I => clk, ACK_I => ACK_I,