Skip to content

Commit 7acd06c

Browse files
JrvvvJrvvv
committed
vga module with w/r reqs + waveform minor changes
1 parent aa8626b commit 7acd06c

File tree

3 files changed

+85
-59
lines changed

3 files changed

+85
-59
lines changed

‎riscv_cpu/peripherals/vga_sb_ctrl.sv‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ module vga_sb_ctrl
3333
logic [31:0] col_map_rdata;
3434
logic [31:0] char_tiff_rdata;
3535

36+
// signals to indicate which req
37+
logic write_req;
38+
logic read_req;
39+
40+
assign write_req = req_i & write_enable_i;
41+
assign read_req = req_i & ~write_enable_i;
42+
3643
assign vga_char_addr = addr_i[11:2];
3744
assign rw_char_sel = addr_i[13:12];
3845

@@ -44,13 +51,13 @@ module vga_sb_ctrl
4451
char_tiff_we <= 1'b0;
4552
end else begin
4653
case(rw_char_sel)
47-
2'b00 : char_map_we <= write_enable_i;
48-
2'b01 : col_map_we <= write_enable_i;
49-
2'b10 : char_tiff_we <= write_enable_i;
54+
2'b00 : char_map_we <= write_req;
55+
2'b01 : col_map_we <= write_req;
56+
2'b10 : char_tiff_we <= write_req;
5057
default : begin
51-
char_map_we <= 1'b0;
52-
col_map_we <= 1'b0;
53-
char_tiff_we <= 1'b0;
58+
char_map_we <= 1'b0;
59+
col_map_we <= 1'b0;
60+
char_tiff_we <= 1'b0;
5461
end
5562
endcase
5663
end
@@ -61,12 +68,16 @@ module vga_sb_ctrl
6168
if(rst_i) begin
6269
read_data_o <= 32'b0;
6370
end else begin
64-
case(rw_char_sel)
65-
2'b00 : read_data_o <= char_map_rdata;
66-
2'b01 : read_data_o <= col_map_rdata;
67-
2'b10 : read_data_o <= char_tiff_rdata;
68-
default : read_data_o <= read_data_o;
69-
endcase
71+
if (read_req) begin
72+
case(rw_char_sel)
73+
2'b00 : read_data_o <= char_map_rdata;
74+
2'b01 : read_data_o <= col_map_rdata;
75+
2'b10 : read_data_o <= char_tiff_rdata;
76+
default : read_data_o <= 32'b0;
77+
endcase
78+
end else begin
79+
read_data_o <= 32'b0;
80+
end
7081
end
7182
end
7283

‎riscv_cpu/riscv_cpu.xpr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Option Name="IPUserFilesDir" Val="$PIPUSERFILESDIR"/>
3131
<Option Name="IPStaticSourceDir" Val="$PIPUSERFILESDIR/ipstatic"/>
3232
<Option Name="EnableBDX" Val="FALSE"/>
33-
<Option Name="WTXSimLaunchSim" Val="194"/>
33+
<Option Name="WTXSimLaunchSim" Val="209"/>
3434
<Option Name="WTModelSimLaunchSim" Val="0"/>
3535
<Option Name="WTQuestaLaunchSim" Val="0"/>
3636
<Option Name="WTIesLaunchSim" Val="0"/>

‎riscv_cpu/tb/tb_peripherals/tb_riscv_unit_behav.wcfg‎

