X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=gen.icl;h=0fc8bc04d522ea29e1d4e9ba349beaef295ca2bd;hb=552f09db0d73eca583d297abd7114462fd87646d;hp=b24830e6dafc57289f63f84e58470476f88ad814;hpb=ac2e692f8057d6f9c41817ff964561205b856c2c;p=cc1516.git

diff --git a/gen.icl b/gen.icl
index b24830e..0fc8bc0 100644
--- a/gen.icl
+++ b/gen.icl
@@ -17,6 +17,7 @@ import Data.Either
 import Data.Tuple
 import Data.Functor
 import Data.Monoid
+import Data.Maybe
 import Control.Applicative
 import Control.Monad
 import Control.Monad.Trans
@@ -32,35 +33,54 @@ FALSE :== 0
 :: Instr    = Instr String [Arg] String
             | Lab Label
 :: Label :== String
-:: Arg = L Label | Lit Int
+:: Arg = L Label | Lit Int | Raw String
 :: SSMProgram :== [Instr]
 :: GenError = Error String
 :: GenMap :== 'Map'.Map String LoadPlace
+//completely change to either Stack, Heap, Register?
 :: LoadPlace    = LDA Int | LDC Int | LDH Int | LDL Int 
                 | LDR Int | LDS Int
                 | FUNC Label
 :: Gen a :== RWST Label SSMProgram (GenMap, [Label]) (Either GenError) a
 
 labelStream :: [Label]
-labelStream = map (\i-> concat ["lab_", toString i]) [1..]
+labelStream = map (\i-> concat ["lbl_", toString i]) [1..]
 
 gen :: AST -> String
-gen _ = prog
+gen (AST fds) = case evalRWST prog "" ('Map'.newMap, labelStream) of
+            Left (Error e) = e
+            Right (_, p) = toString p
     where
-        expr = (Op2Expr zero (Op1Expr zero UnMinus (IntExpr zero 4)) BiPlus (IntExpr zero 7))
-        expr2 = (FunExpr zero "test" [IntExpr zero 4] [])
-        stmt = (IfStmt (BoolExpr zero True) [] [])
-        prog = case evalRWST (g stmt) "end" ('Map'.newMap, labelStream) of
-            Left (Error e) = abort e
-            Right (_, prog) = toString prog
+        prog = tell [Instr "bra" [L "main"] ""] >>| mapM_ g fds
+//gen _ = prog
+//    where
+//        expr = (Op2Expr zero (Op1Expr zero UnMinus (IntExpr zero 4)) BiPlus (IntExpr zero 7))
+//        expr2 = (FunExpr zero "test" [IntExpr zero 4] [])
+//        stmt = (IfStmt (BoolExpr zero True) [] [])
+//        prog = case evalRWST (g stmt) 0 ('Map'.newMap, labelStream) of
+//            Left (Error e) = abort e
+//            Right (_, prog) = toString prog
 //gen _ = toString    [Lab "Test"
 //                    ,Instr "ldc" [Lit 1] "Eerste instructie"
 //                    ,Instr "ldc" [Lit 2] "Tweede instructie"]
 
+//Current issues:
+//All VarDecls are added as function, how to deal with assignments?
+//  (And when we deal with assignments, how to deal with assignments to higher order functions?)
+//Dealing with arguments
+//Dealing with types that do not fit on the Stack
+//  Probably completely change LoadPlace to a Type and a position relative to *something*
+//  And where the type determines if this position is a pointer to the heap or an
+//  unboxed value
 
 //helper functions for the gen monad
 genMap :: Gen GenMap
 genMap = gets fst
+changeGenMap :: (GenMap -> GenMap) -> Gen GenMap
+changeGenMap f = modify (appFst f) >>| genMap
+
+extend :: String LoadPlace GenMap -> GenMap
+extend k pl g = 'Map'.put k pl g 
 
 fresh :: Gen Label
 fresh = gets snd >>= \vars-> 
@@ -72,7 +92,7 @@ class g a :: a -> Gen ()
 instance g Expr where
     g (VarExpr _ (VarDef k fs)) = load k >>= \instr-> tell [instr] //note: pure is pure for list, i.e. []
     g (IntExpr _ i) = loadP (LDC i) >>= \instr-> tell [instr]
-    g (CharExpr _ c) = undef //how to deal with strings?
+    g (CharExpr _ c) = abort "How to deal with chars?"
     g (BoolExpr _ True) = loadP (LDC TRUE) >>= \instr-> tell [instr]
     g (BoolExpr _ False) = loadP (LDC FALSE) >>= \instr-> tell [instr]
     g (Op2Expr _ e1 op e2) = g e1 >>| g e2 >>| tell [Instr (op2ins op) [] ""]
