X-Git-Url: https://git.lukelau.me/?p=kaleidoscope-hs-old.git;a=blobdiff_plain;f=Main.hs;h=eba1ce1c7ae6e8072b4e78862c2daf750280bdd4;hp=29592b18b0d3a4612c7d034bfae4822e12ef04d9;hb=e9d3bf0386f5654857fe6eaabe74ca651f9df76d;hpb=7a64aefac2efb718f58e299a12fa5fd895c1b657

diff --git a/Main.hs b/Main.hs
index 29592b1..eba1ce1 100644
--- a/Main.hs
+++ b/Main.hs
@@ -1,14 +1,17 @@
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecursiveDo #-}
 
 module Main where
 
 import qualified AST
+import Control.Monad
+import Control.Monad.Trans.Class
 import qualified Data.Map as Map
 import qualified Data.Text.Lazy.IO as Text
 import Data.String
 import Foreign.Ptr
-import System.IO
 import System.Exit
+import System.IO
 import LLVM.Context
 import LLVM.ExecutionEngine
 import LLVM.Module
@@ -17,11 +20,11 @@ import LLVM.IRBuilder
 import LLVM.AST.AddrSpace
 import LLVM.AST.Constant
 import LLVM.AST.Float
+import LLVM.AST.FloatingPointPredicate hiding (False, True)
 import LLVM.AST.Operand
 import LLVM.AST.Type as Type
+import LLVM.AST.Typed
 import LLVM.Pretty
-import           Control.Monad
-import           Control.Monad.Trans.Class
 
 type ModuleBuilderE = ModuleBuilderT (Either String)
 
@@ -33,17 +36,36 @@ main = do
   let eitherMdl = buildModuleT "main" $ mapM buildAST asts
   case eitherMdl of
     Left err -> die err
-    Right mdl -> withContext $ \ctx ->
+    Right mdl -> withContext $ \ctx -> do
+      hPutStrLn stderr "Before optimisation:"
+      Text.hPutStrLn stderr (ppllvm mdl)
       withMCJIT ctx Nothing Nothing Nothing Nothing $ \mcjit ->
         withModuleFromAST ctx mdl $ \mdl' ->
           withPassManager defaultCuratedPassSetSpec $ \pm -> do
             runPassManager pm mdl' >>= guard
+            hPutStrLn stderr "After optimisation:"
             Text.hPutStrLn stderr . ppllvm =<< moduleAST mdl'
             withModuleInEngine mcjit mdl' $ \emdl -> do
               Just f <- getFunction emdl "expr"
               let f' = castFunPtr f :: FunPtr (IO Float)
               exprFun f' >>= print
 
+evalProg :: AST.Program -> IO (Maybe Float)
+evalProg (AST.Program asts) = do
+  let eitherMdl = buildModuleT "main" $ mapM buildAST asts
+  case eitherMdl of
+    Left _ -> return Nothing
+    Right mdl -> withContext $ \ctx ->
+      withMCJIT ctx Nothing Nothing Nothing Nothing $ \mcjit ->
+        withModuleFromAST ctx mdl $ \mdl' ->
+          withModuleInEngine mcjit mdl' $ \emdl -> do
+            Just f <- getFunction emdl "expr"
+            let f' = castFunPtr f :: FunPtr (IO Float)
+            Just <$> exprFun f'
+
+-- | Builds up programs at the top-level of an LLVM Module
+-- >>> evalProg (read "31 - 5")
+-- Just 26.0
 buildAST :: AST.AST -> ModuleBuilderE Operand
 buildAST (AST.Function nameStr paramStrs body) = do
   let n = fromString nameStr
@@ -54,6 +76,11 @@ buildAST (AST.Function nameStr paramStrs body) = do
 buildAST (AST.Eval e) =
   function "expr" [] float $ \_ -> buildExpr mempty e >>= ret
 
+-- | Builds up expressions, which are operands in LLVM IR
+-- >>> evalProg (read "def foo(x) x * 2; foo(6)")
+-- Just 12.0
+-- >>> evalProg (read "if 3 > 2 then 42 else 12")
+-- Just 42.0
 buildExpr :: Map.Map String Operand -> AST.Expr -> IRBuilderT ModuleBuilderE Operand
 buildExpr _ (AST.Num a) = pure $ ConstantOperand (Float (Single a))
 buildExpr binds (AST.Var n) = case binds Map.!? n of
@@ -76,4 +103,25 @@ buildExpr binds (AST.BinOp op a b) = do
                 AST.Add -> fadd
                 AST.Sub -> fsub
                 AST.Mul -> fmul
+                AST.Cmp GT -> fcmp OGT
+                AST.Cmp LT -> fcmp OLT
+                AST.Cmp EQ -> fcmp OEQ
   instr va vb
+
+buildExpr binds (AST.If cond thenE elseE) = mdo
+  _ifB <- block `named` "if"
+
+  condV <- buildExpr binds cond
+  when (typeOf condV /= i1) $ lift $ lift $ Left "Not a boolean"
+  condBr condV thenB elseB
+
+  thenB <- block `named` "then"
+  thenOp <- buildExpr binds thenE
+  br mergeB
+
+  elseB <- block `named` "else"
+  elseOp <- buildExpr binds elseE
+  br mergeB
+
+  mergeB <- block `named` "ifcont"
+  phi [(thenOp, thenB), (elseOp, elseB)]