From 818c0abc897eab3aa2487dd21324e8f16b96d4f2 Mon Sep 17 00:00:00 2001 From: Ross Thompson Date: Thu, 29 Apr 2021 17:36:46 -0500 Subject: [PATCH] Fixed memory size in configs for rv32ic and rv64ic. Removed warning on call to $fscanf. --- wally-pipelined/config/rv32ic/wally-config.vh | 4 ++-- wally-pipelined/config/rv64ic/wally-config.vh | 4 ++-- wally-pipelined/testbench/function_radix.sv | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/wally-pipelined/config/rv32ic/wally-config.vh b/wally-pipelined/config/rv32ic/wally-config.vh index fa16fdb86..41285cfa1 100644 --- a/wally-pipelined/config/rv32ic/wally-config.vh +++ b/wally-pipelined/config/rv32ic/wally-config.vh @@ -68,8 +68,8 @@ `define BOOTTIMBASE 32'h00000000 `define BOOTTIMRANGE 32'h00003FFF -`define TIMBASE 32'h80000000 -`define TIMRANGE 32'h0007FFFF +`define TIMBASE 32'h80000000 +`define TIMRANGE 32'h07FFFFFF `define CLINTBASE 32'h02000000 `define CLINTRANGE 32'h0000FFFF `define GPIOBASE 32'h10012000 diff --git a/wally-pipelined/config/rv64ic/wally-config.vh b/wally-pipelined/config/rv64ic/wally-config.vh index 3ef92055a..2e0d92fb8 100644 --- a/wally-pipelined/config/rv64ic/wally-config.vh +++ b/wally-pipelined/config/rv64ic/wally-config.vh @@ -72,8 +72,8 @@ `define BOOTTIMBASE 32'h00000000 `define BOOTTIMRANGE 32'h00003FFF -`define TIMBASE 32'h80000000 -`define TIMRANGE 32'h0007FFFF +`define TIMBASE 32'h80000000 +`define TIMRANGE 32'h07FFFFFF `define CLINTBASE 32'h02000000 `define CLINTRANGE 32'h0000FFFF `define GPIOBASE 32'h10012000 diff --git a/wally-pipelined/testbench/function_radix.sv b/wally-pipelined/testbench/function_radix.sv index 20e2ff13e..5e3dff986 100644 --- a/wally-pipelined/testbench/function_radix.sv +++ b/wally-pipelined/testbench/function_radix.sv @@ -110,6 +110,8 @@ module FunctionName(reset, clk, ProgramAddrMapFile, ProgramLabelMapFile); integer ProgramAddrMapLineCount, ProgramLabelMapLineCount; longint ProgramAddrMapLine; string ProgramLabelMapLine; + integer status; + // preload // initial begin @@ -123,7 +125,7 @@ module FunctionName(reset, clk, ProgramAddrMapFile, ProgramLabelMapFile); // read line by line to count lines if (ProgramAddrMapFP) begin while (! $feof(ProgramAddrMapFP)) begin - $fscanf(ProgramAddrMapFP, "%h\n", ProgramAddrMapLine); + status = $fscanf(ProgramAddrMapFP, "%h\n", ProgramAddrMapLine); ProgramAddrMapLineCount = ProgramAddrMapLineCount + 1; end @@ -141,7 +143,7 @@ module FunctionName(reset, clk, ProgramAddrMapFile, ProgramLabelMapFile); if (ProgramLabelMapFP) begin while (! $feof(ProgramLabelMapFP)) begin - $fscanf(ProgramLabelMapFP, "%s\n", ProgramLabelMapLine); + status = $fscanf(ProgramLabelMapFP, "%s\n", ProgramLabelMapLine); ProgramLabelMapMemory[ProgramLabelMapLineCount] = ProgramLabelMapLine; ProgramLabelMapLineCount = ProgramLabelMapLineCount + 1; end