@@ -80,21 +100,66 @@ instance g Expr where
     g (Op1Expr _ UnMinus e) = g e >>| tell [Instr "neg" [] ""]
     g (EmptyListExpr _) = abort "Shit, empty list expr"
     g (TupleExpr p (e1,e2)) = abort "How to deal with tuples?"
-    g (FunExpr _ k es fs) = mapM g es >>| jump "bsr" k >>= \instr-> tell [instr]
-            //bra is probably not right, figure out function call way
+    g (FunExpr _ k es fs) = 
+        mapM g es >>| //put all arguments on the stack (todo: fix argument handling!)
+        jump "bsr" k >>= \instr-> 
+        tell [instr] >>| //actually branch to function
+        tell [Instr "ldr" [Raw "RR"] ""] //push return value on stack, todo: check for VOID
 
 instance g Stmt where
     g (IfStmt cond th el) = 
         fresh >>= \elseLabel->
         fresh >>= \endLabel->
         g cond >>|
-        tell [Instr "brf" [L elseLabel] "branch false"] >>|
+        tell [Instr "brf" [L elseLabel] "branch else"] >>|
         mapM_ g th >>|
         tell [Instr "bra" [L endLabel] "branch end if"] >>|
         tell [Lab elseLabel] >>|
         mapM_ g el  >>|
         tell [Lab endLabel]
-
+    g (WhileStmt cond th) = 
+        fresh >>= \startLabel->
+        fresh >>= \endLabel ->
+        tell [Lab startLabel] >>|
+        g cond >>|
+        tell [Instr "brf" [L endLabel] "branch end while"] >>|
+        mapM_ g th >>|
+        tell [Instr "bra" [L startLabel] "branch start while"] >>|
+        tell [Lab endLabel]
+    g (AssStmt (VarDef k fs) e) = 
+        g e >>|
+        abort "Shit, an assignment, figure out something with storing vars or something"
+        //vars will be on stack in locals (possible pointers to heap)
+    g (FunStmt _ _) = abort "CodeGen, FunStmt unused" //not used
+    g (ReturnStmt Nothing)  = tell [Instr "ret" [] ""] //NOTE! Assumes only return address on stack, safe?
+    g (ReturnStmt (Just e)) = 
+        g e >>|
+        tell [Instr "str" [Raw "RR"] ""] >>|
+        g (ReturnStmt Nothing)
+
+instance g VarDecl where
+    g (VarDecl _ Nothing _ _) = liftT (Left $ Error "PANIC: untyped vardecl")
+    g (VarDecl _ (Just t) k e) = 
+        (\l->k+++"_"+++l) <$> fresh >>= \lbl->
+        changeGenMap (extend k (FUNC lbl)) >>|
+        tell [Lab lbl] >>|
+        g e >>| 
+        tell [Instr "str" [Raw "RR"] ""] >>|
+        tell [Instr "ret" [] ""]
+
+
+instance g FunDecl where
+    g (FunDecl _ k _ _ vds stms) = 
+        //varDecls can call the enclosing function, so first reserve a label for it 
+        (\l-> if (k=="main") "main" (l+++"_"+++k)) <$> fresh >>= \lbl->
+        changeGenMap (extend k (FUNC lbl)) >>|
+        //then generate functions for the VarDecls
+        genMap >>= \oldMap ->
+        mapM_ g vds  >>|
+        //then the main function 
+        tell [Lab lbl] >>|
+        mapM_ g stms >>|
+        changeGenMap (const oldMap) >>| pure ()
 
 op2ins :: Op2 -> String
 op2ins op = case op of
@@ -133,7 +198,7 @@ where
 jump :: String String -> Gen Instr
 jump instr k = genMap >>= \g-> case 'Map'.member k g of
     False = liftT (Left $ Error $ concat ["PANIC: ", k, " not found as function"])
-    True = dec ('Map'.find k g) >>= \lbl-> pure $ Instr instr [lbl] k 
+    True = dec ('Map'.find k g) >>= \lbl-> pure $ Instr instr [lbl] (k +++"()") 
 where
     dec (FUNC l) = pure (L l)
     dec _ = liftT (Left $ Error "PANIC: trying to jump to non label")
@@ -150,6 +215,7 @@ instance print [Arg] where
 instance toString Arg where
     toString (L l) = l
     toString (Lit int) = toString int
+    toString (Raw s) = s
 
 instance toString SSMProgram where
     toString p = concat $ intersperse " " $ map (\i-> concat $ intersperse " " $ print i) p
\ No newline at end of file