Update code generator. Not working properly yet :/

diff --git a/JVM/Generator.hs b/JVM/Generator.hs
index d5db62cf83627cfc93e956066a5c0277f76df7bd..6fb663667198e7b197d707c41105b174256761f4 100644 (file)
--- a/JVM/Generator.hs
+++ b/JVM/Generator.hs
@@ -40,13 +40,18 @@ appendPool c pool =
 addItem :: Constant -> Generate Word16
 addItem c = do
   pool <- St.gets currentPool
-  case lookupPool c pool of
-    Just i -> return i
-    Nothing -> do
-      let (pool', i) = appendPool c pool
-      st <- St.get
-      St.put $ st {currentPool = pool'}
-      return i
+  if pool ! 0 == CInteger 0
+    then do
+         st <- St.get
+         St.put $ st {currentPool = listArray (0,0) [c]}
+         return 1
+    else case lookupPool c pool of
+          Just i -> return i
+          Nothing -> do
+            let (pool', i) = appendPool c pool
+            st <- St.get
+            St.put $ st {currentPool = pool'}
+            return (i+1)
 
 lookupPool :: Constant -> Pool -> Maybe Word16
 lookupPool c pool =
@@ -55,9 +60,15 @@ lookupPool c pool =
 addNT :: Binary (Signature a) => NameType a -> Generate Word16
 addNT (NameType name sig) = do
   let bsig = encode sig
+  x <- addItem (CNameType name bsig)
   addItem (CUTF8 name)
   addItem (CUTF8 bsig)
-  addItem (CNameType name bsig)
+  return x
+
+addSig :: MethodSignature -> Generate Word16
+addSig c@(MethodSignature args ret) = do
+  let bsig = encode c
+  addItem (CUTF8 bsig)
 
 addToPool :: Constant -> Generate Word16
 addToPool c@(CClass str) = do
@@ -98,11 +109,18 @@ i1 fn c = do
   ix <- addToPool c
   i0 (fn ix)
 
-startMethod :: B.ByteString -> MethodSignature -> Generate ()
-startMethod name sig = do
+i8 :: (Word8 -> Instruction) -> Constant -> Generate ()
+i8 fn c = do
+  ix <- addToPool c
+  i0 (fn $ fromIntegral ix)
+
+startMethod :: [AccessFlag] -> B.ByteString -> MethodSignature -> Generate ()
+startMethod flags name sig = do
+  addToPool (CString name)
+  addSig sig
   st <- St.get
   let method = Method {
-    methodAccess = S.fromList [ACC_PUBLIC],
+    methodAccess = S.fromList flags,
     methodName = name,
     methodSignature = sig,
     methodAttrs = M.empty }
@@ -122,9 +140,9 @@ endMethod = do
                    currentMethod = Nothing,
                    doneMethods = doneMethods st ++ [method']}
 
-newMethod :: B.ByteString -> [ArgumentSignature] -> ReturnSignature -> Generate () -> Generate ()
-newMethod name args ret gen = do
-  startMethod name (MethodSignature args ret)
+newMethod :: [AccessFlag] -> B.ByteString -> [ArgumentSignature] -> ReturnSignature -> Generate () -> Generate ()
+newMethod flags name args ret gen = do
+  startMethod flags name (MethodSignature args ret)
   gen
   endMethod
 
@@ -141,15 +159,24 @@ genCode st = Code {
   where
     len = fromIntegral $ B.length $ encodeInstructions (generated st)
 
+initClass :: B.ByteString -> Generate Word16
+initClass name = do
+  addToPool (CClass "java/lang/Object")
+  addToPool (CClass name)
+  addToPool (CString "Code")
+
 generate :: B.ByteString -> Generate () -> Class
 generate name gen =
-  let res = execState gen emptyGState
+  let generator = do
+        initClass name
+        gen
+      res = execState generator emptyGState
       code = genCode res
   in  Class {
         constantPool = currentPool res,
-        classAccess = S.fromList [ACC_PUBLIC],
+        classAccess = S.fromList [ACC_PUBLIC, ACC_STATIC],
         this = name,
-        super = Nothing,
+        super = Just "java/lang/Object",
         implements = [],
         fields = [],
         methods = doneMethods res,

diff --git a/dump-class.hs b/dump-class.hs
index d76c8f2f8cb64b00c527478aa5ee8e096efd9e7a..3c52965c8a0a9efd1f0c1facd0c1e48066bcdc2d 100644 (file)
--- a/dump-class.hs
+++ b/dump-class.hs
@@ -3,10 +3,13 @@ module Main where
 
 import Control.Monad
 import Data.Array
+import Data.Binary
 import System.Environment
 import qualified Data.ByteString.Lazy as B
 import Text.Printf
 
+import JVM.Types
+import JVM.ClassFile
 import JVM.Converter
 import JVM.Dump
 
@@ -14,6 +17,8 @@ main = do
   args <- getArgs
   case args of
     [clspath] -> do
+      clsFile <- decodeFile clspath
+      putStrLn $ showListIx $ constsPool clsFile
       cls <- parseClassFile clspath
       dumpClass cls
     _ -> error "Synopsis: dump-class File.class"