From f81cd4018f5ee8948a06933d645f5b506cbc87ec Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Sat, 24 Aug 2013 11:44:56 +0000 Subject: [PATCH] - debug output reverted to unsigned vector -> (record doesnt work for netlist synthesis) Committed on the Free edition of March Hare Software CVSNT Server. Upgrade to CVS Suite for more features and support: http://march-hare.com/cvsnt/ git-svn-id: http://moon:8086/svn/vhdl/trunk@1020 cc03376c-175c-47c8-b038-4cd826a8556b --- lib/CPUs/MIPS/src/core/mips_top.vhd | 6 +++--- projects/mips_sys/src/mips_sys.vhd | 7 +++---- projects/mips_sys/src/mips_sys_sim.vhd | 5 ++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/CPUs/MIPS/src/core/mips_top.vhd b/lib/CPUs/MIPS/src/core/mips_top.vhd index abe90ff..5c90a86 100644 --- a/lib/CPUs/MIPS/src/core/mips_top.vhd +++ b/lib/CPUs/MIPS/src/core/mips_top.vhd @@ -38,7 +38,7 @@ entity mips_top is ); Port ( - debug : out chip_debug_t; + debug : out unsigned(1 downto 0); eb : in STD_LOGIC; nmi : in STD_LOGIC; cpu_clk : in STD_LOGIC; @@ -189,8 +189,8 @@ architecture rtl of mips_top is begin ------------------------------------------------------------------- - debug.imem_err <= imem_err; - debug.dmem_err <= dmem_err; + debug(0) <= imem_err; + debug(1) <= dmem_err; process(CLK_I) variable reset_delay : unsigned (31 downto 0); diff --git a/projects/mips_sys/src/mips_sys.vhd b/projects/mips_sys/src/mips_sys.vhd index b59b783..19dd2da 100644 --- a/projects/mips_sys/src/mips_sys.vhd +++ b/projects/mips_sys/src/mips_sys.vhd @@ -157,7 +157,7 @@ ARCHITECTURE behavior OF mips_sys IS COMPONENT mips_top Port ( - debug : out chip_debug_t; + debug : out unsigned(1 downto 0); eb : in STD_LOGIC; nmi : in STD_LOGIC; cpu_clk : in STD_LOGIC; @@ -487,7 +487,7 @@ ARCHITECTURE behavior OF mips_sys IS signal usb_inten : std_logic; signal phy_inten : std_logic; - signal debug : chip_debug_t; + signal debug : unsigned(1 downto 0); -- DDR SDRAM constant BURST_LEN : natural := 2; @@ -539,8 +539,7 @@ BEGIN sys_phy_mdio <= gpo_0(31); eb <= sys_dip(7); - sys_error(0) <= debug.imem_err; - sys_error(1) <= debug.dmem_err; + sys_error <= debug; nmi <= not sys_rst_n_in; rst_in <= not sys_rst_n_in and sys_btn(0); sys_flash_byten <= '1'; diff --git a/projects/mips_sys/src/mips_sys_sim.vhd b/projects/mips_sys/src/mips_sys_sim.vhd index 3e9ac87..20c75fd 100644 --- a/projects/mips_sys/src/mips_sys_sim.vhd +++ b/projects/mips_sys/src/mips_sys_sim.vhd @@ -317,7 +317,7 @@ ARCHITECTURE behavior OF mips_sys IS signal usb_inten : std_logic; signal phy_inten : std_logic; - signal debug : chip_debug_t; + signal debug : unsigned(1 downto 0); -- DDR SDRAM constant BURST_LEN : natural := 2; @@ -362,8 +362,7 @@ BEGIN sys_phy_mdio <= gpo_0(31); eb <= sys_dip(7); - sys_error(0) <= debug.imem_err; - sys_error(1) <= debug.dmem_err; + sys_error <= debug; nmi <= not sys_rst_n_in; rst_in <= not sys_rst_n_in and sys_btn(0) and sys_btn(2); sys_flash_byten <= '1';