make clash work again (modulo sed hack)

.gitignore

@@ -8,3 +8,6 @@ test/build/
 # no need to put under version control because stack.yaml already hardcodes all versions precisely
 stack.yaml.lock
 gnu-mcu-eclipse
+*.dyn_o
+*.dyn_hi
+src/verilog/

.travis.yml

@@ -11,12 +11,13 @@ before_install:
   - export LD_LIBRARY_PATH=$(pwd)/softfloat-hs/lib
   - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
   - travis_retry curl -L https://github.com/gnu-mcu-eclipse/riscv-none-gcc/releases/download/v7.2.0-2-20180110/gnu-mcu-eclipse-riscv-none-gcc-7.2.0-2-20180111-2230-centos64.tgz | tar xz --strip-components=3 -C ~/riscv-gcc gnu-mcu-eclipse/riscv-none-gcc/7.2.0-2-20180111-2230
+  - sudo apt-get install snapd
+  - sudo snap install clash
 
 install:
   - ./install.sh
-#  - ./install-clash.sh
 
 script:
   - make
   - stack --no-terminal --skip-ghc-check exec riscv-semantics-tests
-#  - ./make-circuit.sh
+  - ./make-circuit.sh

make-circuit.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 cd src
-stack exec -- clash --verilog Platform/Clash.hs
-
-
+sed Spec/Decode.hs -i -e 's/.*if supports. iset then result. else.*/-- REDACTED to make clash work/g' \
+                      -e 's/.*if bitwidth iset == 64.*/-- REDACTED to make clash work/g'
+clash --verilog Platform/Clash.hs

src/Spec/CSRSpec.hs

@@ -5,6 +5,7 @@ import Spec.CSR
 import Spec.Machine
 import Utility.Utility
 import Control.Monad
+import Prelude
 
 getCSR :: forall p t . (RiscvMachine p t) => CSR -> p t
 getCSR c = do