X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mate.git;a=blobdiff_plain;f=Mate.hs;h=2231a5818be418b39fd6499043eb15927ab9207a;hp=96edb9633155c58b5850e689e489134eb5eb9030;hb=HEAD;hpb=3573020fca0413c6d7823e2a1d70108f25766db0

diff --git a/Mate.hs b/Mate.hs
index 96edb96..2231a58 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
 
@@ -21,6 +16,7 @@ import Mate.MethodPool
 import Mate.Types
 import Mate.ClassPool
 import Mate.NativeMachine
+import Mate.Debug
 
 import Mate.GC.Boehm
 
@@ -65,15 +61,14 @@ parseArgs _ _ = parseArgs ["-"] False
 executeMain :: B.ByteString -> Class Direct -> IO ()
 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
       rawmethod <- parseMethod cls "main" $ methodSignature m
-      entry <- compileBB rawmethod mi
+      entry <- compileBB mi rawmethod mi
       addMethodRef entry mi [bclspath]
-#ifdef DEBUG
-      printf "executing `main' now:\n"
-#endif
-      executeFuncPtr entry
+      printfInfo "executing `main' now:\n"
+      executeFuncPtr $ fst entry
     Nothing -> error "main not found"