summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2013-03-31 11:51:12 +0200
committerClifford Wolf <clifford@clifford.at>2013-03-31 11:51:12 +0200
commitf1a2fd966f62df072d2c43573fb71a1369857523 (patch)
treea86a810fe0b12f862b3d4b721f5a3e198bd8247b /tests
parent161565be104fd0c7b7c4224bd23e9502625e041a (diff)
Now only use value from "initial" when no matching "always" block is found
Diffstat (limited to 'tests')
-rw-r--r--tests/k68_vltor/changes.diff13
-rw-r--r--tests/k68_vltor/run.sh2
2 files changed, 1 insertions, 14 deletions
diff --git a/tests/k68_vltor/changes.diff b/tests/k68_vltor/changes.diff
index 80d5da9d..7b903403 100644
--- a/tests/k68_vltor/changes.diff
+++ b/tests/k68_vltor/changes.diff
@@ -10,16 +10,3 @@ index 47a50c4..de27fbb 100755
}
cout<<"Final sum = "<<hex<<top->sum<<"\n";
-diff --git a/rtl/k68_clkgen.v b/rtl/k68_clkgen.v
-index c201a97..55b9cad 100755
---- a/rtl/k68_clkgen.v
-+++ b/rtl/k68_clkgen.v
-@@ -57,7 +57,7 @@ module k68_clkgen (/*AUTOARG*/
- assign clk4_o = cnt[1];
- assign clk_o = ~clk_i;
-
-- initial cnt = 0; // Power up state doesn't matter, but can't be X
-+ // initial cnt = 0; // Power up state doesn't matter, but can't be X
-
- always @(posedge clk_i) begin
- cnt <= cnt + 1'b1;
diff --git a/tests/k68_vltor/run.sh b/tests/k68_vltor/run.sh
index de831d38..97ccf238 100644
--- a/tests/k68_vltor/run.sh
+++ b/tests/k68_vltor/run.sh
@@ -7,7 +7,7 @@ if (
cd rtl
mkdir -p ../synth
- yosys -o ../synth/k68_soc.v -p 'hierarchy -check -top k68_soc; proc; opt; memory; opt' \
+ ../../../../yosys -o ../synth/k68_soc.v -p 'hierarchy -check -top k68_soc; proc; opt; memory; opt' \
k68_soc.v k68_arb.v k68_cpu.v k68_load.v k68_clkgen.v k68_decode.v k68_execute.v \
k68_fetch.v k68_regbank.v k68_buni.v k68_b2d.v k68_ccc.v k68_d2b.v k68_rox.v \
k68_calc.v k68_dpmem.v k68_sasc.v sasc_brg.v sasc_top.v sasc_fifo4.v