projects
/
hs-java.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
asm: `if<cond>' has also an word16 immediate
[hs-java.git]
/
JVM
/
Assembler.hs
diff --git
a/JVM/Assembler.hs
b/JVM/Assembler.hs
index db036dba44b9ee629b5ec9fee98d051a07dabd9f..6a10b3c0b626637a88f05ca9671ced7cd97de9ef 100644
(file)
--- a/
JVM/Assembler.hs
+++ b/
JVM/Assembler.hs
@@
-54,7
+54,7
@@
data Code = Code {
codeExceptionsN :: Word16,
codeExceptions :: [CodeException],
codeAttrsN :: Word16,
codeExceptionsN :: Word16,
codeExceptions :: [CodeException],
codeAttrsN :: Word16,
- codeAttributes :: Attributes
Pointers
}
+ codeAttributes :: Attributes
File
}
deriving (Eq, Show)
-- | Exception descriptor
deriving (Eq, Show)
-- | Exception descriptor
@@
-116,7
+116,7
@@
readInstructions = do
next <- readInstructions
return (x: next)
next <- readInstructions
return (x: next)
--- | JVM instruction set
+-- | JVM instruction set
. For comments, see JVM specification.
data Instruction =
NOP -- ^ 0
| ACONST_NULL -- ^ 1
data Instruction =
NOP -- ^ 0
| ACONST_NULL -- ^ 1
@@
-239,10
+239,10
@@
data Instruction =
| LCMP -- ^ 148
| FCMP CMP -- ^ 149, 150
| DCMP CMP -- ^ 151, 152
| LCMP -- ^ 148
| FCMP CMP -- ^ 149, 150
| DCMP CMP -- ^ 151, 152
- | IF CMP
-- ^ 153, 154, 155, 156, 157, 158
+ | IF CMP
Word16
-- ^ 153, 154, 155, 156, 157, 158
| IF_ICMP CMP Word16 -- ^ 159, 160, 161, 162, 163, 164
| IF_ACMP CMP Word16 -- ^ 165, 166
| IF_ICMP CMP Word16 -- ^ 159, 160, 161, 162, 163, 164
| IF_ACMP CMP Word16 -- ^ 165, 166
- | GOTO
-- ^ 167
+ | GOTO
Word16
-- ^ 167
| JSR Word16 -- ^ 168
| RET -- ^ 169
| TABLESWITCH Word32 Word32 Word32 [Word32] -- ^ 170
| JSR Word16 -- ^ 168
| RET -- ^ 169
| TABLESWITCH Word32 Word32 Word32 [Word32] -- ^ 170
@@
-475,12
+475,12
@@
instance BinaryState Integer Instruction where
put (DCMP C_LT) = putByte 151
put (DCMP C_GT) = putByte 152
put (DCMP c) = fail $ "No such instruction: DCMP " ++ show c
put (DCMP C_LT) = putByte 151
put (DCMP C_GT) = putByte 152
put (DCMP c) = fail $ "No such instruction: DCMP " ++ show c
- put (IF c
) = putByte (fromIntegral $ 153 + fromEnum c)
+ put (IF c
x) = putByte (fromIntegral $ 153 + fromEnum c) >> put x
put (IF_ACMP C_EQ x) = put1 165 x
put (IF_ACMP C_NE x) = put1 166 x
put (IF_ACMP c _) = fail $ "No such instruction: IF_ACMP " ++ show c
put (IF_ICMP c x) = putByte (fromIntegral $ 159 + fromEnum c) >> put x
put (IF_ACMP C_EQ x) = put1 165 x
put (IF_ACMP C_NE x) = put1 166 x
put (IF_ACMP c _) = fail $ "No such instruction: IF_ACMP " ++ show c
put (IF_ICMP c x) = putByte (fromIntegral $ 159 + fromEnum c) >> put x
- put
GOTO = putByte 167
+ put
(GOTO x) = put1 167 x
put (JSR x) = put1 168 x
put RET = putByte 169
put (TABLESWITCH def low high offs) = do
put (JSR x) = put1 168 x
put RET = putByte 169
put (TABLESWITCH def low high offs) = do
@@
-646,7
+646,7
@@
instance BinaryState Integer Instruction where
152 -> return $ DCMP C_GT
165 -> IF_ACMP C_EQ <$> get
166 -> IF_ACMP C_NE <$> get
152 -> return $ DCMP C_GT
165 -> IF_ACMP C_EQ <$> get
166 -> IF_ACMP C_NE <$> get
- 167 ->
return GOTO
+ 167 ->
GOTO <$> get
168 -> JSR <$> get
169 -> return RET
170 -> do
168 -> JSR <$> get
169 -> return RET
170 -> do
@@
-704,10
+704,11
@@
instance BinaryState Integer Instruction where
| inRange (34, 37) c -> imm 34 FLOAD_ c
| inRange (38, 41) c -> imm 38 DLOAD_ c
| inRange (42, 45) c -> imm 42 ALOAD_ c
| inRange (34, 37) c -> imm 34 FLOAD_ c
| inRange (38, 41) c -> imm 38 DLOAD_ c
| inRange (42, 45) c -> imm 42 ALOAD_ c
- | inRange (153, 158) c ->
return $ IF (toEnum $ fromIntegral $ c-153)
+ | inRange (153, 158) c ->
IF (toEnum $ fromIntegral $ c-153) <$> get
| inRange (159, 164) c -> IF_ICMP (toEnum $ fromIntegral $ c-159) <$> get
| otherwise -> fail $ "Unknown instruction byte code: " ++ show c
| inRange (159, 164) c -> IF_ICMP (toEnum $ fromIntegral $ c-159) <$> get
| otherwise -> fail $ "Unknown instruction byte code: " ++ show c
+-- | Encode list of instructions
encodeInstructions :: [Instruction] -> B.ByteString
encodeInstructions code =
let p list = forM_ list put
encodeInstructions :: [Instruction] -> B.ByteString
encodeInstructions code =
let p list = forM_ list put