idk

src/Gyehoek/CPS/Lower.hs

@@ -4,6 +4,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE MultilineStrings #-}
 {-# LANGUAGE OverloadedLists #-}
+{-# LANGUAGE ApplicativeDo #-}
 {-# OPTIONS_GHC -Wno-incomplete-patterns #-}
 module Gyehoek.CPS.Lower
   (lower, lowerProgram) where
@@ -32,17 +33,17 @@ import Data.String.Interpolate
 import Gyehoek.Wasm qualified as Wasm
 import Gyehoek.Wasm hiding (Expr)
 import Language.Sexp.Located (pattern ParenList)
+import Debug.Pretty.Simple
+import Control.Monad.Fix
 
 
 data Env = MkEnv
   { runtime :: Runtime
   , vars :: Vector Name
+  , kvars :: Vector Name
   }
   deriving (Show, Generic)
 
-emptyEnv :: Env
-emptyEnv = MkEnv (error "fuck") mempty
-
 type instance Index Env = Natural
 type instance IxValue Env = Name
 
@@ -50,11 +51,14 @@ instance Ixed Env where
   ix i = #vars . ix (fromIntegral i)
 
 data Runtime = MkRuntime
-  { argArrayIdx :: Idx
+  { argArrayType :: Idx
+  , argArray :: Idx
   , contType :: Idx
   , contStackType :: Idx
-  , contStackIndexIdx :: Idx
+  , contStackTop :: Idx
-  , contStackIdx :: Idx
+  , contStack :: Idx
+  , result :: Idx
+  , halt :: Idx
   }
   deriving (Show, Generic)
 
@@ -64,11 +68,31 @@ data Runtime = MkRuntime
 -- of the stack into the SCM unitype.
 makeSmallFixnum :: Wasm.Expr
 makeSmallFixnum = mconcat
-  [ ins "i32.const" [sxp @Int 2]
+  [ ins "i32.const" [sxp @Int 1]
   , ins "i32.shl" []
   , ins "ref.i31" []
   ]
 
+-- | Given an expression @e@ leaving a @ref eq@ atop the stack,
+-- @pushArg rt n e@ sets the nth slot of the arg-passing array to the
+-- result of @e@.
+pushArg :: Runtime -> Int -> Wasm.Expr -> Wasm.Expr
+pushArg (MkRuntime {argArrayType,argArray}) n e = mconcat
+  [ ins "global.get" [sxp argArray]
+  , ins "i32.const" [sxp n]
+  , e
+  , ins "array.set" [sxp argArrayType]
+  ]
+
+-- | Pop the nth arg from the arg-passing array onto the stack.
+popArg :: Runtime -> Int -> Wasm.Expr
+popArg (MkRuntime {argArrayType,argArray}) n = mconcat
+  [ ins "global.get" [sxp argArray]
+  , ins "i32.const" [sxp n]
+  , ins "array.get" [sxp argArrayType]
+  , ins "ref.as_non_null" []
+  ]
+
 
 
 lowerVal :: Env -> Val -> Wasm.Expr
@@ -83,13 +107,16 @@ lowerVal g (ValLit l) =
       <> ins "ref.i31" []
     _ -> _
 
-lowerVal g (ValVar x) = ins "local.get" [sxp l]
+lowerVal g (ValVar x) = ins "local.get" [sxp (1+l)]
   where
     l = V.elemIndex x g.vars ^?! _Just
 
 lower' :: (GenMod :> es) => Env -> Exp -> Eff es Wasm.Expr
 
-lower' g (Halt [e]) = pure $ lowerVal g e
+lower' g (Halt [v]) = pure . mconcat $
+  [ pushArg g.runtime 0 (lowerVal g v)
+  , ins "return_call" [sxp @Int 1]
+  ]
 
 lower' g (ExpPrim p rs e) =
   case p of
@@ -104,23 +131,44 @@ lower' g (ExpIf c t f) = do
   pure $ lowerVal g c
     <> Wasm.if' (Wasm.result [i32]) t' f'
 
-lower' g (ExpLet [(r,MkLambda xs ktail m)] e) = do
+lower' g (ExpContinue k [x]) = pure . mconcat $
-  _ <- defun [i32] [] [] \_ -> do
+  [ pushArg rt 0 (lowerVal g x)
-    let stack = g.runtime.contStackIdx
+  , ins "i32.const" [sxp @Int 1] -- nargs
-    let index = g.runtime.contStackIndexIdx
+  -- get the return continuation.
-    m' <- lower' g m
+  , ins "global.get" [sxp rt.contStack]
-    pure . mconcat $
+  , ins "global.get" [sxp rt.contStackTop]
-      [ m'
+  , ins "array.get" [sxp rt.contStackType]
-      , ins "global.get" [sxp index]
+  , ins "ref.as_non_null" []
-      , ins "i32.const" [sxp @Int 1]
+  -- decrement contStackTop, completing the "pop."
+  , ins "global.get" [sxp rt.contStackTop]
+  , ins "i32.const" [sxp @Int (1 + l)]
   , ins "i32.sub" []
-      , ins "global.set" [sxp index]
+  , ins "global.set" [sxp rt.contStackTop]
-      , ins "global.get" [sxp stack]
+  , ins "return_call_ref" [sxp rt.contType]
-      , ins "global.get" [sxp index]
+  ]
-      , ins "array.get" [sxp g.runtime.contStackType]
+  where
-      , ins "return_call_ref" [sxp g.runtime.contType]
+    rt = g.runtime
+    l = V.elemIndex k g.kvars ^?! _Just
+
+lower' g (ExpLet [(r,MkLambda xs ktail m)] e) = do
+  idx <- defun [i32] [] (replicate 5 scm) \_ -> do
+    let g' = g & #vars <>~ V.fromList xs
+               & #kvars <>~ [ktail]
+    m' <- lower' g' m
+    pure . mconcat $
+      [ xs & ifoldMap \n _ ->
+          popArg g.runtime n <> ins "local.set" [sxp (1+n)]
+      , m'
+      ]
+  declareFuncref idx
+  let g' = g & #vars <>~ [r]
+  let n = length g.vars
+  e' <- lower' g' e
+  pure . mconcat $
+    [ ins "ref.func" [sxp idx]
+    , ins "local.set" [sxp (n+1)]
+    , e'
     ]
-  _
 
 lower' g e = error . show $ e
 
@@ -138,7 +186,7 @@ lowerBinOp op g x y r e = do
     , ins "i31.get_s" []
     , ins op []
     , ins "ref.i31" []
-    , ins "local.set" [sxp n]
+    , ins "local.set" [sxp (1+n)]
     , e'
     ]
   where
@@ -152,31 +200,50 @@ scm = ref eq
 
 
 emitRuntime :: GenMod :> es => Eff es Runtime
-emitRuntime = do
+emitRuntime = mfix \runtime -> do
   heapObjectIdx <- Wasm.deftypeNamed "$heap-object" $ Wasm.sub [] $ Wasm.struct
     [ Wasm.mut i32 ]
   -- cont stack
   contType <- Wasm.deftype $ Wasm.func [i32] []
-  contStackType <- Wasm.deftype $ array (refnull (fromIdx contType))
+  contStackType <- Wasm.deftype $ array $ mut $ refnull (fromIdx contType)
-  contStackIndexIdx <- Wasm.defglobal i32 $ ins "i32.const" [sxp @Int 0]
+  contStackTop <- Wasm.defglobal (mut i32) $ ins "i32.const" [sxp @Int 0]
-  contStackIdx <- Wasm.defglobal (ref (Wasm.fromIdx contStackType)) $
+  contStack <- Wasm.defglobal (ref (Wasm.fromIdx contStackType)) $
     ins "i32.const" [sxp @Int 128]
     <> ins "array.new_default" [sxp contStackType]
   -- arg array
-  argArrayType <- Wasm.deftype $ Wasm.array scm
+  argArrayType <- Wasm.deftype $ Wasm.array $ mut $ refnull eq
-  argArrayIdx <- Wasm.defglobal (ref (Wasm.fromIdx argArrayType)) _
+  argArray <- Wasm.defglobal (ref (Wasm.fromIdx argArrayType)) $
+    ins "i32.const" [sxp @Int 32]
+    <> ins "array.new_default" [sxp argArrayType]
   -- consIdx <- Wasm.defun _ _ _ _
+  result <- Wasm.defglobal (mut (refnull eq)) $ ins "ref.null" [sxp eq]
+  halt <- Wasm.defun [i32] [] (replicate 5 scm) \_ ->
+    pure . mconcat $
+      [ popArg runtime 0
+      , ins "global.set" [sxp result]
+      ]
   pure $ MkRuntime
-    {argArrayIdx
+    {argArray,argArrayType
-    ,contStackIdx,contStackIndexIdx,contStackType,contType}
+    ,contStack,contStackTop,contStackType,contType
+    ,result,halt}
   -- pure $ error "todo"
 
 lower :: Exp -> Eff es Text
 lower e = fmap Wasm.renderModule . Wasm.execGenMod $ do
   runtime <- emitRuntime
-  let env = MkEnv runtime mempty
+  let g = MkEnv runtime mempty mempty
+  scm_entry <- Wasm.defun [i32] [] (replicate 5 scm) \_ ->
+    lower' g e
   main <- Wasm.defun [] [scm] [scm, scm, scm, scm, scm] \_ ->
-    lower' env e
+    pure . mconcat $
+      -- push return cont
+      [--  ins "ref.func" [sxp halt]
+      -- make call
+      ins "i32.const" [sxp @Int 0]
+      , ins "call" [sxp scm_entry]
+      , ins "global.get" [sxp runtime.result]
+      , ins "ref.as_non_null" []
+      ]
   Wasm.export "main" "func" main
 
 lowerProgram :: Program -> Eff es Text

src/Gyehoek/Wasm.hs

@@ -47,6 +47,7 @@ module Gyehoek.Wasm
   , FromIdx(..)
   , func
   , refnull
+  , declareFuncref
   )
   where
 
@@ -85,6 +86,7 @@ import Data.Functor (void)
 data Module = MkModule
   { types :: Vector RecType
   , functions :: Vector Function
+  , funcrefs :: Vector Funcref
   , start :: Maybe Idx
   , exports :: Vector Export
   , globals :: Vector Global
@@ -97,10 +99,15 @@ instance Semigroup Module where
     , functions = m1.functions <> m2.functions
     , start = m2.start <|> m1.start
     , exports = m1.exports <> m2.exports
+    , funcrefs = m1.funcrefs <> m2.funcrefs
+    , globals = m1.globals <> m2.globals
     }
 
 instance Monoid Module where
-  mempty = MkModule mempty mempty Nothing mempty mempty
+  mempty = MkModule mempty mempty mempty Nothing mempty mempty
+
+newtype Funcref = MkFuncref { inner :: Idx }
+  deriving (Show, Generic)
 
 data Global = MkGlobal
   { ty :: Type
@@ -144,6 +151,7 @@ data GenMod :: Effect where
   Start :: Idx -> GenMod m ()
   Export :: Text -> Text -> Idx -> GenMod m ()
   DefGlobal :: Type -> Expr -> GenMod m Idx
+  DeclareFuncref :: Idx -> GenMod m ()
 
 type instance DispatchOf GenMod = Dynamic
 
@@ -174,6 +182,9 @@ defun
   -> Eff es Idx
 defun params res locals code = send $ Defun params res locals code
 
+declareFuncref :: GenMod :> es => Idx -> Eff es ()
+declareFuncref = send . DeclareFuncref
+
 -- defun
 --   :: (GenMod :> es)
 --   => List Type -> List Type -> List Type
@@ -196,8 +207,8 @@ runGenMod =
       where e = MkExport $ ParenList
               [ "export", sxp name, ParenList [ "func", sxp idx ] ]
     env (Defun params result locals code) ->
-      localSeqUnlift env \unlift ->
+      localSeqUnlift env \unlift -> do
-        stateM \m -> do
+        m <- get
         -- the least unused function index, computed as the number
         -- of currently allocated functions.
         let idx = IdxNumeric . fromIntegral . length $ m.functions
@@ -205,12 +216,13 @@ runGenMod =
         -- index `idx` for the sake of recursive occurences.
         body <- unlift $ code idx
         let func = MkFunction {params,result,locals,body}
-          let m' = m & #functions <>~ V.singleton func
+        #functions <>= V.singleton func
-          pure (idx, m')
+        pure idx
     _ (DefGlobal t e) -> state \m ->
       let prev_n = IdxNumeric . fromIntegral . V.length $ m.globals
           m' = m & #globals <>~ V.singleton (MkGlobal t e)
       in (prev_n, m')
+    _ (DeclareFuncref idx) -> #funcrefs <>= V.singleton (MkFuncref idx)
 
 execGenMod = fmap snd . runGenMod
 
@@ -346,9 +358,20 @@ instance SexpIso Module where
     ParenList $
       [ Symbol "module" ]
       <> (m ^.. #types . each . to sxp)
+      <> (m ^.. #globals . each . to sxp)
+      <> (m ^.. #funcrefs . each . to sxp)
       <> (m ^.. #functions . each . to sxp)
       <> (m ^.. #exports . each . to sxp)
 
+instance SexpIso Funcref where
+  sexpIso = with \funcref ->
+    list ( el (sym "elem")
+         >>> el (sym "declare")
+         >>> el (sym "funcref")
+         >>> el (list $ el (sym "ref.func") >>> el (sexpIso @Idx))
+         )
+    >>> funcref
+
 instance SexpIso Sexp where
   sexpIso = Control.Category.id
 

t.wat

@@ -1,14 +1,62 @@
 (module
   (type $heap-object (sub (struct (field (mut i32)))))
   (type (func (param i32) (result)))
-  (type (array (ref null 1)))
+  (type (array (mut (ref null 1))))
-  (type (array (ref eq)))
+  (type (array (mut (ref null eq))))
+  (global (mut i32) (i32.const 0))
+  (global (ref 2) (i32.const 128) (array.new_default 2))
+  (global (ref 3) (i32.const 32) (array.new_default 3))
+  (global (mut (ref null eq)) (ref.null eq))
+  (elem declare funcref (ref.func 1))
+  (func
+    (param i32)
+    (result)
+    (local (ref eq) (ref eq) (ref eq) (ref eq) (ref eq))
+    (global.get 2)
+    (i32.const 0)
+    (array.get 3)
+    ref.as_non_null
+    (global.set 3))
+  (func
+    (param i32)
+    (result)
+    (local (ref eq) (ref eq) (ref eq) (ref eq) (ref eq))
+    (global.get 2)
+    (i32.const 0)
+    (array.get 3)
+    ref.as_non_null
+    (local.set 1)
+    (global.get 2)
+    (i32.const 0)
+    (local.get 1)
+    (array.set 3)
+    (i32.const 1)
+    (global.get 1)
+    (global.get 0)
+    (array.get 2)
+    ref.as_non_null
+    (global.get 0)
+    (i32.const 1)
+    i32.sub
+    (global.set 0)
+    (return_call_ref 1))
+  (func
+    (param i32)
+    (result)
+    (local (ref eq) (ref eq) (ref eq) (ref eq) (ref eq))
+    (ref.func 1)
+    (local.set 1)
+    (global.get 2)
+    (i32.const 0)
+    (local.get 1)
+    (array.set 3)
+    (return_call 1))
   (func
     (param)
     (result (ref eq))
     (local (ref eq) (ref eq) (ref eq) (ref eq) (ref eq))
-    (i32.const 1)
+    (i32.const 0)
-    (i32.const 2)
+    (call 1)
-    i32.shl
+    (global.get 3)
-    ref.i31)
+    ref.as_non_null)
-  (export "main" (func 0)))
+  (export "main" (func 3)))