hs-java: upgrade to 0.3.1

[mate.git] / Mate.hs

diff --git a/Mate.hs b/Mate.hs
index 5e6df74f9c77f6925d62ded17039f13676af621b..911c1dbd1c1ef1b892a511c65835f3e3c73537e9 100644 (file)
--- a/Mate.hs
+++ b/Mate.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
+#include "debug.h"
 module Main where
 
 import System.Environment
@@ -9,37 +10,31 @@ import qualified Data.ByteString.Lazy as B
 
 #ifdef DEBUG
 import Text.Printf
-
-import JVM.Dump
 #endif
 import JVM.ClassFile
 
 import Mate.BasicBlocks
-import Mate.X86CodeGen
 import Mate.MethodPool
 import Mate.Types
 import Mate.ClassPool
+import Mate.X86TrapHandling
 
 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
-#ifdef DEBUG
-      dumpClass cls
-#endif
       hmap <- parseMethod cls "main"
       case hmap of
         Just hmap' -> do
-          let methods = classMethods cls; methods :: [Method Resolved]
-          let method = find (\x -> (methodName x) == "main") methods
+          let methods = classMethods cls; methods :: [Method Direct]
+          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