codegen: print every jvm instruction as label in disasm output

[mate.git] / Mate / X86CodeGen.hs

diff --git a/Mate/X86CodeGen.hs b/Mate/X86CodeGen.hs
index de370bea9c5aef3d40047861a8cb11877676f998..d895d63991857363ade7bfc903435f241630d6f8 100644 (file)
--- a/Mate/X86CodeGen.hs
+++ b/Mate/X86CodeGen.hs
@@ -74,7 +74,7 @@ emitFromBB method sig cls hmap =  do
           bb_offset <- getCodeOffset
           let bbstarts' = M.insert bid bb_offset bbstarts
           defineLabel $ getLabel bid lmap
-          cs <- mapM emit' $ code bb
+          cs <- mapM emit'' $ code bb
           let calls' = calls `M.union` M.fromList (catMaybes cs)
           case successor bb of
             Return -> return (calls', bbstarts')
@@ -110,6 +110,22 @@ emitFromBB method sig cls hmap =  do
         -- +2 is for correcting eip in trap context
         return $ Just (calladdr + 2, StaticMethod l)
 
+    invokeEpilog :: Word16 -> Word32 -> (Bool -> TrapCause) -> CodeGen e s (Maybe (Word32, TrapCause))
+    invokeEpilog cpidx offset trapcause = do
+        -- make actual (indirect) call
+        calladdr <- getCurrentOffset
+        call (Disp offset, eax)
+        -- discard arguments on stack (+4 for "this")
+        let argcnt = 4 + 4 * methodGetArgsCount cls cpidx
+        when (argcnt > 0) (add esp argcnt)
+        -- push result on stack if method has a return value
+        when (methodHaveReturnValue cls cpidx) (push eax)
+        let imm8 = is8BitOffset offset
+        return $ Just (calladdr + (if imm8 then 3 else 6), trapcause imm8)
+
+    emit'' :: J.Instruction -> CodeGen e s (Maybe (Word32, TrapCause))
+    emit'' insn = newNamedLabel ("jvm_insn: " ++ show insn) >>= defineLabel >> emit' insn
+
     emit' :: J.Instruction -> CodeGen e s (Maybe (Word32, TrapCause))
     emit' (INVOKESPECIAL cpidx) = emitInvoke cpidx True
     emit' (INVOKESTATIC cpidx) = emitInvoke cpidx False
@@ -125,19 +141,10 @@ emitFromBB method sig cls hmap =  do
         mov ebx (Disp 0, eax)
         -- get method offset
         offset <- liftIO $ getInterfaceMethodOffset ifacename methodname (encode msig)
-        -- make actual (indirect) call
-        calladdr <- getCurrentOffset
-        call (Disp offset, ebx)
-        -- discard arguments on stack (+4 for "this")
-        let argcnt = 4 + 4 * methodGetArgsCount cls cpidx
-        when (argcnt > 0) (add esp argcnt)
-        -- push result on stack if method has a return value
-        when (methodHaveReturnValue cls cpidx) (push eax)
-        -- note, the "mi" has the wrong class reference here.
+        -- note, that "mi" has the wrong class reference here.
         -- we figure that out at run-time, in the methodpool,
         -- depending on the method-table-ptr
-        let imm8 = is8BitOffset offset
-        return $ Just (calladdr + (if imm8 then 3 else 6), InterfaceMethod imm8 mi)
+        invokeEpilog cpidx offset (\x -> InterfaceMethod x mi)
     emit' (INVOKEVIRTUAL cpidx) = do
         -- get methodInfo entry
         let mi@(MethodInfo methodname objname msig@(MethodSignature args _))  = buildMethodID cls cpidx
@@ -149,19 +156,10 @@ emitFromBB method sig cls hmap =  do
         -- get method offset
         let nameAndSig = methodname `B.append` encode msig
         offset <- liftIO $ getMethodOffset objname nameAndSig
-        -- make actual (indirect) call
-        calladdr <- getCurrentOffset
-        call (Disp offset, eax)
-        -- discard arguments on stack (+4 for "this")
-        let argcnt = 4 + 4 * methodGetArgsCount cls cpidx
-        when (argcnt > 0) (add esp argcnt)
-        -- push result on stack if method has a return value
-        when (methodHaveReturnValue cls cpidx) (push eax)
-        -- note, the "mi" has the wrong class reference here.
+        -- note, that "mi" has the wrong class reference here.
         -- we figure that out at run-time, in the methodpool,
         -- depending on the method-table-ptr
-        let imm8 = is8BitOffset offset
-        return $ Just (calladdr + (if imm8 then 3 else 6), VirtualMethod imm8 mi)
+        invokeEpilog cpidx offset (\x -> VirtualMethod x mi)
     emit' (PUTSTATIC cpidx) = do
         pop eax
         trapaddr <- getCurrentOffset
@@ -178,6 +176,7 @@ emitFromBB method sig cls hmap =  do
     emit POP = add esp (4 :: Word32) -- drop value
     emit DUP = push (Disp 0, esp)
     emit DUP_X1 = do pop eax; pop ebx; push eax; push ebx; push eax
+    emit DUP_X2 = do pop eax; pop ebx; pop ecx; push eax; push ecx; push ebx; push eax
     emit AASTORE = emit IASTORE
     emit IASTORE = do
         pop eax -- value