added cabal stubs for mate-common and mate;

[mate.git] / Mate.hs

diff --git a/Mate.hs b/Mate.hs
index eb7c76529dbc3bf31ea2758b7a5793dc6c2d58cb..02c9969ae55274aef67e84397e2b0d686b57a28f 100644 (file)
--- a/Mate.hs
+++ b/Mate.hs
@@ -1,4 +1,6 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
+#include "debug.h"
 module Main where
 
 import System.Environment
@@ -6,10 +8,10 @@ import Data.Char
 import Data.List
 import qualified Data.ByteString.Lazy as B
 
+#ifdef DEBUG
 import Text.Printf
-
+#endif
 import JVM.ClassFile
-import JVM.Dump
 
 import Mate.BasicBlocks
 import Mate.X86CodeGen
@@ -21,24 +23,23 @@ main ::  IO ()
 main = do
   args <- getArgs
   register_signal
-  initMethodPool
   case args of
     [clspath] -> do
       let bclspath = B.pack $ map (fromIntegral . ord) clspath
       cls <- getClassFile bclspath
-      dumpClass cls
       hmap <- parseMethod cls "main"
-      printMapBB hmap
       case hmap of
         Just hmap' -> do
           let methods = classMethods cls; methods :: [Method Resolved]
-          let method = find (\x -> (methodName x) == "main") methods
+          let method = find (\x -> methodName x == "main") methods
           case method of
             Just m -> do
-              let mi = (MethodInfo "main" bclspath (methodSignature m))
+              let mi = MethodInfo "main" bclspath $ methodSignature m
               entry <- compileBB hmap' mi
               addMethodRef entry mi [bclspath]
+#ifdef DEBUG
               printf "executing `main' now:\n"
+#endif
               executeFuncPtr entry
             Nothing -> error "main not found"
         Nothing -> error "main not found"