traps: do more things in haskell world

[mate.git] / Mate.hs

diff --git a/Mate.hs b/Mate.hs
index 05754bed7277a7242a159e9415710c10ab650f5e..d60df06367cd69bc5c6e85d00bff3940acef3c26 100644 (file)
--- a/Mate.hs
+++ b/Mate.hs
@@ -1,44 +1,45 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
+#include "debug.h"
 module Main where
 
 import System.Environment
 import Data.Char
-import Data.String.Utils
 import Data.List
 import qualified Data.ByteString.Lazy as B
 
+#ifdef DEBUG
 import Text.Printf
-
+#endif
 import JVM.ClassFile
-import JVM.Converter
-import JVM.Dump
 
 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
-      cls <- parseClassFile clspath
-      dumpClass cls
+      let bclspath = B.pack $ map (fromIntegral . ord) clspath
+      cls <- getClassFile bclspath
       hmap <- parseMethod cls "main"
-      printMapBB hmap
       case hmap of
         Just hmap' -> do
           let methods = classMethods cls; methods :: [Method Resolved]
-          let idx = findIndex (\x -> (methodName x) == "main") methods
-          case idx of
-            Just idx' -> do
-              let (Just m) = find (\x -> (methodName x) == "main") methods
-              let bclspath = B.pack $ map (fromIntegral . ord) (replace ".class" "" clspath)
-              entry <- compileBB hmap' (MethodInfo "main" bclspath (methodSignature m) (fromIntegral idx'))
+          let method = find (\x -> methodName x == "main") methods
+          case method of
+            Just m -> do
+              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"