diff options
author | Thomas Lively <tlively@google.com> | 2023-11-08 02:04:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-07 17:04:41 -0800 |
commit | 3640f9c992746867c5cf4cead11077e36a51eb7c (patch) | |
tree | 5dd299ab8a2a64f18e0bb6cf651a9c96f1cac1eb /src/parser/contexts.h | |
parent | 0167c65132dd41fde2df6b76149ffc91305abe30 (diff) | |
download | binaryen-3640f9c992746867c5cf4cead11077e36a51eb7c.tar.gz binaryen-3640f9c992746867c5cf4cead11077e36a51eb7c.tar.bz2 binaryen-3640f9c992746867c5cf4cead11077e36a51eb7c.zip |
[Parser] Parse `call` and `return_call` (#6086)
To support parsing calls, add support for parsing function indices and building
calls with IRBuilder.
Diffstat (limited to 'src/parser/contexts.h')
-rw-r--r-- | src/parser/contexts.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/parser/contexts.h b/src/parser/contexts.h index eb47dd502..e360a7175 100644 --- a/src/parser/contexts.h +++ b/src/parser/contexts.h @@ -280,6 +280,7 @@ struct NullInstrParserCtx { using ExprT = Ok; using FieldIdxT = Ok; + using FuncIdxT = Ok; using LocalIdxT = Ok; using GlobalIdxT = Ok; using MemoryIdxT = Ok; @@ -296,6 +297,8 @@ struct NullInstrParserCtx { template<typename HeapTypeT> FieldIdxT getFieldFromName(HeapTypeT, Name) { return Ok{}; } + FuncIdxT getFuncFromIdx(uint32_t) { return Ok{}; } + FuncIdxT getFuncFromName(Name) { return Ok{}; } LocalIdxT getLocalFromIdx(uint32_t) { return Ok{}; } LocalIdxT getLocalFromName(Name) { return Ok{}; } GlobalIdxT getGlobalFromIdx(uint32_t) { return Ok{}; } @@ -378,6 +381,7 @@ struct NullInstrParserCtx { Result<> makeMemoryCopy(Index, MemoryIdxT*, MemoryIdxT*) { return Ok{}; } Result<> makeMemoryFill(Index, MemoryIdxT*) { return Ok{}; } + Result<> makeCall(Index, FuncIdxT, bool) { return Ok{}; } Result<> makeBreak(Index, LabelIdxT) { return Ok{}; } Result<> makeReturn(Index) { return Ok{}; } template<typename HeapTypeT> Result<> makeRefNull(Index, HeapTypeT) { @@ -802,6 +806,7 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx> { using ExprT = Expression*; using FieldIdxT = Index; + using FuncIdxT = Name; using LocalIdxT = Index; using LabelIdxT = Index; using GlobalIdxT = Name; @@ -895,6 +900,20 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx> { return idx; } + Result<Name> getFuncFromIdx(uint32_t idx) { + if (idx >= wasm.functions.size()) { + return in.err("function index out of bounds"); + } + return wasm.functions[idx]->name; + } + + Result<Name> getFuncFromName(Name name) { + if (!wasm.getFunctionOrNull(name)) { + return in.err("function $" + name.toString() + " does not exist"); + } + return name; + } + Result<Index> getLocalFromName(Name name) { if (!func) { return in.err("cannot access locals outside of a function"); @@ -1220,6 +1239,10 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx> { return withLoc(pos, irBuilder.makeMemoryFill(*m)); } + Result<> makeCall(Index pos, Name func, bool isReturn) { + return withLoc(pos, irBuilder.makeCall(func, isReturn)); + } + Result<> makeBreak(Index pos, Index label) { return withLoc(pos, irBuilder.makeBreak(label)); } |