ЛР13. Обновление vga (#92)

* Fix(vga):Испр-ие чтения из char_tiff

* Ref(vgachargen):Испр-ие коммента к clk100m_i

* ЛР13. Добавление примечания насчет синхронного чтения в vga_sb_ctrl

---------

Co-authored-by: Andrei Solodovnikov <VoultBoy@yandex.ru>
This commit is contained in:
BROsandr
2024-07-15 14:10:33 +00:00
committed by GitHub
parent a4294c9b9e
commit 5fb4f99700
5 changed files with 92 additions and 116 deletions

View File

@@ -744,8 +744,7 @@ module vgachargen (
* firmware/mem_files/lab_13_ps2_vga_instr.mem — этим файлом необходимо проинициализировать память инструкций * firmware/mem_files/lab_13_ps2_vga_instr.mem — этим файлом необходимо проинициализировать память инструкций
* firmware/mem_files/lab_13_ps2ascii_data.mem — этим файлом необходимо проинициализировать память данных * firmware/mem_files/lab_13_ps2ascii_data.mem — этим файлом необходимо проинициализировать память данных
* firmware/mem_files/lab_13_vga_ch_map.mem * firmware/mem_files/lab_13_vga_ch_map.mem
* firmware/mem_files/lab_13_vga_ch_t_ro.mem * firmware/mem_files/lab_13_vga_ch_t.mem
* firmware/mem_files/lab_13_vga_ch_t_rw.mem
* firmware/mem_files/lab_13_vga_col_map.mem * firmware/mem_files/lab_13_vga_col_map.mem
Вам необходимо добавить в проект все эти файлы. Вам необходимо добавить в проект все эти файлы.
@@ -802,9 +801,12 @@ module vga_sb_ctrl (
Оба эти сигнала мультиплексируются / демультиплексируются с помощью одного и того же управляющего сигнала: `addr_i[13:12]` в соответствии с диапазонами адресов (рис. 4): Оба эти сигнала мультиплексируются / демультиплексируются с помощью одного и того же управляющего сигнала: `addr_i[13:12]` в соответствии с диапазонами адресов (рис. 4):
* `addr_i[13:12] == 2'b00` — сигнал `write_enable_i` поступает на вход `char_map_we_i`, выход `char_map_rdata_o` записывается в выходной регистр `read_data_o`; - `addr_i[13:12] == 2'b00` — сигнал `write_enable_i` поступает на вход `char_map_we_i`, выход `char_map_rdata_o` подается на выход `read_data_o`;
* `addr_i[13:12] == 2'b01` — сигнал `write_enable_i` поступает на вход `col_map_we_i`, выход `col_map_rdata_o` записывается в выходной регистр `read_data_o`; - `addr_i[13:12] == 2'b01` — сигнал `write_enable_i` поступает на вход `col_map_we_i`, выход `col_map_rdata_o` подается на выход `read_data_o`;
* `addr_i[13:12] == 2'b10` — сигнал `write_enable_i` поступает на вход `char_tiff_we_i`, выход `char_tiff_rdata_o` записывается в выходной регистр `read_data_o`. - `addr_i[13:12] == 2'b10` — сигнал `write_enable_i` поступает на вход `char_tiff_we_i`, выход `char_tiff_rdata_o` подается на выход `read_data_o`.
> [!Important]
> Обратите внимание на то что, контроллер vga является единственным контроллером, для которого не нужно реализовывать регистр перед выходом read_data_o для реализации синхронного чтения. Данная особенность обусловленна тем, что внутри модуля `vgachargen` уже находится блочная память с синхронным портом на чтение. Добавление еще одного регистра приведет к тому, данные будут "опаздывать" на один такт. Таким образом, данные на выход `read_data_o` необходимо подавать с помощью чисто комбинационной логики.
## Список использованной литературы ## Список использованной литературы

View File

@@ -597,3 +597,4 @@
53525150 53525150
57565554 57565554
5b5a5958 5b5a5958
5f5e5d5c

View File

@@ -1,33 +0,0 @@
00000000000000000000000000000000000000000000000000000000000000000000000001000010010000100111111001000010001001000010010000011000
00000000000000000000000000000000000000000000000000000000000000000000000000111110010000100100001000111110000000100000001000111110
00000000000000000000000000000000000000000000000000000000000000000000000000111110010000100100001000111110001000100010001000011110
00000000000000000000000000000000000000000000000000000000000000000000000000000010000000100000001000000010000000100000001001111110
00000000000000000000000000000000000000000000000000000000000000000100000101111111001000010010001000100010001001000010010000111100
00000000000000000000000000000000000000000000000000000000000000000000000001111110000000100000001000011110000000100000001001111110
00000000000000000000000000000000000000000000000000000000000000000000000001111110000000100000001000011110000000100111111000100100
00000000000000000000000000000000000000000000000000000000000000000000000001001001010010010010101000011100001010100100100101001001
00000000000000000000000000000000000000000000000000000000000000000000000000111100010000100100000000111000010000000100010000111000
00000000000000000000000000000000000000000000000000000000000000000000000001000110010010100100101001010010010100100110001001100010
00000000000000000000000000000000000000000000000000000000000000000000000001000110010010100101001001100010010000100001100000100100
00000000000000000000000000000000000000000000000000000000000000000000000001000010001000100010001000011110000010100001001000100010
00000000000000000000000000000000000000000000000000000000000000000000000001000010010000100100010001000100010010000100100001111000
00000000000000000000000000000000000000000000000000000000000000000000000001001001010010010101010101010101011000110110001101000001
00000000000000000000000000000000000000000000000000000000000000000000000001000010010000100100001001111110010000100100001001000010
00000000000000000000000000000000000000000000000000000000000000000000000000011100001000100100001001000010010000100100010000111000
00000000000000000000000000000000000000000000000000000000000000000000000001000010010000100100001001000010010000100100001001111110
00000000000000000000000000000000000000000000000000000000000000000000000000000010000000100001111000100010010000100100001000111110
00000000000000000000000000000000000000000000000000000000000000000000000000111000010001000000001000000010000000100100010000111000
00000000000000000000000000000000000000000000000000000000000000000000000000001000000010000000100000001000000010000000100001111111
00000000000000000000000000000000000000000000000000000000000000000000000000000010000001000000100000011000001001000100001001000010
00000000000000000000000000000000000000000000000000000000000000000000000000001000001111100100100101001001010010010011111000001000
00000000000000000000000000000000000000000000000000000000000000000000000001000010010000100010010000011000001001000100001001000010
00000000000000000000000000000000000000000000000000000000000000000100000001111110001000100010001000100010001000100010001000100010
00000000000000000000000000000000000000000000000000000000000000000000000001000000010000000101110001100010010000100100001001000010
00000000000000000000000000000000000000000000000000000000000000000000000001111111010010010100100101001001010010010100100101001001
00000000000000000000000000000000000000000000000000000000000000000100000001111111010010010100100101001001010010010100100101001001
00000000000000000000000000000000000000000000000000000000000000000000000000111100010001000100010001000100001111000000010000000111
00000000000000000000000000000000000000000000000000000000000000000000000001001111010100010101000101010001010011110100000101000001
00000000000000000000000000000000000000000000000000000000000000000000000000011110001000100010001000100010000111100000001000000010
00000000000000000000000000000000000000000000000000000000000000000000000000011100001000100100000001111000010000000010001000011100
00000000000000000000000000000000000000000000000000000000000000000000000000011001001001010100010101000111010001010100100100110001
00000000000000000000000000000000000000000000000000000000000000000000000001000010010001000111110001000010010000100100010001111000

View File

@@ -12,14 +12,12 @@ module vgachargen
import vgachargen_pkg::*; import vgachargen_pkg::*;
#( #(
parameter int unsigned CLK_FACTOR_25M = 100 / 25, parameter int unsigned CLK_FACTOR_25M = 100 / 25,
parameter CH_T_RO_INIT_FILE_NAME = "lab_13_vga_ch_t_ro.mem", parameter CH_T_INIT_FILE_NAME = "lab_13_vga_ch_t.mem",
parameter bit CH_T_RO_INIT_FILE_IS_BIN = 1, parameter bit CH_T_INIT_FILE_IS_BIN = 1'b1,
parameter CH_T_RW_INIT_FILE_NAME = "lab_13_vga_ch_t_rw.mem",
parameter bit CH_T_RW_INIT_FILE_IS_BIN = 1,
parameter CH_MAP_INIT_FILE_NAME = "lab_13_vga_ch_map.mem", parameter CH_MAP_INIT_FILE_NAME = "lab_13_vga_ch_map.mem",
parameter bit CH_MAP_INIT_FILE_IS_BIN = 0, parameter bit CH_MAP_INIT_FILE_IS_BIN = 1'b0,
parameter COL_MAP_INIT_FILE_NAME = "lab_13_vga_col_map.mem", parameter COL_MAP_INIT_FILE_NAME = "lab_13_vga_col_map.mem",
parameter bit COL_MAP_INIT_FILE_IS_BIN = 0 parameter bit COL_MAP_INIT_FILE_IS_BIN = 1'b0
) ( ) (
input logic clk_i, // системный синхроимпульс input logic clk_i, // системный синхроимпульс
input logic clk100m_i, // клок с частотой 100МГц input logic clk100m_i, // клок с частотой 100МГц
@@ -58,6 +56,10 @@ module vgachargen
output logic vga_hs_o, // линия горизонтальной синхронизации vga output logic vga_hs_o, // линия горизонтальной синхронизации vga
output logic vga_vs_o // линия вертикальной синхронизации vga output logic vga_vs_o // линия вертикальной синхронизации vga
); );
logic vga_clk_i;
assign vga_clk_i = clk100m_i;
if (CLK_FACTOR_25M == 0 || CLK_FACTOR_25M > 4) error_unsupported_factor error_unsupported_factor ();
logic [3:0] char_map_be_gated; logic [3:0] char_map_be_gated;
assign char_map_be_gated = char_map_be_i & {4{char_map_we_i}}; assign char_map_be_gated = char_map_be_i & {4{char_map_we_i}};
@@ -65,6 +67,9 @@ module vgachargen
logic [3:0] col_map_be_gated; logic [3:0] col_map_be_gated;
assign col_map_be_gated = col_map_be_i & {4{col_map_we_i}}; assign col_map_be_gated = col_map_be_i & {4{col_map_we_i}};
logic [3:0] char_tiff_be_gated;
assign char_tiff_be_gated = char_tiff_be_i & {4{char_tiff_we_i}};
logic arstn_i; logic arstn_i;
assign arstn_i = ~rst_i; assign arstn_i = ~rst_i;
@@ -78,7 +83,7 @@ module vgachargen
.DATA_WIDTH (1), .DATA_WIDTH (1),
.DELAY_BY (2) .DELAY_BY (2)
) pixel_enable_delay ( ) pixel_enable_delay (
.clk_i (clk100m_i), .clk_i (vga_clk_i),
.arstn_i (arstn_i), .arstn_i (arstn_i),
.data_i (pixel_enable), .data_i (pixel_enable),
.data_o (pixel_enable_delayed) .data_o (pixel_enable_delayed)
@@ -91,7 +96,7 @@ module vgachargen
.DATA_WIDTH (1), .DATA_WIDTH (1),
.DELAY_BY (2) .DELAY_BY (2)
) vga_vs_delay ( ) vga_vs_delay (
.clk_i (clk100m_i), .clk_i (vga_clk_i),
.arstn_i (arstn_i), .arstn_i (arstn_i),
.data_i (vga_vs), .data_i (vga_vs),
.data_o (vga_vs_delayed) .data_o (vga_vs_delayed)
@@ -104,7 +109,7 @@ module vgachargen
.DATA_WIDTH (1), .DATA_WIDTH (1),
.DELAY_BY (2) .DELAY_BY (2)
) vga_hs_delay ( ) vga_hs_delay (
.clk_i (clk100m_i), .clk_i (vga_clk_i),
.arstn_i (arstn_i), .arstn_i (arstn_i),
.data_i (vga_hs), .data_i (vga_hs),
.data_o (vga_hs_delayed) .data_o (vga_hs_delayed)
@@ -114,7 +119,7 @@ module vgachargen
vga_block #( vga_block #(
.CLK_FACTOR_25M (CLK_FACTOR_25M) .CLK_FACTOR_25M (CLK_FACTOR_25M)
) vga_block ( ) vga_block (
.clk_i (clk100m_i), .clk_i (vga_clk_i),
.arstn_i (arstn_i), .arstn_i (arstn_i),
.hcount_o (hcount_pixels), .hcount_o (hcount_pixels),
.vcount_o (vcount_pixels), .vcount_o (vcount_pixels),
@@ -132,7 +137,7 @@ module vgachargen
.DATA_WIDTH (BITMAP_ADDR_WIDTH), .DATA_WIDTH (BITMAP_ADDR_WIDTH),
.DELAY_BY (2) .DELAY_BY (2)
) bitmap_delay ( ) bitmap_delay (
.clk_i (clk100m_i), .clk_i (vga_clk_i),
.arstn_i (arstn_i), .arstn_i (arstn_i),
.data_i (bitmap_addr), .data_i (bitmap_addr),
.data_o (bitmap_addr_delayed) .data_o (bitmap_addr_delayed)
@@ -145,12 +150,25 @@ module vgachargen
.bitmap_addr_o (bitmap_addr) .bitmap_addr_o (bitmap_addr)
); );
logic [1:0] ch_map_byte_select;
logic [1:0] ch_map_byte_select_delayed;
assign ch_map_byte_select = ch_map_addr_internal[1:0];
logic [CH_T_ADDR_WIDTH:0] ch_t_addr_internal; delay #(
.DATA_WIDTH (2),
.DELAY_BY (1)
) ch_map_byte_select_delay (
.clk_i (vga_clk_i),
.arstn_i (arstn_i),
.data_i (ch_map_byte_select),
.data_o (ch_map_byte_select_delayed)
);
logic [CH_T_ADDR_WIDTH-1:0] ch_t_addr_internal;
logic [3:0][7:0] ch_map_data_word; logic [3:0][7:0] ch_map_data_word;
assign ch_t_addr_internal = ch_map_data_word[ch_map_addr_internal[1:0]]; assign ch_t_addr_internal = ch_map_data_word[ch_map_byte_select_delayed];
true_dual_port_rw_bram #( true_dual_port_rw_bram #(
.INIT_FILE_NAME (CH_MAP_INIT_FILE_NAME), .INIT_FILE_NAME (CH_MAP_INIT_FILE_NAME),
@@ -158,7 +176,7 @@ module vgachargen
.ADDR_WIDTH (10) .ADDR_WIDTH (10)
) ch_map ( ) ch_map (
.clka_i (clk_i), .clka_i (clk_i),
.clkb_i (clk100m_i), .clkb_i (vga_clk_i),
.addra_i (char_map_addr_i), .addra_i (char_map_addr_i),
.addrb_i (ch_map_addr_internal[$left(ch_map_addr_internal):2]), .addrb_i (ch_map_addr_internal[$left(ch_map_addr_internal):2]),
.wea_i (char_map_be_gated), .wea_i (char_map_be_gated),
@@ -167,62 +185,68 @@ module vgachargen
.doutb_o (ch_map_data_word) .doutb_o (ch_map_data_word)
); );
logic [CH_T_ADDR_WIDTH-1:0] ch_t_ro_addr_internal; logic [CH_T_DATA_WIDTH-1:0] ch_t_data_internal;
assign ch_t_ro_addr_internal = ch_t_addr_internal[CH_T_ADDR_WIDTH-1:0];
logic [CH_T_DATA_WIDTH-1:0] ch_t_ro_data_internal;
single_port_ro_bram #( logic [CH_T_ADDR_WIDTH-1:0] char_tiff_addr_128bit;
.INIT_FILE_NAME (CH_T_RO_INIT_FILE_NAME), assign char_tiff_addr_128bit = char_tiff_addr_i[$left(char_tiff_addr_i):2];
.INIT_FILE_IS_BIN (CH_T_RO_INIT_FILE_IS_BIN), logic [1:0] char_tiff_addr_offset_32bit;
.DATA_WIDTH (CH_T_DATA_WIDTH), assign char_tiff_addr_offset_32bit = char_tiff_addr_i[1:0];
.ADDR_WIDTH (CH_T_ADDR_WIDTH)
) ch_t_ro (
.clk_i (clk100m_i),
.addr_i(ch_t_ro_addr_internal),
.dout_o(ch_t_ro_data_internal)
);
logic [CH_T_ADDR_WIDTH-1:0] ch_t_rw_addr_internal; logic [3:0][3:0] char_tiff_wea;
assign ch_t_rw_addr_internal = ch_t_ro_addr_internal;
logic [CH_T_DATA_WIDTH-1:0] ch_t_rw_data_internal; always_comb begin : bin2onehot
char_tiff_wea = '0;
char_tiff_wea[char_tiff_addr_offset_32bit] = char_tiff_be_gated;
end
logic [6:0] char_tiff_addr_offset_128bit;
logic [6:0] char_tiff_addr_offset_128bit_ff;
assign char_tiff_addr_offset_128bit = {char_tiff_addr_offset_32bit, 5'b00000};
logic [127:0] char_tiff_wdata_128bit;
always_comb begin
char_tiff_wdata_128bit = '0;
char_tiff_wdata_128bit[char_tiff_addr_offset_128bit+:32] = char_tiff_wdata_i;
end
logic [127:0] char_tiff_rdata_128bit;
assign char_tiff_rdata_o = char_tiff_rdata_128bit[char_tiff_addr_offset_128bit_ff+:32];
always_ff @(posedge clk_i) begin
char_tiff_addr_offset_128bit_ff <= char_tiff_addr_offset_128bit;
end
true_dual_port_rw_bram #( true_dual_port_rw_bram #(
.INIT_FILE_NAME (CH_T_RW_INIT_FILE_NAME), .INIT_FILE_NAME (CH_T_INIT_FILE_NAME),
.INIT_FILE_IS_BIN (CH_T_RW_INIT_FILE_IS_BIN), .INIT_FILE_IS_BIN (CH_T_INIT_FILE_IS_BIN),
.NUM_COLS (1), .NUM_COLS (16),
.COL_WIDTH (CH_T_DATA_WIDTH), .COL_WIDTH (8),
.ADDR_WIDTH (CH_T_ADDR_WIDTH) .ADDR_WIDTH (CH_T_ADDR_WIDTH)
) ch_t_rw ( ) char_tiff (
.clka_i (clk_i), .clka_i (clk_i),
.clkb_i (clk100m_i), .clkb_i (vga_clk_i),
// .addra_i (ch_t_rw_addr_i), .addra_i (char_tiff_addr_128bit),
.addra_i (), .addrb_i (ch_t_addr_internal),
.addrb_i (ch_t_rw_addr_internal), .wea_i (char_tiff_wea),
// .wea_i (ch_t_rw_wen_i), .dina_i (char_tiff_wdata_128bit),
.wea_i (), .douta_o (char_tiff_rdata_128bit),
// .dina_i (ch_t_rw_data_i), .doutb_o (ch_t_data_internal)
.dina_i (),
// .douta_o (ch_t_rw_data_o),
.douta_o (),
.doutb_o (ch_t_rw_data_internal)
); );
logic [CH_T_DATA_WIDTH-1:0] ch_t_data_internal;
assign ch_t_data_internal = ch_t_addr_internal[CH_T_ADDR_WIDTH] ? ch_t_rw_data_internal
: ch_t_ro_data_internal;
logic [7:0] col_map_data_internal; logic [7:0] col_map_data_internal;
logic [7:0] col_map_data_internal_delayed; logic [7:0] col_map_data_internal_delayed;
logic [3:0][7:0] col_map_data_internal_word; logic [3:0][7:0] col_map_data_internal_word;
assign col_map_data_internal = col_map_data_internal_word[ch_map_addr_internal[1:0]]; assign col_map_data_internal = col_map_data_internal_word[ch_map_byte_select_delayed];
delay #( delay #(
.DATA_WIDTH (8), .DATA_WIDTH (8),
.DELAY_BY (1) .DELAY_BY (1)
) col_map_data_delay ( ) col_map_data_delay (
.clk_i (clk100m_i), .clk_i (vga_clk_i),
.arstn_i (arstn_i), .arstn_i (arstn_i),
.data_i (col_map_data_internal), .data_i (col_map_data_internal),
.data_o (col_map_data_internal_delayed) .data_o (col_map_data_internal_delayed)
@@ -240,7 +264,7 @@ module vgachargen
.ADDR_WIDTH (10) .ADDR_WIDTH (10)
) col_map ( ) col_map (
.clka_i (clk_i), .clka_i (clk_i),
.clkb_i (clk100m_i), .clkb_i (vga_clk_i),
.addra_i (col_map_addr_i), .addra_i (col_map_addr_i),
.addrb_i (ch_map_addr_internal[$left(ch_map_addr_internal):2]), .addrb_i (ch_map_addr_internal[$left(ch_map_addr_internal):2]),
.wea_i (col_map_be_gated), .wea_i (col_map_be_gated),
@@ -277,7 +301,7 @@ module vgachargen
assign vga_vs_next = vga_vs_delayed; assign vga_vs_next = vga_vs_delayed;
assign vga_hs_next = vga_hs_delayed; assign vga_hs_next = vga_hs_delayed;
always_ff @(posedge clk100m_i or negedge arstn_i) begin always_ff @(posedge vga_clk_i or negedge arstn_i) begin
if (!arstn_i) begin if (!arstn_i) begin
vga_r_ff <= '0; vga_r_ff <= '0;
vga_g_ff <= '0; vga_g_ff <= '0;
@@ -309,7 +333,8 @@ module clk_divider # (
input logic arstn_i, input logic arstn_i,
output logic strb_o output logic strb_o
); );
localparam int unsigned COUNTER_WIDTH = (DIVISOR > 1) ? $clog2(DIVISOR) : 1;
localparam int unsigned COUNTER_WIDTH = $clog2(DIVISOR);
logic [COUNTER_WIDTH-1:0] counter_next; logic [COUNTER_WIDTH-1:0] counter_next;
logic [COUNTER_WIDTH-1:0] counter_ff; logic [COUNTER_WIDTH-1:0] counter_ff;
@@ -394,28 +419,6 @@ module index_generator
endmodule endmodule
module single_port_ro_bram #(
parameter INIT_FILE_NAME = "",
parameter INIT_FILE_IS_BIN = 0,
parameter int unsigned DATA_WIDTH = 2,
parameter int unsigned ADDR_WIDTH = 4,
localparam int unsigned DEPTH_WORDS = 2 ** ADDR_WIDTH
) (
input logic clk_i,
input logic [ADDR_WIDTH-1:0] addr_i,
output logic [DATA_WIDTH-1:0] dout_o
);
logic [DATA_WIDTH-1:0] mem[DEPTH_WORDS];
if (INIT_FILE_IS_BIN) initial $readmemb(INIT_FILE_NAME, mem, 0, DEPTH_WORDS-1);
else initial $readmemh(INIT_FILE_NAME, mem, 0, DEPTH_WORDS-1);
always_ff @(posedge clk_i) begin
dout_o <= mem[addr_i];
end
endmodule
module timing_generator module timing_generator
import vgachargen_pkg::*; import vgachargen_pkg::*;
( (
@@ -434,7 +437,6 @@ module timing_generator
); );
logic [VGA_MAX_H_WIDTH-1:0] hcount_ff; logic [VGA_MAX_H_WIDTH-1:0] hcount_ff;
logic hcount_en;
logic [VGA_MAX_H_WIDTH-1:0] hcount_next; logic [VGA_MAX_H_WIDTH-1:0] hcount_next;
logic [VGA_MAX_V_WIDTH-1:0] vcount_ff; logic [VGA_MAX_V_WIDTH-1:0] vcount_ff;
@@ -602,6 +604,7 @@ module vga_block
); );
logic clk_divider_strb; logic clk_divider_strb;
if (CLK_FACTOR_25M > 1) begin
clk_divider # ( clk_divider # (
.DIVISOR (CLK_FACTOR_25M) .DIVISOR (CLK_FACTOR_25M)
) clk_divider ( ) clk_divider (
@@ -609,6 +612,9 @@ module vga_block
.arstn_i, .arstn_i,
.strb_o (clk_divider_strb) .strb_o (clk_divider_strb)
); );
end else begin
assign clk_divider_strb = 1'b1;
end
timing_generator timing_generator ( timing_generator timing_generator (
.clk_i, .clk_i,