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

diff --git a/Mate.hs b/Mate.hs
index 4664ff1..a191048 100644
--- 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,13 +34,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 +52,16 @@ 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
@@ -69,8 +69,6 @@ executeMain bclspath cls = do
       rawmethod <- parseMethod cls "main" $ methodSignature m
       entry <- compileBB rawmethod mi
       addMethodRef entry mi [bclspath]
-#ifdef DEBUG
-      printf "executing `main' now:\n"
-#endif
+      printfInfo "executing `main' now:\n"
       executeFuncPtr entry
     Nothing -> error "main not found"