diff --git a/vendor/google_riscv-dv.lock.hjson b/vendor/google_riscv-dv.lock.hjson index d58f72fd..6bccab75 100644 --- a/vendor/google_riscv-dv.lock.hjson +++ b/vendor/google_riscv-dv.lock.hjson @@ -9,6 +9,6 @@ upstream: { url: https://github.com/google/riscv-dv - rev: cce71d24b56f641d994fbf69b8b50aa3756b9322 + rev: 44bec7695fd2399166e181fa84b66a608b5f745f } } diff --git a/vendor/google_riscv-dv/run.py b/vendor/google_riscv-dv/run.py index d8cd3b75..2902c0ab 100644 --- a/vendor/google_riscv-dv/run.py +++ b/vendor/google_riscv-dv/run.py @@ -93,7 +93,10 @@ def parse_iss_yaml(iss, iss_yaml, isa, setting_dir): logging.info("Found matching ISS: %s" % entry['iss']) cmd = entry['cmd'].rstrip() cmd = re.sub("\", get_env_var(entry['path_var']), cmd) - cmd = re.sub("\", isa, cmd) + if iss == "ovpsim": + cmd = re.sub("\", setting_dir, cmd) + else: + cmd = re.sub("\", isa, cmd) return cmd logging.error("Cannot find ISS %0s" % iss) sys.exit(1) diff --git a/vendor/google_riscv-dv/yaml/iss.yaml b/vendor/google_riscv-dv/yaml/iss.yaml index 30a882a9..5677ef01 100644 --- a/vendor/google_riscv-dv/yaml/iss.yaml +++ b/vendor/google_riscv-dv/yaml/iss.yaml @@ -21,7 +21,7 @@ path_var: OVPSIM_PATH cmd: > /riscvOVPsim.exe - --controlfile target//riscvOVPsim.ic + --controlfile /riscvOVPsim.ic --objfilenoentry --override riscvOVPsim/cpu/PMP_registers=0 --override riscvOVPsim/cpu/simulateexceptions=T