diff --git a/src/Language/Wasm/Interpreter.hs b/src/Language/Wasm/Interpreter.hs index 4f0246a..ef5b51c 100644 --- a/src/Language/Wasm/Interpreter.hs +++ b/src/Language/Wasm/Interpreter.hs @@ -520,6 +520,51 @@ eval store FunctionInstance { funcType, moduleInstance, code = Function { localT val <- sum <$> mapM readByte [0..1] let signed = asWord32 $ if val >= 2 ^ 15 then -1 * fromIntegral (val .&. 0x7FFF) else fromIntegral val return $ Done ctx { stack = VI32 signed : rest } + step ctx@EvalCtx{ stack = (VI32 v:rest) } (I64Load8U MemArg { offset }) = do + let MemoryInstance { memory } = memInstances store ! (memaddrs moduleInstance ! 0) + let addr = fromIntegral $ v + fromIntegral offset + byte <- IOVector.read memory addr + return $ Done ctx { stack = VI64 (fromIntegral byte) : rest } + step ctx@EvalCtx{ stack = (VI32 v:rest) } (I64Load8S MemArg { offset }) = do + let MemoryInstance { memory } = memInstances store ! (memaddrs moduleInstance ! 0) + let addr = fromIntegral $ v + fromIntegral offset + byte <- IOVector.read memory addr + let val = asWord64 $ if byte >= 128 then -1 * fromIntegral (v .&. 0x7F) else fromIntegral v + return $ Done ctx { stack = VI64 val : rest } + step ctx@EvalCtx{ stack = (VI32 v:rest) } (I64Load16U MemArg { offset }) = do + let MemoryInstance { memory } = memInstances store ! (memaddrs moduleInstance ! 0) + let addr = fromIntegral $ v + fromIntegral offset + let readByte idx = do + byte <- IOVector.read memory $ addr + idx + return $ fromIntegral byte `shiftL` (idx * 8) + val <- sum <$> mapM readByte [0..1] + return $ Done ctx { stack = VI64 val : rest } + step ctx@EvalCtx{ stack = (VI32 v:rest) } (I64Load16S MemArg { offset }) = do + let MemoryInstance { memory } = memInstances store ! (memaddrs moduleInstance ! 0) + let addr = fromIntegral $ v + fromIntegral offset + let readByte idx = do + byte <- IOVector.read memory $ addr + idx + return $ (fromIntegral byte :: Word32) `shiftL` (idx * 8) + val <- sum <$> mapM readByte [0..1] + let signed = asWord64 $ if val >= 2 ^ 15 then -1 * fromIntegral (val .&. 0x7FFF) else fromIntegral val + return $ Done ctx { stack = VI64 signed : rest } + step ctx@EvalCtx{ stack = (VI32 v:rest) } (I64Load32U MemArg { offset }) = do + let MemoryInstance { memory } = memInstances store ! (memaddrs moduleInstance ! 0) + let addr = fromIntegral $ v + fromIntegral offset + let readByte idx = do + byte <- IOVector.read memory $ addr + idx + return $ fromIntegral byte `shiftL` (idx * 8) + val <- sum <$> mapM readByte [0..3] + return $ Done ctx { stack = VI64 val : rest } + step ctx@EvalCtx{ stack = (VI32 v:rest) } (I64Load32S MemArg { offset }) = do + let MemoryInstance { memory } = memInstances store ! (memaddrs moduleInstance ! 0) + let addr = fromIntegral $ v + fromIntegral offset + let readByte idx = do + byte <- IOVector.read memory $ addr + idx + return $ (fromIntegral byte :: Word32) `shiftL` (idx * 8) + val <- sum <$> mapM readByte [0..3] + let signed = asWord64 $ fromIntegral $ asInt32 val + return $ Done ctx { stack = VI64 signed : rest } step ctx (I32Const v) = return $ Done ctx { stack = VI32 v : stack ctx } step ctx (I64Const v) = return $ Done ctx { stack = VI64 v : stack ctx } step ctx (F32Const v) = return $ Done ctx { stack = VF32 v : stack ctx }