Update for GHC-9.6.6, update 64-bit primops

This fixes the build for GHC-9.6.6 and above.

- [x] Imports Control.Monad (mtl modules no longer re-export this)
- [x] Update 64-bit primops (some functions in ghc-prim have changed for 64-bit primops)
- [x] Adds conditional cabal flag for compiling ext-stg-gc externally

Author: dmjio

.gitignore

@@ -1 +1,4 @@
 **/.stack-work/
+TAGS
+dist-newstyle
+*~

external-stg-compiler/lib/Stg/GHC/ToStg.hs

@@ -37,6 +37,7 @@ import GHC.Core.TyCon
 import GHC.Core.DataCon
 import GHC.Core.Type
 
+import Control.Monad
 import Control.Monad.State
 import Data.List (partition)
 

external-stg-interpreter/.ghci

@@ -0,0 +1 @@
+:set -ilib

external-stg-interpreter/external-stg-interpreter.cabal

@@ -11,6 +11,15 @@ copyright:           (c) 2020 Csaba Hruska
 category:            Development
 build-type:          Simple
 
+flag external-ext-stg-gc
+  manual:
+    True
+  default:
+    False
+  description:
+    If enabled, the ext-stg-gc binary is provided externally and available in $PATH
+    Disbled by default
+
 library
   exposed-modules:
     Foreign.LibFFI.Closure
@@ -101,17 +110,16 @@ library
                        external-stg
   default-language:    Haskell2010
 
-  include-dirs:         datalog
-
-
-  cxx-sources:          datalog/ext-stg-gc.cpp
-  cxx-options:          -D__EMBEDDED_SOUFFLE__ -D_OPENMP -std=c++17
-  if os(darwin)
-    ld-options:           "-Wl,-all_load"
-    extra-libraries:      omp stdc++
-  else
-    ld-options:           "-Wl,-u,__factory_Sf_ext_stg_gc_instance"
-    extra-libraries:      gomp
+  if !flag(external-ext-stg-gc)
+    include-dirs:         datalog
+    cxx-sources:          datalog/ext-stg-gc.cpp
+    cxx-options:          -D__EMBEDDED_SOUFFLE__ -D_OPENMP -std=c++17
+    if os(darwin)
+      ld-options:           "-Wl,-all_load"
+      extra-libraries:      omp stdc++
+    else
+      ld-options:           "-Wl,-u,__factory_Sf_ext_stg_gc_instance"
+      extra-libraries:      gomp
 
 executable ext-stg-interpreter
   default-language:    Haskell2010

external-stg-interpreter/lib/Stg/Interpreter.hs

@@ -10,6 +10,7 @@ import Foreign.Ptr
 import Control.Concurrent
 import Control.Concurrent.MVar
 import qualified Control.Concurrent.Chan.Unagi.Bounded as Unagi
+import Control.Monad
 import Control.Monad.State.Strict
 import Control.Exception
 import qualified Data.Primitive.ByteArray as BA

external-stg-interpreter/lib/Stg/Interpreter/Base.hs

@@ -22,6 +22,7 @@ import qualified Data.ByteString.Lazy as BL
 import Data.Vector (Vector)
 import qualified Data.Primitive.ByteArray as BA
 import Control.Monad.Primitive
+import Control.Monad
 import System.Posix.DynamicLinker
 import Control.Concurrent.MVar
 import Control.Concurrent.Chan.Unagi.Bounded

external-stg-interpreter/lib/Stg/Interpreter/Debug.hs

@@ -15,6 +15,7 @@ import System.Directory
 import System.FilePath
 import Text.Printf
 
+import Control.Monad
 import Control.Monad.State.Strict
 
 import Stg.Syntax

external-stg-interpreter/lib/Stg/Interpreter/Debugger.hs

@@ -2,6 +2,7 @@
 module Stg.Interpreter.Debugger where
 
 import GHC.Stack
+import Control.Monad
 import Control.Monad.State
 import qualified Data.Set as Set
 import qualified Data.Map as Map

external-stg-interpreter/lib/Stg/Interpreter/Debugger/Internal.hs

@@ -3,6 +3,7 @@ module Stg.Interpreter.Debugger.Internal where
 
 import Text.Printf
 import qualified Text.Read as Text
+import Control.Monad
 import Control.Monad.State
 import qualified Data.List as List
 import qualified Data.Set as Set

external-stg-interpreter/lib/Stg/Interpreter/Debugger/Region.hs

@@ -2,6 +2,7 @@
 module Stg.Interpreter.Debugger.Region where
 
 import Text.Printf
+import Control.Monad
 import Control.Monad.State
 import Data.Maybe
 import qualified Data.List as List