X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate.hs;h=96edb9633155c58b5850e689e489134eb5eb9030;hb=08628062840ccf3730e239222c30e78b403dc6f4;hp=4664ff188dc26229cd591324c9d69ff411f0d569;hpb=03ddf0056a8ebae7ce10d694bbf906c276677a33;p=mate.git

diff --git a/Mate.hs b/Mate.hs
index 4664ff1..96edb96 100644
--- a/Mate.hs
+++ b/Mate.hs
@@ -20,7 +20,9 @@ import Mate.BasicBlocks
 import Mate.MethodPool
 import Mate.Types
 import Mate.ClassPool
-import Mate.X86TrapHandling
+import Mate.NativeMachine
+
+import Mate.GC.Boehm
 
 main ::  IO ()
 main = do
@@ -36,13 +38,13 @@ 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 ()
@@ -54,14 +56,15 @@ parseArgs (('-':_):_) _ = error "Usage: mate [-cp|-classpath <cp1:cp2:..>] [<cla
 -- 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