X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate.hs;h=eb3c8733bab63d9261cc54f6247888e244220fbc;hb=d3f63d65d80aaab4ad8eac43ee1caea7dea09fbd;hp=4c732908af3d6fca2ad794f2d8d3519f3213b3b4;hpb=8d1996a73234eed84ba68dae7ef09b4faec2a7ea;p=mate.git

diff --git a/Mate.hs b/Mate.hs
index 4c73290..eb3c873 100644
--- a/Mate.hs
+++ b/Mate.hs
@@ -6,42 +6,74 @@ module Main where
 import System.Environment
 import Data.Char
 import Data.List
+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
 
 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
+  parseArgs args False
+
+parseArgs :: [String] -> Bool -> IO ()
+parseArgs ("-jar":jarpath:_) stdcp = do
+  unless stdcp $ addClassPath "./"
+  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 bclspath = B.pack $ map (fromIntegral . ord) mc
       cls <- getClassFile bclspath
-      hmap <- parseMethod cls "main"
+      executeMain bclspath cls
+parseArgs ("-cp":cps) cpset = parseArgs ("-classpath":cps) cpset
+parseArgs ("-classpath":cps:xs) False = do
+  let paths = splitOn ":" cps
+  mapM_ addStuff paths
+  parseArgs xs True
+  where
+  addStuff :: String -> IO ()
+  addStuff x
+    | ".jar" `isSuffixOf` x = addClassPathJAR x
+    | otherwise = addClassPath $ x ++ "/"
+parseArgs ("-classpath":xs) _ = parseArgs ("-":xs) True -- usage
+parseArgs (('-':_):_) _ = error "Usage: mate [-cp|-classpath <cp1:cp2:..>] [<class-file> | -jar <jar-file>]"
+-- first argument which isn't prefixed by '-' should be a class file
+parseArgs (clspath:_) stdcp = do
+  unless stdcp $ addClassPath "./"
+  let bclspath = B.pack $ map (fromIntegral . ord) clspath
+  cls <- getClassFile bclspath
+  executeMain bclspath cls
+parseArgs _ _ = parseArgs ["-"] False
+
+
+executeMain :: B.ByteString -> Class Direct -> IO ()
+executeMain bclspath cls = do
+  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
+      hmap <- parseMethod cls "main" $ methodSignature m
       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 mi = (MethodInfo "main" bclspath (methodSignature m))
-              entry <- compileBB hmap' mi
-              addMethodRef entry mi [bclspath]
+          entry <- compileBB hmap' mi
+          addMethodRef entry mi [bclspath]
 #ifdef DEBUG
-              printf "executing `main' now:\n"
+          printf "executing `main' now:\n"
 #endif
-              executeFuncPtr entry
-            Nothing -> error "main not found"
+          executeFuncPtr entry
         Nothing -> error "main not found"
-    _ -> error "Usage: mate <class-file>"
+    Nothing -> error "main not found"