Fix some whitespace issues, and avoid redefinition of RVOPC macros

This commit is contained in:
Luke Wren 2022-08-21 13:09:28 +01:00
parent b994674c5a
commit 4c098d76a7
2 changed files with 81 additions and 76 deletions

View File

@ -15,6 +15,9 @@ localparam RV_RD_BITS = 5;
// for whether Z values are propagated through a localparam to a casez. // for whether Z values are propagated through a localparam to a casez.
// Multiple tools complain about it, so just this once I'll use macros. // Multiple tools complain about it, so just this once I'll use macros.
`ifndef HAZARD3_RVOPC_MACROS
`define HAZARD3_RVOPC_MACROS
// Base ISA (some of these are Z now) // Base ISA (some of these are Z now)
`define RVOPC_BEQ 32'b?????????????????000?????1100011 `define RVOPC_BEQ 32'b?????????????????000?????1100011
`define RVOPC_BNE 32'b?????????????????001?????1100011 `define RVOPC_BNE 32'b?????????????????001?????1100011
@ -228,3 +231,5 @@ localparam RV_RD_BITS = 5;
`define RVOPC_NOZ_CSRRSI 32'b00000000000000000110000001110011 `define RVOPC_NOZ_CSRRSI 32'b00000000000000000110000001110011
`define RVOPC_NOZ_CSRRCI 32'b00000000000000000111000001110011 `define RVOPC_NOZ_CSRRCI 32'b00000000000000000111000001110011
`define RVOPC_NOZ_SYSTEM 32'b00000000000000000000000001110011 `define RVOPC_NOZ_SYSTEM 32'b00000000000000000000000001110011
`endif