Removed int/integer from parameters)

pipelined/src/ebu/ahbcacheinterface.sv

@@ -30,10 +30,10 @@
 `include "wally-config.vh"
 
 module ahbcacheinterface #(
-  parameter integer BEATSPERLINE,  // Number of AHBW words (beats) in cacheline
+  parameter BEATSPERLINE,  // Number of AHBW words (beats) in cacheline
-  parameter integer AHBWLOGBWPL,   // Log2 of ^
+  parameter AHBWLOGBWPL,   // Log2 of ^
-  parameter integer LINELEN,       // Number of bits in cacheline
+  parameter LINELEN,       // Number of bits in cacheline
-  parameter integer LLENPOVERAHBW  // Number of AHB beats in a LLEN word. AHBW cannot be larger than LLEN. (implementation limitation)
+  parameter LLENPOVERAHBW  // Number of AHB beats in a LLEN word. AHBW cannot be larger than LLEN. (implementation limitation)
 )(
   input  logic                 HCLK, HRESETn,
   // bus interface controls

pipelined/src/ebu/buscachefsm.sv

@@ -32,8 +32,8 @@
 
 // HCLK and clk must be the same clock!
 module buscachefsm #(
-  parameter integer BeatCountThreshold,              // Largest beat index
+  parameter BeatCountThreshold,                      // Largest beat index
-  parameter integer AHBWLOGBWPL                      // Log2 of BEATSPERLINE
+  parameter AHBWLOGBWPL                              // Log2 of BEATSPERLINE
 )(
   input  logic              HCLK,
   input  logic              HRESETn,

pipelined/src/ifu/bpred/RAsPredictor.sv

@@ -28,10 +28,8 @@
 
 `include "wally-config.vh"
 
-module RASPredictor
+module RASPredictor #(parameter StackSize = 16) (
-  #(parameter int StackSize = 16
+  input  logic             clk,
-    )
-  (input logic              clk,
   input  logic 				     reset,
   input  logic 				     PopF,
   output logic [`XLEN-1:0] RASPCF,

pipelined/src/ifu/bpred/btb.sv

@@ -30,10 +30,8 @@
 
 `include "wally-config.vh"
 
-module btb
+module btb #(parameter Depth = 10) (
-  #(parameter int Depth = 10
+  input  logic             clk,
-    )
-  (input  logic             clk,
   input  logic             reset,
   input  logic             StallF, StallE,
   input  logic [`XLEN-1:0] PCNextF,

pipelined/src/ifu/bpred/foldedgshare.sv

@@ -28,11 +28,8 @@
 
 `include "wally-config.vh"
 
-module foldedgshare
+module foldedgshare #(parameter k = 16, depth = 10) (
-  #(parameter int k = 16,
+  input logic             clk,
-	parameter int depth = 10
-    )
-  (input logic             clk,
   input logic             reset,
   input logic             StallF, StallD, StallE, StallM, StallW, 
   input logic             FlushD, FlushE, FlushM, FlushW,

pipelined/src/ifu/bpred/globalhistory.sv

@@ -28,10 +28,8 @@
 
 `include "wally-config.vh"
 
-module globalhistory
+module globalhistory #(parameter k = 10) (
-  #(parameter int k = 10
+  input logic             clk,
-    )
-  (input logic             clk,
   input logic             reset,
   input logic             StallF, StallD, StallE, StallM,
   input logic             FlushD, FlushE, FlushM,

pipelined/src/ifu/bpred/gshare.sv

@@ -28,10 +28,8 @@
 
 `include "wally-config.vh"
 
-module gshare
+module gshare #(parameter k = 10) (
-  #(parameter int k = 10
+  input logic             clk,
-    )
-  (input logic             clk,
   input logic             reset,
   input logic             StallF, StallD, StallE, StallM, 
   input logic             FlushD, FlushE, FlushM,

pipelined/src/ifu/bpred/localHistoryPredictor.sv

@@ -28,11 +28,9 @@
 
 `include "wally-config.vh"
 
-module localHistoryPredictor
+module localHistoryPredictor #(parameter m = 6,    // 2^m = number of local history branches
-  #(  parameter int m = 6, // 2^m = number of local history branches
+                                         k = 10) ( // number of past branches stored
-      parameter int k = 10 // number of past branches stored
+  input  logic             clk,
-      )
-  (input logic             clk,
   input  logic             reset,
   input  logic             StallF,  StallE,
   input  logic [`XLEN-1:0] LookUpPC,
@@ -41,7 +39,6 @@ module localHistoryPredictor
   input logic [`XLEN-1:0]  UpdatePC,
   input logic              UpdateEN, PCSrcE, 
   input logic [1:0]        UpdatePrediction
-  
 );
 
   logic [2**m-1:0][k-1:0]  LHRNextF;

pipelined/src/ifu/bpred/optgshare.sv

@@ -28,10 +28,8 @@
 
 `include "wally-config.vh"
 
-module optgshare
+module optgshare #(parameter k = 10) (
-  #(parameter int k = 10
+  input  logic             clk,
-    )
-  (input logic             clk,
   input  logic             reset,
   input  logic             StallF, StallD, StallE, StallM, StallW, 
   input  logic             FlushD, FlushE, FlushM, FlushW,

pipelined/src/ifu/bpred/speculativeglobalhistory.sv

@@ -28,10 +28,8 @@
 
 `include "wally-config.vh"
 
-module speculativeglobalhistory
+module speculativeglobalhistory #(parameter k = 10) (
-  #(parameter int k = 10
+  input logic             clk,
-    )
-  (input logic             clk,
   input logic             reset,
   input logic             StallF, StallD, StallE, StallM, StallW, 
   input logic             FlushD, FlushE, FlushM, FlushW,

pipelined/src/ifu/bpred/speculativegshare.sv

@@ -28,10 +28,8 @@
 
 `include "wally-config.vh"
 
-module speculativegshare
+module speculativegshare #(parameter k = 10) (
-  #(parameter int k = 10
+  input  logic             clk,
-    )
-  (input logic             clk,
   input  logic             reset,
   input  logic             StallF, StallD, StallE, StallM, StallW, 
   input  logic             FlushD, FlushE, FlushM, FlushW,

pipelined/src/ifu/bpred/twoBitPredictor.sv

@@ -28,10 +28,8 @@
 
 `include "wally-config.vh"
 
-module twoBitPredictor
+module twoBitPredictor #(parameter k = 10) (
-  #(parameter int k = 10
+  input  logic             clk,
-    )
-  (input logic             clk,
   input  logic             reset,
   input  logic             StallF, StallD, StallE, StallM,
   input  logic             FlushD, FlushE, FlushM,