fix E_SUPPORTED inversion bug

This commit is contained in:
Matthew 2024-06-04 19:08:17 -05:00
parent be0199fb3c
commit dc065429fc
6 changed files with 83 additions and 83 deletions

View File

@ -47,7 +47,7 @@ module dm import cvw::*; #(parameter cvw_t P) (
output logic GPRSel,
output logic DebugCapture,
output logic DebugGPRUpdate,
output logic [P.E_SUPPORTED+3:0] GPRAddr,
output logic [4:0] GPRAddr,
output logic GPRScanEn,
input logic GPRScanIn,
output logic GPRScanOut

View File

@ -33,7 +33,7 @@ module rad import cvw::*; #(parameter cvw_t P) (
output logic [9:0] ShiftCount,
output logic InvalidRegNo,
output logic RegReadOnly,
output logic [P.E_SUPPORTED+3:0] GPRAddr,
output logic [4:0] GPRAddr,
output logic [P.XLEN-1:0] ARMask
);
`include "debug.vh"
@ -68,9 +68,9 @@ module rad import cvw::*; #(parameter cvw_t P) (
assign ScanChainLen = GPRRegNo ? GPRCHAINLEN : SCANCHAINLEN;
if (P.E_SUPPORTED)
assign GPRAddr = Regno[4:0];
else
assign GPRAddr = Regno[3:0];
else
assign GPRAddr = Regno[4:0];
// Register decoder
always_comb begin
@ -84,7 +84,7 @@ module rad import cvw::*; #(parameter cvw_t P) (
end
16'h101? : begin
ShiftCount = P.XLEN - 1;
InvalidRegNo = ~P.E_SUPPORTED;
InvalidRegNo = P.E_SUPPORTED;
GPRRegNo = 1;
end
`MISA_REGNO : begin

View File

@ -81,7 +81,7 @@ module datapath import cvw::*; #(parameter cvw_t P) (
input logic GPRSel,
input logic DebugCapture,
input logic DebugGPRUpdate,
input logic [P.E_SUPPORTED+3:0] GPRAddr,
input logic [4:0] GPRAddr,
input logic GPRScanEn,
input logic GPRScanIn,
output logic GPRScanOut

View File

@ -87,7 +87,7 @@ module ieu import cvw::*; #(parameter cvw_t P) (
input logic GPRSel,
input logic DebugCapture,
input logic DebugGPRUpdate,
input logic [P.E_SUPPORTED+3:0] GPRAddr,
input logic [4:0] GPRAddr,
input logic GPRScanEn,
input logic GPRScanIn,
output logic GPRScanOut

View File

@ -53,7 +53,7 @@ module wallypipelinedcore import cvw::*; #(parameter cvw_t P) (
input logic GPRSel,
input logic DebugCapture,
input logic DebugGPRUpdate,
input logic [P.E_SUPPORTED+3:0] GPRAddr,
input logic [4:0] GPRAddr,
input logic GPRScanEn,
input logic GPRScanIn,
output logic GPRScanOut

View File

@ -82,7 +82,7 @@ module wallypipelinedsoc import cvw::*; #(parameter cvw_t P) (
logic GPRSel;
logic DebugCapture;
logic DebugGPRUpdate;
logic [P.E_SUPPORTED+3:0] GPRAddr;
logic [4:0] GPRAddr;
logic GPRScanEn;
logic GPRScanIn;
logic GPRScanOut;