Bump stack resolver and packet versions. Add unix and async.

New version of softfloat bumped too.
mit-plv · Feb 11, 2019 · ada8580 · ada8580
1 parent 2c20b72
commit ada8580
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/riscv-semantics.cabal b/riscv-semantics.cabal
@@ -17,10 +17,11 @@ cabal-version:       >=1.10
 
 executable riscv-semantics
   main-is:             Platform/MainRun.hs
-  ghc-options:         -threaded -O2
-  other-modules:       Platform.Run, Platform.Run32, Spec.CSR, Spec.CSRField, Spec.CSRFile, Spec.CSRSpec, Spec.Decode, Utility.Elf, Spec.Execute, Spec.ExecuteCSR, Spec.ExecuteI, Spec.ExecuteI64, Spec.ExecuteM, Spec.ExecuteM64, Platform.Minimal64, Platform.Minimal32, Spec.ExecuteA, Spec.ExecuteA64, Spec.ExecuteF, Spec.ExecuteF64, Platform.MMIO, Utility.MapMemory, Spec.Memory, Spec.Machine, Utility.Utility, Spec.VirtualMemory, Spec.Spec, Platform.TLBExperiment, Platform.BufferMMIO
+  ghc-options:         -fspecialise-aggressively -funfolding-use-threshold=24 -funfolding-creation-threshold=100 -fstatic-argument-transformation -O2 -optc-O3 -threaded 
+  other-modules:       Platform.Run, Platform.Run32, Spec.CSR, Spec.CSRField,  Spec.CSRSpec, Spec.Decode, Utility.Elf, Spec.Execute, Spec.ExecuteCSR, Spec.ExecuteI, Spec.ExecuteI64, Spec.ExecuteM, Spec.ExecuteM64, Platform.Minimal64, Platform.Minimal32, Spec.ExecuteA, Spec.ExecuteA64, Spec.ExecuteF, Spec.ExecuteF64, Platform.MMIO, Utility.MapMemory, Spec.Memory, Spec.Machine, Utility.Utility, Spec.VirtualMemory, Spec.Spec, Platform.TLBExperiment, Platform.BufferMMIO, Platform.CleanTest, Platform.RunFast, Spec.CSRFileIO, Spec.CSRFile, Platform.Pty
+
   other-extensions:    MultiParamTypeClasses, FlexibleInstances, MultiWayIf, FunctionalDependencies, ScopedTypeVariables, NamedFieldPuns
-  build-depends:       base >=4.9 && <4.11, mtl >=2.2 && <2.3, transformers >=0.5 && <0.6, containers >=0.5 && <0.6, bytestring >=0.10 && <0.11, text >=1.2 && <1.3, elf >=0.28, nondeterminism >=1.4, ilist >=0.3, softfloat-hs ==0.1.0, array >=0.5.2
+  build-depends:       base >=4.9 && <4.13, mtl >=2.2 && <2.3, transformers >=0.5 && <0.6, containers >=0.5 && <0.7, bytestring >=0.10 && <0.11, text >=1.2 && <1.3, elf >=0.28, nondeterminism >=1.4, ilist >=0.3, softfloat-hs ==0.1.0, array >=0.5.2, unix >=2.7, async >=2.2
   hs-source-dirs:      src
   default-language:    Haskell2010
 
@@ -29,7 +30,7 @@ executable riscv-semantics-rv32im-compliance
   ghc-options:         -threaded
   other-modules:       Platform.Run, Platform.Run32, Spec.CSR, Spec.CSRField, Spec.CSRFile, Spec.CSRSpec, Spec.Decode, Utility.Elf, Spec.Execute, Spec.ExecuteCSR, Spec.ExecuteI, Spec.ExecuteI64, Spec.ExecuteM, Spec.ExecuteM64, Platform.Minimal64, Platform.Minimal32, Spec.ExecuteA, Spec.ExecuteA64, Spec.ExecuteF, Spec.ExecuteF64, Platform.MMIO, Utility.MapMemory, Spec.Memory, Spec.Machine, Utility.Utility, Spec.VirtualMemory, Spec.Spec, Platform.TLBExperiment, Platform.BufferMMIO
   other-extensions:    MultiParamTypeClasses, FlexibleInstances, MultiWayIf, FunctionalDependencies, ScopedTypeVariables, NamedFieldPuns
-  build-depends:       base >=4.9 && <4.11, mtl >=2.2 && <2.3, transformers >=0.5 && <0.6, containers >=0.5 && <0.6, bytestring >=0.10 && <0.11, text >=1.2 && <1.3, elf >=0.28, nondeterminism >=1.4, ilist >=0.3, softfloat-hs ==0.1.0, array >=0.5.2
+  build-depends:       base >=4.9 && <4.13, mtl >=2.2 && <2.3, transformers >=0.5 && <0.6, containers >=0.5 && <0.7, bytestring >=0.10 && <0.11, text >=1.2 && <1.3, elf >=0.28, nondeterminism >=1.4, ilist >=0.3, softfloat-hs ==0.1.0, array >=0.5.2
 
   hs-source-dirs:      src
   default-language:    Haskell2010
@@ -41,7 +42,7 @@ executable riscv-semantics-tests
   ghc-options:         -threaded
   other-modules:       Platform.Run, Platform.Test, Platform.BufferMMIO, Spec.CSR, Spec.CSRField, Spec.CSRFile, Spec.CSRSpec, Spec.Decode, Utility.Elf, Spec.Execute, Spec.ExecuteCSR, Spec.ExecuteI, Spec.ExecuteI64, Spec.ExecuteM, Spec.ExecuteM64, Spec.ExecuteA, Spec.ExecuteA64, Spec.ExecuteF, Spec.ExecuteF64, Platform.Minimal64, Platform.MMIO, Utility.MapMemory, Spec.Memory, Spec.Machine, Utility.Utility, Spec.VirtualMemory, Spec.Spec, Platform.TLBExperiment
   other-extensions:    MultiParamTypeClasses, FlexibleInstances, MultiWayIf, FunctionalDependencies, ScopedTypeVariables, NamedFieldPuns
-  build-depends:       base >=4.9 && <4.11, mtl >=2.2 && <2.3, transformers >=0.5 && <0.6, containers >=0.5 && <0.6, bytestring >=0.10 && <0.11, text >=1.2 && <1.3, elf >=0.28, directory >=1.3 && <1.4, filepath >=1.4 && <1.5, nondeterminism >=1.4, ilist >=0.3, softfloat-hs ==0.1.0, array >=0.5.2
+  build-depends:       base >=4.9 && <4.13, mtl >=2.2 && <2.3, transformers >=0.5 && <0.6, containers >=0.5 && <0.7, bytestring >=0.10 && <0.11, text >=1.2 && <1.3, elf >=0.28, directory >=1.3 && <1.4, filepath >=1.4 && <1.5, nondeterminism >=1.4, ilist >=0.3, softfloat-hs ==0.1.0, array >=0.5.2
 
   hs-source-dirs:      src
   default-language:    Haskell2010
diff --git a/softfloat-hs b/softfloat-hs
diff --git a/stack.yaml b/stack.yaml
@@ -15,7 +15,8 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: nightly-2017-10-26
+# resolver: nightly-2017-10-26
+resolver: lts-13.6
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -57,6 +58,8 @@ extra-deps:
 - ilist-0.3.1.0
 - nondeterminism-1.4
 - array-0.5.2.0
+- async-2.2.1
+- unix-2.7.2.2
 # Override default flag values for local packages and extra-deps
 flags: {}
+2 −0		.gitignore
+14 −12		Makefile
+13 −3		README.md
+23 −23		softfloat-hs.cabal