Merge branch 'master' of https://github.com/PeterAaser/TDT4255_EX2

deliver.sh

@@ -13,14 +13,14 @@ cp build.sbt ./wrap
 cp project/Dependencies.scala ./wrap/project/Dependencies.scala
 cp project/build.properties ./wrap/project/build.properties
 cp sbt.sh ./wrap
-(cd ./wrap/; tar czfv $username.gz .)
+(cd ./wrap/; tar czfv $username.tar.gz .)
-mv ./wrap/$username.gz .
+mv ./wrap/$username.tar.gz .
 
 rm -rf ./wrap
 
 echo "Unwrapping and testing your wrapped package"
 mkdir wrapTest
-tar -C ./wrapTest -xvf $username.gz
+tar -C ./wrapTest -xvf $username.tar.gz
 ./wrapTest/sbt.sh test
 rm -rf ./wrapTest
 

src/test/scala/RISCV/testRunner.scala

@@ -49,7 +49,7 @@ object TestRunner {
                                            binary.toList.sortBy(_._1.value).map(_._2),
                                            program.settings,
                                            finalVM.pc,
-                                           1500)
+                                           15000)
     } yield {
       val traces = mergeTraces(trace, chiselTrace).map(x => printMergedTraces((x), program))