ClassPool: JAR and ClassPath support

[mate.git] / Mate.hs

diff --git a/Mate.hs b/Mate.hs
index 35182cc866fa59a9ea582e3d36645b27695679f4..95daaf8133d890e2445ef353b05072d5aeb9288e 100644 (file)
--- a/Mate.hs
+++ b/Mate.hs
@@ -1,44 +1,63 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
+#include "debug.h"
 module Main where
 
 import System.Environment
 import Data.Char
-import Data.String.Utils
 import Data.List
+import Data.String.Utils
 import qualified Data.ByteString.Lazy as B
 
+#ifdef DEBUG
 import Text.Printf
-
+#endif
 import JVM.ClassFile
-import JVM.Converter
-import JVM.Dump
+import Java.JAR
 
 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
+  addClassPath "./"
   case args of
     [clspath] -> do
-      cls <- parseClassFile clspath
-      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
-          case method of
-            Just m -> do
-              let bclspath = B.pack $ map (fromIntegral . ord) (replace ".class" "" clspath)
-              entry <- compileBB hmap' (MethodInfo "main" bclspath (methodSignature m))
-              printf "executing `main' now:\n"
-              executeFuncPtr entry
-            Nothing -> error "main not found"
+      let bclspath = B.pack $ map (fromIntegral . ord) clspath
+      cls <- getClassFile bclspath
+      executeMain bclspath cls
+    ["-jar", jarpath] -> do
+      addClassPathJAR jarpath
+      res <- readMainClass jarpath
+      case res of
+        Nothing -> error "JAR: no MainClass entry found. Try to pass the jar file via -cp instead."
+        Just mc -> do
+          let mc' = replace "." "/" mc
+          let bclspath = B.pack $ map (fromIntegral . ord) mc'
+          cls <- getClassFile bclspath
+          executeMain bclspath cls
+    _ -> error "Usage: mate [<class-file> | -jar <jar-file>]"
+
+executeMain :: B.ByteString -> Class Direct -> IO ()
+executeMain bclspath cls = do
+  hmap <- parseMethod cls "main"
+  case hmap of
+    Just hmap' -> do
+      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
+          entry <- compileBB hmap' mi
+          addMethodRef entry mi [bclspath]
+#ifdef DEBUG
+          printf "executing `main' now:\n"
+#endif
+          executeFuncPtr entry
         Nothing -> error "main not found"
-    _ -> error "Usage: mate <class-file>"
+    Nothing -> error "main not found"