From 85779bda7499f50956d511ec8413a3428996ce71 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Thu, 5 Nov 2009 12:01:48 +0000 Subject: [PATCH] update 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@607 cc03376c-175c-47c8-b038-4cd826a8556b --- lib/VGA_ctrl/sim/tb_vga_frontend.wdo | 15 ++++++-- lib/VGA_ctrl/sim/tb_vga_frontend64.wdo | 15 ++++++-- projects/mips_sys/sim/tb_mips_sys.wdo | 49 +++++++++++++++----------- 3 files changed, 52 insertions(+), 27 deletions(-) diff --git a/lib/VGA_ctrl/sim/tb_vga_frontend.wdo b/lib/VGA_ctrl/sim/tb_vga_frontend.wdo index 398ada7..227b8b3 100644 --- a/lib/VGA_ctrl/sim/tb_vga_frontend.wdo +++ b/lib/VGA_ctrl/sim/tb_vga_frontend.wdo @@ -37,6 +37,15 @@ add wave -noupdate -format Literal /tb_vga_frontend/inst_vga_frontend/s add wave -noupdate -format Literal /tb_vga_frontend/inst_vga_frontend/request_cnt add wave -noupdate -format Literal /tb_vga_frontend/inst_vga_frontend/read_cnt add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/vga_master_en +add wave -noupdate -divider FIFO +add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/fifo_full +add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/fifo_empty +add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/fifo_almost_empty +add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/fifo_almost_full +add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/fifo_color_re +add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/fifo_color_we +add wave -noupdate -format Literal -radix hexadecimal /tb_vga_frontend/inst_vga_frontend/fifo_color_out +add wave -noupdate -format Literal -radix hexadecimal /tb_vga_frontend/inst_vga_frontend/fifo_color_in add wave -noupdate -divider Backend add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/inst_vga_backend/ctrl_scan_en add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/inst_vga_backend/sys_rst @@ -47,13 +56,13 @@ add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/inst_vga_bac add wave -noupdate -format Literal /tb_vga_frontend/inst_vga_frontend/stat_hpos add wave -noupdate -format Literal /tb_vga_frontend/inst_vga_frontend/stat_vpos add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/inst_vga_backend/rst -add wave -noupdate -format Logic /tb_vga_frontend/dcm_locked +add wave -noupdate -format Logic /tb_vga_frontend/vga_en add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/cg_draw add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/cg_en add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/inst_vga_backend/hready add wave -noupdate -format Logic /tb_vga_frontend/inst_vga_frontend/inst_vga_backend/vready TreeUpdate [SetDefaultTree] -WaveRestoreCursors {{Cursor 1} {674980 ps} 0} +WaveRestoreCursors {{Cursor 1} {9915333000 ps} 0} configure wave -namecolwidth 150 configure wave -valuecolwidth 100 configure wave -justifyvalue left @@ -67,4 +76,4 @@ configure wave -gridperiod 1 configure wave -griddelta 40 configure wave -timeline 0 update -WaveRestoreZoom {9720509575 ps} {11930581075 ps} +WaveRestoreZoom {9915291469 ps} {9915942555 ps} diff --git a/lib/VGA_ctrl/sim/tb_vga_frontend64.wdo b/lib/VGA_ctrl/sim/tb_vga_frontend64.wdo index 04fe088..aad0e19 100644 --- a/lib/VGA_ctrl/sim/tb_vga_frontend64.wdo +++ b/lib/VGA_ctrl/sim/tb_vga_frontend64.wdo @@ -38,6 +38,15 @@ add wave -noupdate -format Literal /tb_vga_frontend64/inst_vga_frontend64/s add wave -noupdate -format Literal /tb_vga_frontend64/inst_vga_frontend64/request_cnt add wave -noupdate -format Literal /tb_vga_frontend64/inst_vga_frontend64/read_cnt add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/vga_master_en +add wave -noupdate -divider FIFO +add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/fifo_full +add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/fifo_empty +add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/fifo_almost_empty +add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/fifo_almost_full +add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/fifo_color_re +add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/fifo_color_we +add wave -noupdate -format Literal -radix hexadecimal /tb_vga_frontend64/inst_vga_frontend64/fifo_color_out +add wave -noupdate -format Literal -radix hexadecimal /tb_vga_frontend64/inst_vga_frontend64/fifo_color_in add wave -noupdate -divider Backend add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/inst_vga_backend/ctrl_scan_en add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/inst_vga_backend/sys_rst @@ -48,13 +57,13 @@ add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/inst_vga add wave -noupdate -format Literal /tb_vga_frontend64/inst_vga_frontend64/stat_hpos add wave -noupdate -format Literal /tb_vga_frontend64/inst_vga_frontend64/stat_vpos add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/inst_vga_backend/rst -add wave -noupdate -format Logic /tb_vga_frontend64/dcm_locked +add wave -noupdate -format Logic /tb_vga_frontend64/vga_en add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/cg_draw add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/cg_en add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/inst_vga_backend/hready add wave -noupdate -format Logic /tb_vga_frontend64/inst_vga_frontend64/inst_vga_backend/vready TreeUpdate [SetDefaultTree] -WaveRestoreCursors {{Cursor 1} {711949 ps} 0} +WaveRestoreCursors {{Cursor 1} {1112090864 ps} 0} configure wave -namecolwidth 150 configure wave -valuecolwidth 100 configure wave -justifyvalue left @@ -68,4 +77,4 @@ configure wave -gridperiod 1 configure wave -griddelta 40 configure wave -timeline 0 update -WaveRestoreZoom {657535 ps} {817376 ps} +WaveRestoreZoom {6216509708 ps} {9231986858 ps} diff --git a/projects/mips_sys/sim/tb_mips_sys.wdo b/projects/mips_sys/sim/tb_mips_sys.wdo index 066c489..83991f7 100644 --- a/projects/mips_sys/sim/tb_mips_sys.wdo +++ b/projects/mips_sys/sim/tb_mips_sys.wdo @@ -1,7 +1,7 @@ onerror {resume} quietly WaveActivateNextPane {} 0 add wave -noupdate -divider UUT -add wave -noupdate -format Logic /tb_mips_sys/uut/RST_O +add wave -noupdate -format Logic /tb_mips_sys/uut/rst_o add wave -noupdate -format Logic /tb_mips_sys/uut/nmi add wave -noupdate -format Logic /tb_mips_sys/uut/rst_in add wave -noupdate -format Logic /tb_mips_sys/sys_rst_n_in @@ -30,7 +30,7 @@ add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/sys_sdr_a_q add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/sys_sdr_data add wave -noupdate -format Literal /tb_mips_sys/sys_sdr_dm_q add wave -noupdate -format Literal /tb_mips_sys/sys_error -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/addr_o add wave -noupdate -format Literal /tb_mips_sys/uut/sel_o add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/mdat_i @@ -42,7 +42,14 @@ add wave -noupdate -format Logic /tb_mips_sys/uut/ack_i add wave -noupdate -format Logic /tb_mips_sys/uut/srdy_i add wave -noupdate -format Logic /tb_mips_sys/uut/mrdy_o add wave -noupdate -format Literal /tb_mips_sys/uut/mem_area -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o +add wave -noupdate -divider {Clock Gen} +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o +add wave -noupdate -format Logic /tb_mips_sys/uut/sdram_clk0 +add wave -noupdate -format Logic /tb_mips_sys/uut/sdram_clk270 +add wave -noupdate -format Logic /tb_mips_sys/uut/sdram_clk270var +add wave -noupdate -format Logic /tb_mips_sys/uut/vga_clk +add wave -noupdate -format Logic /tb_mips_sys/uut/dcm_lock add wave -noupdate -divider Arbiter add wave -noupdate -format Literal /tb_mips_sys/uut/arb_idx add wave -noupdate -format Literal /tb_mips_sys/uut/arb_req @@ -79,7 +86,7 @@ add wave -noupdate -format Logic /tb_mips_sys/uut/sys_ac97_ssync add wave -noupdate -format Logic /tb_mips_sys/uut/sys_ac97_bit_clk add wave -noupdate -format Logic /tb_mips_sys/ac_synced add wave -noupdate -divider {CPU Master} -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/mdat_i add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/mdat_o_cpu add wave -noupdate -format Logic /tb_mips_sys/uut/mrdy_o_cpu @@ -91,7 +98,7 @@ add wave -noupdate -format Logic /tb_mips_sys/uut/stb_o_cpu add wave -noupdate -format Logic /tb_mips_sys/uut/srdy_i_cpu add wave -noupdate -format Logic /tb_mips_sys/uut/ack_i_cpu add wave -noupdate -divider {VGA Master} -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/mdat_i add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/mdat_o_vga add wave -noupdate -format Logic /tb_mips_sys/uut/mrdy_o_vga @@ -103,10 +110,10 @@ add wave -noupdate -format Logic /tb_mips_sys/uut/stb_o_vga add wave -noupdate -format Logic /tb_mips_sys/uut/srdy_i_vga add wave -noupdate -format Logic /tb_mips_sys/uut/ack_i_vga add wave -noupdate -divider BUI -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -label .op -radix hexadecimal /tb_mips_sys/uut/inst_mips_top/inst_pipeline/ex_stage.op add wave -noupdate -divider USB -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Logic /tb_mips_sys/sys_usb_rstn add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/sys_usb_d add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/sys_usb_a @@ -117,7 +124,7 @@ add wave -noupdate -format Logic /tb_mips_sys/sys_usb_int add wave -noupdate -format Literal /tb_mips_sys/uut/inst_usb_port/s add wave -noupdate -divider Flash add wave -noupdate -format Logic /tb_mips_sys/uut/sys_flash_ac97_rstn -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal /tb_mips_sys/uut/inst_flash_port/as add wave -noupdate -format Literal /tb_mips_sys/uut/inst_flash_port/s add wave -noupdate -format Logic /tb_mips_sys/uut/sys_flash_ssram_we_n @@ -151,31 +158,31 @@ add wave -noupdate -format Logic /tb_mips_sys/uut/ssram_we_n add wave -noupdate -format Logic /tb_mips_sys/uut/ssram_d_drv add wave -noupdate -format Logic /tb_mips_sys/uut/ssram_bsy add wave -noupdate -divider {MIPS TOP} -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal /tb_mips_sys/uut/inst_mips_top/inst_pipeline/hdu add wave -noupdate -format Literal /tb_mips_sys/uut/inst_mips_top/inst_pipeline/sdu add wave -noupdate -format Logic /tb_mips_sys/uut/inst_mips_top/inst_pipeline/cpu_run add wave -noupdate -format Literal -radix hexadecimal -expand /tb_mips_sys/uut/inst_mips_top/inst_pipeline/inst_reg_dual/reg_mem -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -radix hexadecimal -expand /tb_mips_sys/uut/inst_mips_top/inst_pipeline/id_stage add wave -noupdate -format Literal /tb_mips_sys/uut/inst_mips_top/inst_pipeline/sdu -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -radix hexadecimal -expand /tb_mips_sys/uut/inst_mips_top/inst_pipeline/ex_stage add wave -noupdate -format Literal /tb_mips_sys/uut/inst_mips_top/inst_pipeline/sdu -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -radix hexadecimal -expand /tb_mips_sys/uut/inst_mips_top/inst_pipeline/mem_stage add wave -noupdate -format Literal /tb_mips_sys/uut/inst_mips_top/inst_pipeline/sdu -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -radix hexadecimal -expand /tb_mips_sys/uut/inst_mips_top/inst_pipeline/wb_stage add wave -noupdate -divider {CPU DMEM} -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -divider {CPU IMEM} -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -divider {User ROM} add wave -noupdate -divider UUT -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -radix hexadecimal -expand /tb_mips_sys/uut/inst_mips_top/inst_pipeline/pc -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -radix hexadecimal /tb_mips_sys/uut/sys_sdr_a_q add wave -noupdate -format Literal /tb_mips_sys/uut/sys_sdr_ba_q add wave -noupdate -format Logic /tb_mips_sys/uut/sys_sdr_cas_qn @@ -190,13 +197,13 @@ add wave -noupdate -format Literal /tb_mips_sys/uut/sys_sdr_dqs_q add wave -noupdate -format Logic /tb_mips_sys/uut/sys_sdr_ras_qn add wave -noupdate -format Logic /tb_mips_sys/uut/sys_sdr_we_qn add wave -noupdate -divider I-Cache -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o add wave -noupdate -format Literal -radix hexadecimal -expand /tb_mips_sys/uut/inst_mips_top/inst_pipeline/pc add wave -noupdate -format Logic -label .branch -radix hexadecimal /tb_mips_sys/uut/inst_mips_top/inst_pipeline/ex_stage.ctrl.branch add wave -noupdate -divider D-Cache -add wave -noupdate -format Logic /tb_mips_sys/uut/CLK_O +add wave -noupdate -format Logic /tb_mips_sys/uut/clk_o TreeUpdate [SetDefaultTree] -WaveRestoreCursors {{Cursor 2} {0 ps} 0} {{Cursor 100} {0 ps} 0} +WaveRestoreCursors {{Cursor 2} {1804093493 ps} 0} {{Cursor 100} {0 ps} 0} configure wave -namecolwidth 187 configure wave -valuecolwidth 64 configure wave -justifyvalue left @@ -210,4 +217,4 @@ configure wave -gridperiod 100 configure wave -griddelta 40 configure wave -timeline 1 update -WaveRestoreZoom {0 ps} {27462813 ns} +WaveRestoreZoom {0 ps} {3268461 ns}