Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts in ahb-waves that snuck through manual merging

Browse Source
This commit is contained in:
Jarred Allen 2021-03-20 17:16:50 -04:00
parent c8028710a5
commit b63bfc7afa
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wally-pipelined/regression/wave-dos/ahb-waves.do
View File

@ -63,12 +63,9 @@ add wave -hex /testbench/dut/hart/ebu/CaptureDataM
add wave -hex /testbench/dut/hart/ebu/InstrStall add wave -hex /testbench/dut/hart/ebu/InstrStall
add wave -divider add wave -divider
<<<<<<< HEAD
add wave -hex /testbench/dut/uncore/dtim/* add wave -hex /testbench/dut/uncore/dtim/*
add wave -divider add wave -divider
=======
>>>>>>> origin/main
add wave -hex /testbench/dut/hart/ifu/PCW add wave -hex /testbench/dut/hart/ifu/PCW
add wave -hex /testbench/dut/hart/ifu/InstrW add wave -hex /testbench/dut/hart/ifu/InstrW
add wave /testbench/InstrWName add wave /testbench/InstrWName
@ -78,11 +75,7 @@ add wave -hex /testbench/dut/hart/ieu/dp/ResultW
add wave -hex /testbench/dut/hart/ieu/dp/RdW add wave -hex /testbench/dut/hart/ieu/dp/RdW
add wave -divider add wave -divider
<<<<<<< HEAD
add wave -hex -r /testbench/*
=======
add wave -hex /testbench/dut/uncore/dtim/* add wave -hex /testbench/dut/uncore/dtim/*
add wave -divider add wave -divider
add wave -hex -r /testbench/* add wave -hex -r /testbench/*
>>>>>>> origin/main