Lines changed: 61 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
</db_ref>
1616
</db_ref_list>
1717
<zoom_setting>
18-
<ZoomStartTime time="902300000fs"></ZoomStartTime>
19-
<ZoomEndTime time="902990001fs"></ZoomEndTime>
20-
<Cursor1Time time="902515000fs"></Cursor1Time>
18+
<ZoomStartTime time="902015000fs"></ZoomStartTime>
19+
<ZoomEndTime time="903403001fs"></ZoomEndTime>
20+
<Cursor1Time time="902331000fs"></Cursor1Time>
2121
</zoom_setting>
2222
<column_width_setting>
2323
<NameColumnWidth column_width="175"></NameColumnWidth>
24-
<ValueColumnWidth column_width="134"></ValueColumnWidth>
24+
<ValueColumnWidth column_width="130"></ValueColumnWidth>
2525
</column_width_setting>
26-
<WVObjectSize size="12" />
26+
<WVObjectSize size="7" />
2727
<wvobject type="logic" fp_name="/tb_riscv_unit/dut/sysclk">
2828
<obj_property name="ElementShortName">sysclk</obj_property>
2929
<obj_property name="ObjectShortName">sysclk</obj_property>
@@ -38,49 +38,64 @@
3838
<obj_property name="CustomSignalColor">#00FFFF</obj_property>
3939
<obj_property name="UseCustomSignalColor">true</obj_property>
4040
</wvobject>
41-
<wvobject type="array" fp_name="/tb_riscv_unit/dut/data_wd">
42-
<obj_property name="ElementShortName">data_wd[31:0]</obj_property>
43-
<obj_property name="ObjectShortName">data_wd[31:0]</obj_property>
41+
<wvobject type="group" fp_name="group366">
42+
<obj_property name="label">wd/rd</obj_property>
43+
<obj_property name="DisplayName">label</obj_property>
44+
<obj_property name="isExpanded"></obj_property>
45+
<wvobject type="array" fp_name="/tb_riscv_unit/dut/data_wd">
46+
<obj_property name="ElementShortName">data_wd[31:0]</obj_property>
47+
<obj_property name="ObjectShortName">data_wd[31:0]</obj_property>
48+
</wvobject>
49+
<wvobject type="array" fp_name="/tb_riscv_unit/dut/data_rd">
50+
<obj_property name="ElementShortName">data_rd[31:0]</obj_property>
51+
<obj_property name="ObjectShortName">data_rd[31:0]</obj_property>
52+
</wvobject>
4453
</wvobject>
45-
<wvobject type="array" fp_name="/tb_riscv_unit/dut/data_rd">
46-
<obj_property name="ElementShortName">data_rd[31:0]</obj_property>
47-
<obj_property name="ObjectShortName">data_rd[31:0]</obj_property>
54+
<wvobject type="group" fp_name="group368">
55+
<obj_property name="label">rd peripheral outs</obj_property>
56+
<obj_property name="DisplayName">label</obj_property>
57+
<obj_property name="isExpanded"></obj_property>
58+
<wvobject type="array" fp_name="/tb_riscv_unit/dut/data_mem_rd">
59+
<obj_property name="ElementShortName">data_mem_rd[31:0]</obj_property>
60+
<obj_property name="ObjectShortName">data_mem_rd[31:0]</obj_property>
61+
<obj_property name="CustomSignalColor">#FAAFBE</obj_property>
62+
<obj_property name="UseCustomSignalColor">true</obj_property>
63+
</wvobject>
64+
<wvobject type="array" fp_name="/tb_riscv_unit/dut/vga_ctrl_rd">
65+
<obj_property name="ElementShortName">vga_ctrl_rd[31:0]</obj_property>
66+
<obj_property name="ObjectShortName">vga_ctrl_rd[31:0]</obj_property>
67+
<obj_property name="CustomSignalColor">#FAAFBE</obj_property>
68+
<obj_property name="UseCustomSignalColor">true</obj_property>
69+
</wvobject>
70+
<wvobject type="array" fp_name="/tb_riscv_unit/dut/ps2_ctrl_rd">
71+
<obj_property name="ElementShortName">ps2_ctrl_rd[31:0]</obj_property>
72+
<obj_property name="ObjectShortName">ps2_ctrl_rd[31:0]</obj_property>
73+
<obj_property name="CustomSignalColor">#FAAFBE</obj_property>
74+
<obj_property name="UseCustomSignalColor">true</obj_property>
75+
</wvobject>
4876
</wvobject>
49-
<wvobject type="array" fp_name="/tb_riscv_unit/dut/data_mem_rd">
50-
<obj_property name="ElementShortName">data_mem_rd[31:0]</obj_property>
51-
<obj_property name="ObjectShortName">data_mem_rd[31:0]</obj_property>
52-
<obj_property name="CustomSignalColor">#008000</obj_property>
53-
<obj_property name="UseCustomSignalColor">true</obj_property>
54-
</wvobject>
55-
<wvobject type="array" fp_name="/tb_riscv_unit/dut/vga_ctrl_rd">
56-
<obj_property name="ElementShortName">vga_ctrl_rd[31:0]</obj_property>
57-
<obj_property name="ObjectShortName">vga_ctrl_rd[31:0]</obj_property>
58-
<obj_property name="CustomSignalColor">#008000</obj_property>
59-
<obj_property name="UseCustomSignalColor">true</obj_property>
60-
</wvobject>
61-
<wvobject type="array" fp_name="/tb_riscv_unit/dut/ps2_ctrl_rd">
62-
<obj_property name="ElementShortName">ps2_ctrl_rd[31:0]</obj_property>
63-
<obj_property name="ObjectShortName">ps2_ctrl_rd[31:0]</obj_property>
64-
<obj_property name="CustomSignalColor">#008000</obj_property>
65-
<obj_property name="UseCustomSignalColor">true</obj_property>
66-
</wvobject>
67-
<wvobject type="logic" fp_name="/tb_riscv_unit/dut/data_mem_req">
68-
<obj_property name="ElementShortName">data_mem_req</obj_property>
69-
<obj_property name="ObjectShortName">data_mem_req</obj_property>
70-
<obj_property name="CustomSignalColor">#00FFFF</obj_property>
71-
<obj_property name="UseCustomSignalColor">true</obj_property>
72-
</wvobject>
73-
<wvobject type="logic" fp_name="/tb_riscv_unit/dut/ps2_ctrl_req">
74-
<obj_property name="ElementShortName">ps2_ctrl_req</obj_property>
75-
<obj_property name="ObjectShortName">ps2_ctrl_req</obj_property>
76-
<obj_property name="CustomSignalColor">#00FFFF</obj_property>
77-
<obj_property name="UseCustomSignalColor">true</obj_property>
78-
</wvobject>
79-
<wvobject type="logic" fp_name="/tb_riscv_unit/dut/vga_ctrl_req">
80-
<obj_property name="ElementShortName">vga_ctrl_req</obj_property>
81-
<obj_property name="ObjectShortName">vga_ctrl_req</obj_property>
82-
<obj_property name="CustomSignalColor">#00FFFF</obj_property>
83-
<obj_property name="UseCustomSignalColor">true</obj_property>
77+
<wvobject type="group" fp_name="group369">
78+
<obj_property name="label">peripheral reqs</obj_property>
79+
<obj_property name="DisplayName">label</obj_property>
80+
<obj_property name="isExpanded"></obj_property>
81+
<wvobject type="logic" fp_name="/tb_riscv_unit/dut/data_mem_req">
82+
<obj_property name="ElementShortName">data_mem_req</obj_property>
83+
<obj_property name="ObjectShortName">data_mem_req</obj_property>
84+
<obj_property name="CustomSignalColor">#00FFFF</obj_property>
85+
<obj_property name="UseCustomSignalColor">true</obj_property>
86+
</wvobject>
87+
<wvobject type="logic" fp_name="/tb_riscv_unit/dut/vga_ctrl_req">
88+
<obj_property name="ElementShortName">vga_ctrl_req</obj_property>
89+
<obj_property name="ObjectShortName">vga_ctrl_req</obj_property>
90+
<obj_property name="CustomSignalColor">#00FFFF</obj_property>
91+
<obj_property name="UseCustomSignalColor">true</obj_property>
92+
</wvobject>
93+
<wvobject type="logic" fp_name="/tb_riscv_unit/dut/ps2_ctrl_req">
94+
<obj_property name="ElementShortName">ps2_ctrl_req</obj_property>
95+
<obj_property name="ObjectShortName">ps2_ctrl_req</obj_property>
96+
<obj_property name="CustomSignalColor">#00FFFF</obj_property>
97+
<obj_property name="UseCustomSignalColor">true</obj_property>
98+
</wvobject>
8499
</wvobject>
85100
<wvobject type="array" fp_name="/tb_riscv_unit/dut/ps2_ctrl_dev/scan_code">
86101
<obj_property name="ElementShortName">scan_code[7:0]</obj_property>

0 commit comments

Comments
 (0)