Skip to content

/ riscv-formal

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some syntax errors #45

Open
wants to merge 3 commits into
base: master
from
+29 −29
Open

Fix some syntax errors #45

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96ddaa0
Switch "const" and "rand" modifier order
leonschoorl Jan 26, 2021
0a29531
Rename macro rvformal_const_rand_reg to rvformal_rand_const_reg
leonschoorl Jan 26, 2021
e0fd8ce
Fix syntax errors in rvfi_csrw_check.sv
leonschoorl Jan 26, 2021
File filter...
Filter file types
Clear filters
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

Fix syntax errors in rvfi_csrw_check.sv 

	`csrget(`RISCV_FORMAL_CSRW_NAME, rmask)
Got expanded into:
	rvfi.csr_mcycle_ rmask

Because of the extra space, this resulted in:
	[csrw_mcycle_ch0] base: rvfi_csrw_check.sv:56:
		ERROR: syntax error, unexpected TOK_ID
  • Loading branch information
@leonschoorl
leonschoorl committed Jan 26, 2021
commit e0fd8ce5e9e33d26903671c8fb9e46766c4e85d4
16 checks/rvfi_csrw_check.sv
View file
Open in desktop
@@ -53,10 +53,10 @@ module rvfi_csrw_check (
`endif
);

wire [63:0] csr_insn_rmask_full = `csrget(`RISCV_FORMAL_CSRW_NAME, rmask);
wire [63:0] csr_insn_wmask_full = `csrget(`RISCV_FORMAL_CSRW_NAME, wmask);
wire [63:0] csr_insn_rdata_full = `csrget(`RISCV_FORMAL_CSRW_NAME, rdata);
wire [63:0] csr_insn_wdata_full = `csrget(`RISCV_FORMAL_CSRW_NAME, wdata);
wire [63:0] csr_insn_rmask_full = `csrget(`RISCV_FORMAL_CSRW_NAME,rmask);
wire [63:0] csr_insn_wmask_full = `csrget(`RISCV_FORMAL_CSRW_NAME,wmask);
wire [63:0] csr_insn_rdata_full = `csrget(`RISCV_FORMAL_CSRW_NAME,rdata);
wire [63:0] csr_insn_wdata_full = `csrget(`RISCV_FORMAL_CSRW_NAME,wdata);

wire [63:0] csr_insn_changed_full = csr_insn_wmask_full & (~csr_insn_rmask_full | (csr_insn_rmask_full & (csr_insn_rdata_full ^ csr_insn_wdata_full)));

@@ -65,10 +65,10 @@ module rvfi_csrw_check (
wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_rdata = (csr_hi ? csr_insn_rdata_full >> 32 : csr_insn_rdata_full) & (rvfi.ixl == 1 ? 'h FFFF_FFFF : -1);
wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_wdata = (csr_hi ? csr_insn_wdata_full >> 32 : csr_insn_wdata_full) & (rvfi.ixl == 1 ? 'h FFFF_FFFF : -1);
`else
wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_rmask = `csrget(`RISCV_FORMAL_CSRW_NAME, rmask);
wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_wmask = `csrget(`RISCV_FORMAL_CSRW_NAME, wmask);
wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_rdata = `csrget(`RISCV_FORMAL_CSRW_NAME, rdata);
wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_wdata = `csrget(`RISCV_FORMAL_CSRW_NAME, wdata);
wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_rmask = `csrget(`RISCV_FORMAL_CSRW_NAME,rmask);
wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_wmask = `csrget(`RISCV_FORMAL_CSRW_NAME,wmask);
wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_rdata = `csrget(`RISCV_FORMAL_CSRW_NAME,rdata);
wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_wdata = `csrget(`RISCV_FORMAL_CSRW_NAME,wdata);
`endif

wire [`RISCV_FORMAL_XLEN-1:0] csr_insn_smask =
ProTip! Use n and p to navigate between commits in a pull request.