codegen: handle exceptions of a method

[mate.git] / Mate.hs

diff --git a/Mate.hs b/Mate.hs
index eb3c8733bab63d9261cc54f6247888e244220fbc..2231a5818be418b39fd6499043eb15927ab9207a 100644 (file)
--- a/Mate.hs
+++ b/Mate.hs
@@ -1,6 +1,4 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
-#include "debug.h"
 module Main where
 
 import System.Environment
@@ -10,9 +8,6 @@ import Data.List.Split
 import qualified Data.ByteString.Lazy as B
 import Control.Monad
 
-#ifdef DEBUG
-import Text.Printf
-#endif
 import JVM.ClassFile
 import Java.JAR
 
@@ -20,7 +15,10 @@ import Mate.BasicBlocks
 import Mate.MethodPool
 import Mate.Types
 import Mate.ClassPool
-import Mate.X86TrapHandling
+import Mate.NativeMachine
+import Mate.Debug
+
+import Mate.GC.Boehm
 
 main ::  IO ()
 main = do
@@ -36,44 +34,41 @@ parseArgs ("-jar":jarpath:_) stdcp = do
   case res of
     Nothing -> error "JAR: no MainClass entry found. Try to pass the jar file via -cp instead."
     Just mc -> do
-      let bclspath = B.pack $ map (fromIntegral . ord) mc
+      let bclspath = B.pack . map (fromIntegral . ord) $ mc
       cls <- getClassFile bclspath
       executeMain bclspath cls
+
 parseArgs ("-cp":cps) cpset = parseArgs ("-classpath":cps) cpset
 parseArgs ("-classpath":cps:xs) False = do
-  let paths = splitOn ":" cps
-  mapM_ addStuff paths
+  mapM_ addStuff $ splitOn ":" cps
   parseArgs xs True
-  where
-  addStuff :: String -> IO ()
-  addStuff x
-    | ".jar" `isSuffixOf` x = addClassPathJAR x
-    | otherwise = addClassPath $ x ++ "/"
+    where
+      addStuff :: String -> IO ()
+      addStuff x
+        | ".jar" `isSuffixOf` x = addClassPathJAR x
+        | otherwise = addClassPath $ x ++ "/"
 parseArgs ("-classpath":xs) _ = parseArgs ("-":xs) True -- usage
 parseArgs (('-':_):_) _ = error "Usage: mate [-cp|-classpath <cp1:cp2:..>] [<class-file> | -jar <jar-file>]"
 -- first argument which isn't prefixed by '-' should be a class file
 parseArgs (clspath:_) stdcp = do
   unless stdcp $ addClassPath "./"
-  let bclspath = B.pack $ map (fromIntegral . ord) clspath
+  let bclspath = B.pack . map (fromIntegral . ord) $ clspath
   cls <- getClassFile bclspath
   executeMain bclspath cls
 parseArgs _ _ = parseArgs ["-"] False
 
 
 executeMain :: B.ByteString -> Class Direct -> IO ()
-executeMain bclspath cls = do
+executeMain bclspath cls = do 
+  initGC --required on some platforms. [todo bernhard: maybe this should be moved somewhere else - maybe at a global place where vm initialization takes place
+
   let methods = classMethods cls; methods :: [Method Direct]
   case find (\x -> methodName x == "main") methods of
     Just m -> do
       let mi = MethodInfo "main" bclspath $ methodSignature m
-      hmap <- parseMethod cls "main" $ methodSignature m
-      case hmap of
-        Just hmap' -> do
-          entry <- compileBB hmap' mi
-          addMethodRef entry mi [bclspath]
-#ifdef DEBUG
-          printf "executing `main' now:\n"
-#endif
-          executeFuncPtr entry
-        Nothing -> error "main not found"
+      rawmethod <- parseMethod cls "main" $ methodSignature m
+      entry <- compileBB mi rawmethod mi
+      addMethodRef entry mi [bclspath]
+      printfInfo "executing `main' now:\n"
+      executeFuncPtr $ fst entry
     Nothing -> error "main not found"