From ee80bff3dbd9ffd38a91404a031edb0b43c669cb Mon Sep 17 00:00:00 2001
From: Donald Sebastian Leung
Date: Mon, 24 Aug 2020 10:20:30 +0800
Subject: [PATCH] Merge riscv_formal_parameters.py into verify.py
---
rvfi/cores/minerva/verify.py | 5 ++++-
rvfi/riscv_formal_parameters.py | 4 ----
2 files changed, 4 insertions(+), 5 deletions(-)
delete mode 100644 rvfi/riscv_formal_parameters.py
diff --git a/rvfi/cores/minerva/verify.py b/rvfi/cores/minerva/verify.py
index 2b1b8dc..bf07d8d 100644
--- a/rvfi/cores/minerva/verify.py
+++ b/rvfi/cores/minerva/verify.py
@@ -8,7 +8,10 @@ from ...checks.liveness_check import *
from ...checks.unique_check import *
from minerva.core import *
from ...insns.isa_rv32i import *
-from ...riscv_formal_parameters import *
+from collections import namedtuple
+
+RISCVFormalParameters = namedtuple('RISCVFormalParameters',
+ ['ilen', 'xlen', 'csr_misa', 'compressed', 'aligned_mem'])
class InsnSpec(Elaboratable):
def __init__(self, insn_model):
diff --git a/rvfi/riscv_formal_parameters.py b/rvfi/riscv_formal_parameters.py
deleted file mode 100644
index 458469c..0000000
--- a/rvfi/riscv_formal_parameters.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from collections import namedtuple
-
-RISCVFormalParameters = namedtuple('RISCVFormalParameters',
- ['ilen', 'xlen', 'csr_misa', 'compressed', 'aligned_mem'])