Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crucible-wasm: Build and test with the latest haskell-wasm commit #1232

Merged
merged 11 commits into from
Aug 1, 2024
Merged

crucible-wasm: Build and test with the latest haskell-wasm commit #1232

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5ae0ff8
crucible-wasm: Fix -Wunused-imports warning
RyanGlScott Jul 31, 2024
04afc3b
crucible-wasm: Make it build after haskell-wasm added reference types…
RyanGlScott Jul 31, 2024
03d618f
crucible-wasm: Adapt to new elem format in Wasm 2.0
RyanGlScott Aug 1, 2024
3f21102
crucible-wasm: Adapt to new table instructions in Wasm 2.0
RyanGlScott Aug 1, 2024
375d1a3
crucible-wasm: Adapt to elem.drop and call_indirect having a table index
RyanGlScott Aug 1, 2024
f7c697e
crucible-wasm: Adapt to select having an optional value type
RyanGlScott Aug 1, 2024
ee20b4d
crucible-wasm: Adapt to new data segment format in Wasm 2.0
RyanGlScott Aug 1, 2024
2bb1551
crucible-wasm: Adapt to new memory-related instructions in Wasm 2.0
RyanGlScott Aug 1, 2024
191fb94
Bump haskell-wasm to latest master commit
RyanGlScott Aug 1, 2024
58345ca
crucible-wasm: Add elem-related test case
RyanGlScott Jul 31, 2024
c066611
crucible-wasm: Add select-related test case
RyanGlScott Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crucible-wasm/src/Lang/Crucible/Wasm/Translate.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,11 +622,11 @@ genInstruction genReturn im st ctrlStack instr =
Just (ConstantGlobal _) -> panic "genInstruction: SetGlobal" ["setGlobal of constant global"]
Just (MutableGlobal gv) -> writeGlobal gv =<< checkStackVal (globalType gv) =<< popStack

Wasm.CurrentMemory ->
Wasm.MemorySize ->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add the following to a ticket as well so it doesn't get lost?

I have not added support for the memory.fill, memory.copy,
memory.init, or data.drop instructions, all of which are new in Wasm 2.0.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've opened #1233 for this.

do gv <- getMemVar im st
pushStack =<< extensionStmt (Wasm_MemSize gv)

Wasm.GrowMemory ->
Wasm.MemoryGrow ->
do gv <- getMemVar im st
n <- popInteger32
void $ extensionStmt (Wasm_MemGrow gv n)
Expand Down Expand Up @@ -822,7 +822,12 @@ genInstruction genReturn im st ctrlStack instr =
-- TableSet TableIndex
-- TableCopy TableIndex TableIndex

-- MemoryFill
-- MemoryCopy
-- MemoryInit DataIndex

-- ElemDrop ElemIndex
-- DataDrop DataIndex

_ -> unimplemented $ unwords ["Instruction not implemented", show instr]

Expand Down
2 changes: 1 addition & 1 deletion dependencies/haskell-wasm
Open in desktop
Submodule haskell-wasm updated 7 files
+4 −4 src/Language/Wasm/Binary.hs
+2 −2 src/Language/Wasm/Builder.hs
+20 −13 src/Language/Wasm/Interpreter.hs
+37 −6 src/Language/Wasm/Parser.y
+6 −2 src/Language/Wasm/Structure.hs
+3 −2 src/Language/Wasm/Validate.hs
+1 −1 tests/Test.hs