From be0a63d968e37a4b320ce433068f6fc3bc85b1ea Mon Sep 17 00:00:00 2001 From: Joachim Lusiardi Date: Tue, 22 Oct 2019 10:23:53 +0200 Subject: [PATCH 1/2] Fix code to work with verilator 4.020 --- cpu_forwarded/stage_decode.v | 4 ++-- cpu_forwarded/stage_memory.v | 4 ++-- pipelined_basic/stage_decode.v | 4 ++-- pipelined_basic/stage_memory.v | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cpu_forwarded/stage_decode.v b/cpu_forwarded/stage_decode.v index 0467017..91ea70a 100644 --- a/cpu_forwarded/stage_decode.v +++ b/cpu_forwarded/stage_decode.v @@ -75,8 +75,8 @@ module stage_decode(input clk, wire [31:0] reg_file_write_data; - wire [31:0] read_data_0; - wire [31:0] read_data_1; +// wire [31:0] read_data_0; +// wire [31:0] read_data_1; wire reg_file_write_en; diff --git a/cpu_forwarded/stage_memory.v b/cpu_forwarded/stage_memory.v index 875190e..211fac5 100644 --- a/cpu_forwarded/stage_memory.v +++ b/cpu_forwarded/stage_memory.v @@ -62,8 +62,8 @@ module stage_memory( .write_enable(main_mem_wen), .clk(clk)); - wire [31:0] write_back_register_input; - wire [31:0] exe_result; +// wire [31:0] write_back_register_input; +// wire [31:0] exe_result; mem_result_control mem_res_control(.instr_type(current_instr_type), .read_data(read_data_1), diff --git a/pipelined_basic/stage_decode.v b/pipelined_basic/stage_decode.v index d7735ba..6a8be1f 100644 --- a/pipelined_basic/stage_decode.v +++ b/pipelined_basic/stage_decode.v @@ -73,8 +73,8 @@ module stage_decode(input clk, wire [31:0] reg_file_write_data; - wire [31:0] read_data_0; - wire [31:0] read_data_1; +// wire [31:0] read_data_0; +// wire [31:0] read_data_1; wire reg_file_write_en; diff --git a/pipelined_basic/stage_memory.v b/pipelined_basic/stage_memory.v index 875190e..211fac5 100644 --- a/pipelined_basic/stage_memory.v +++ b/pipelined_basic/stage_memory.v @@ -62,8 +62,8 @@ module stage_memory( .write_enable(main_mem_wen), .clk(clk)); - wire [31:0] write_back_register_input; - wire [31:0] exe_result; +// wire [31:0] write_back_register_input; +// wire [31:0] exe_result; mem_result_control mem_res_control(.instr_type(current_instr_type), .read_data(read_data_1), From a260fc19b601f00bad02646c1a848fba7a821f46 Mon Sep 17 00:00:00 2001 From: Joachim Lusiardi Date: Tue, 22 Oct 2019 10:47:09 +0200 Subject: [PATCH 2/2] removed commented out code --- cpu_forwarded/stage_decode.v | 3 --- cpu_forwarded/stage_memory.v | 3 --- pipelined_basic/stage_decode.v | 3 --- pipelined_basic/stage_memory.v | 3 --- 4 files changed, 12 deletions(-) diff --git a/cpu_forwarded/stage_decode.v b/cpu_forwarded/stage_decode.v index 91ea70a..d361286 100644 --- a/cpu_forwarded/stage_decode.v +++ b/cpu_forwarded/stage_decode.v @@ -75,9 +75,6 @@ module stage_decode(input clk, wire [31:0] reg_file_write_data; -// wire [31:0] read_data_0; -// wire [31:0] read_data_1; - wire reg_file_write_en; pipelined_basic_register_file_control diff --git a/cpu_forwarded/stage_memory.v b/cpu_forwarded/stage_memory.v index 211fac5..8622780 100644 --- a/cpu_forwarded/stage_memory.v +++ b/cpu_forwarded/stage_memory.v @@ -62,9 +62,6 @@ module stage_memory( .write_enable(main_mem_wen), .clk(clk)); -// wire [31:0] write_back_register_input; -// wire [31:0] exe_result; - mem_result_control mem_res_control(.instr_type(current_instr_type), .read_data(read_data_1), .alu_result(alu_result), diff --git a/pipelined_basic/stage_decode.v b/pipelined_basic/stage_decode.v index 6a8be1f..5498bb3 100644 --- a/pipelined_basic/stage_decode.v +++ b/pipelined_basic/stage_decode.v @@ -73,9 +73,6 @@ module stage_decode(input clk, wire [31:0] reg_file_write_data; -// wire [31:0] read_data_0; -// wire [31:0] read_data_1; - wire reg_file_write_en; pipelined_basic_register_file_control diff --git a/pipelined_basic/stage_memory.v b/pipelined_basic/stage_memory.v index 211fac5..8622780 100644 --- a/pipelined_basic/stage_memory.v +++ b/pipelined_basic/stage_memory.v @@ -62,9 +62,6 @@ module stage_memory( .write_enable(main_mem_wen), .clk(clk)); -// wire [31:0] write_back_register_input; -// wire [31:0] exe_result; - mem_result_control mem_res_control(.instr_type(current_instr_type), .read_data(read_data_1), .alu_result(alu_result),