From 3a8641003e34739a224ea60f4fb71f7fb2bccd97 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Sat, 3 Oct 2009 17:01:36 +0000 Subject: [PATCH] - added pin non-maskable interrupt (NMI). Exception vector is reset vector at (X"BFC00000") 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@497 cc03376c-175c-47c8-b038-4cd826a8556b --- lib/CPUs/MIPS/sim/tb_mips_top.fdo | 5 ++++- lib/CPUs/MIPS/sim/tb_mips_top.wdo | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/lib/CPUs/MIPS/sim/tb_mips_top.fdo b/lib/CPUs/MIPS/sim/tb_mips_top.fdo index 768f397..faf26bd 100644 --- a/lib/CPUs/MIPS/sim/tb_mips_top.fdo +++ b/lib/CPUs/MIPS/sim/tb_mips_top.fdo @@ -3,8 +3,11 @@ vlib work # RAMS +vcom -explicit -93 "../../../misc/dpram_2w2r1c_sim.vhd" vcom -explicit -93 "../../../misc/dpram_2w2r.vhd" +vcom -explicit -93 "../../../misc/dpram_1w2r1c_sim.vhd" vcom -explicit -93 "../../../misc/dpram_1w1r.vhd" +vcom -explicit -93 "../../../misc/dpram_1w1r1c_sim.vhd" # FIFOS vcom -explicit -93 "../../../FIFO/src/fifo_ctrl_pkg.vhd" @@ -52,4 +55,4 @@ do {tb_mips_top.wdo} view wave view structure view signals -run 12000us +run 4000us diff --git a/lib/CPUs/MIPS/sim/tb_mips_top.wdo b/lib/CPUs/MIPS/sim/tb_mips_top.wdo index 022ff87..b95ae7b 100644 --- a/lib/CPUs/MIPS/sim/tb_mips_top.wdo +++ b/lib/CPUs/MIPS/sim/tb_mips_top.wdo @@ -1,6 +1,8 @@ onerror {resume} quietly WaveActivateNextPane {} 0 add wave -noupdate -divider {TOP interface} +add wave -noupdate -format Logic /tb_mips_top/nmi +add wave -noupdate -format Logic /tb_mips_top/rst add wave -noupdate -format Logic /tb_mips_top/clk add wave -noupdate -format Literal /tb_mips_top/debug add wave -noupdate -format Logic /tb_mips_top/stb_o @@ -14,6 +16,7 @@ add wave -noupdate -format Literal /tb_mips_top/sel_o add wave -noupdate -format Logic /tb_mips_top/cyc_o add wave -noupdate -format Logic /tb_mips_top/mrdy_o add wave -noupdate -format Literal /tb_mips_top/int +add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_pipeline/inst_shifter/dout add wave -noupdate -divider {External components} add wave -noupdate -format Logic /tb_mips_top/clk add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/gpo0 @@ -62,7 +65,7 @@ add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_cop/ add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_cop/dcache_info add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_cop/cop_pipe_id add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_cop/cop_pipe_ex -add wave -noupdate -format Literal /tb_mips_top/uut/inst_cop/ctrl_in +add wave -noupdate -format Literal -expand /tb_mips_top/uut/inst_cop/ctrl_in add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/cpu_en add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/cpu_addr add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/cpu_dout @@ -111,6 +114,19 @@ add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/request add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/fill_count add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cache_req add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cache_ack +add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/ram +add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/addr_a +add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/addr_b +add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/din_a +add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/din_b +add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/dout_a +add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/dout_b +add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/we_a +add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/we_b +add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/en_b +add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/en_a +add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/clk_a +add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/clk_b add wave -noupdate -divider D-Cache add wave -noupdate -format Logic /tb_mips_top/clk add wave -noupdate -format Literal -radix hexadecimal -expand /tb_mips_top/uut/inst_biu/inst_dcache/ctrl @@ -159,7 +175,7 @@ add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/ add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/cpu_cache_index add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/cpu_word_index TreeUpdate [SetDefaultTree] -WaveRestoreCursors {{Cursor 1} {3452235915 ps} 0} +WaveRestoreCursors {{Cursor 1} {2500150000 ps} 0} configure wave -namecolwidth 188 configure wave -valuecolwidth 100 configure wave -justifyvalue left @@ -173,4 +189,4 @@ configure wave -gridperiod 100 configure wave -griddelta 40 configure wave -timeline 1 update -WaveRestoreZoom {417380225 ps} {3435174725 ps} +WaveRestoreZoom {2499964052 ps} {2500619743 ps}