From bfba32dfd989972c06cf392c2f5972cb1281d49e Mon Sep 17 00:00:00 2001
From: Kevin Kim <kevindkim723@gmail.com>
Date: Sat, 26 Aug 2023 20:20:20 -0700
Subject: [PATCH] synthesis works

---
 config/shared/parameter-defs.vh           | 2 +-
 {src/wrappers => fpga/src}/drsuwrapper.sv | 0
 src/wrappers/wallypipelinedcorewrapper.sv | 4 ++--
 synthDC/scripts/synth.tcl                 | 9 ++++-----
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename {src/wrappers => fpga/src}/drsuwrapper.sv (100%)

diff --git a/config/shared/parameter-defs.vh b/config/shared/parameter-defs.vh
index 6e01aabb4..9ce59950e 100644
--- a/config/shared/parameter-defs.vh
+++ b/config/shared/parameter-defs.vh
@@ -3,7 +3,7 @@
 
 `include "BranchPredictorType.vh"
 
-parameter cvw_t P = '{ 
+localparam cvw_t P = '{ 
   FPGA :                 FPGA,  
   XLEN :                 XLEN,  
   IEEE754 :              IEEE754, 
diff --git a/src/wrappers/drsuwrapper.sv b/fpga/src/drsuwrapper.sv
similarity index 100%
rename from src/wrappers/drsuwrapper.sv
rename to fpga/src/drsuwrapper.sv
diff --git a/src/wrappers/wallypipelinedcorewrapper.sv b/src/wrappers/wallypipelinedcorewrapper.sv
index 1d8f4f774..09309bf0e 100644
--- a/src/wrappers/wallypipelinedcorewrapper.sv
+++ b/src/wrappers/wallypipelinedcorewrapper.sv
@@ -37,10 +37,10 @@ module wallypipelinedcorewrapper (
    input  logic                  MTimerInt, MExtInt, SExtInt, MSwInt,
    input  logic [63:0]           MTIME_CLINT, 
    // Bus Interface
-   input  logic [32-1:0]     HRDATA,
+   input  logic [P.XLEN-1:0]     HRDATA,
    input  logic                  HREADY, HRESP,
    output logic                  HCLK, HRESETn,
-   output logic [34-1:0]  HADDR,
+   output logic [P.PA_BITS-1:0]  HADDR,
    output logic [32-1:0]     HWDATA,
    output logic [32/8-1:0]   HWSTRB,
    output logic                  HWRITE,
diff --git a/synthDC/scripts/synth.tcl b/synthDC/scripts/synth.tcl
index 8bb5140fa..a5b435c13 100755
--- a/synthDC/scripts/synth.tcl
+++ b/synthDC/scripts/synth.tcl
@@ -25,20 +25,19 @@ set maxopt $::env(MAXOPT)
 set drive $::env(DRIVE)
 
 eval file copy -force [glob ${cfg}/*.vh] {$outputDir/config/}
+eval file copy -force [glob ${cfg}/*.vh] {$outputDir/hdl/}
 eval file copy -force [glob ${hdl_src}/cvw.sv] {$outputDir/hdl/}
-eval file copy -force [glob ${hdl_src}/../fpga/src/wallypipelinedsocwrapper.sv] {$outputDir/hdl/}
+#eval file copy -force [glob ${hdl_src}/../fpga/src/wallypipelinedsocwrapper.sv] {$outputDir/hdl/}
 eval file copy -force [glob ${hdl_src}/*/*.sv] {$outputDir/hdl/}
 eval file copy -force [glob ${hdl_src}/*/*/*.sv] {$outputDir/hdl/}
 
-# Only for FMA class project; comment out when done
-# eval file copy -force [glob ${hdl_src}/fma/fma16.v] {hdl/}
-
 # Enables name mapping
 if { $saifpower == 1 } {
     saif_map -start
 }
 
 # Verilog files
+#set my_verilog_files [glob $outputDir/hdl/cvw.sv $outputDir/hdl/*.sv $outputDir/config/*.vh]
 set my_verilog_files [glob $outputDir/hdl/cvw.sv $outputDir/hdl/*.sv]
 
 # Set toplevel
@@ -75,7 +74,7 @@ if { [shell_is_in_topographical_mode] } {
 #set alib_library_analysis_path ./$outputDir
 define_design_lib WORK -path ./$outputDir/WORK
 analyze -f sverilog -lib WORK $my_verilog_files
-elaborate $my_toplevel -parameter P -lib WORK 
+elaborate $my_toplevel -lib WORK 
 
 # Set the current_design 
 current_design $my_toplevel