backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 07:27:52 +01:00
Code Issues Projects Releases Activity

Update the exception handling support to the current proposal

Browse Source
This commit is contained in:
Volker Berlin 2021-02-27 22:22:24 +01:00
parent cf7e66901d
commit d3261149e6
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java
View File

@ -1342,6 +1342,7 @@ public class BinaryModuleWriter extends ModuleWriter implements InstructionOpcod
case CATCH: case CATCH:
if( options.useEH() ) { if( options.useEH() ) {
codeStream.writeOpCode( CATCH ); codeStream.writeOpCode( CATCH );
codeStream.writeVaruint32( (Integer)data );
} else { } else {
codeStream.writeOpCode( BR ); codeStream.writeOpCode( BR );
codeStream.writeVaruint32( 0 ); codeStream.writeVaruint32( 0 );

18
src/de/inetsoftware/jwebassembly/module/BranchManger.java
View File

@ -978,7 +978,7 @@ class BranchManger {
parent.add( tryNode ); parent.add( tryNode );
calculate( tryNode, parsedOperations.subList( 0, idx ) ); calculate( tryNode, parsedOperations.subList( 0, idx ) );
BranchNode catchNode = new BranchNode( catchPos, endPos, WasmBlockOperator.CATCH, WasmBlockOperator.END ); BranchNode catchNode = new BranchNode( catchPos, endPos, WasmBlockOperator.CATCH, WasmBlockOperator.END, 0 );
parent.add( catchNode ); parent.add( catchNode );
// Create a block/end structure for every CATCH without the first CATCH // Create a block/end structure for every CATCH without the first CATCH
@ -1097,14 +1097,14 @@ class BranchManger {
catchNode.add( 0, unBoxing ); catchNode.add( 0, unBoxing );
return; return;
} }
AnyType excepType = getCatchType( tryCatch ); // AnyType excepType = getCatchType( tryCatch );
BlockType blockType = options.types.blockType( Arrays.asList( ValueType.exnref ), Arrays.asList( excepType ) ); // BlockType blockType = options.types.blockType( Arrays.asList( ValueType.exnref ), Arrays.asList( excepType ) );
BranchNode unBoxing = new BranchNode( catchPos, catchPos, WasmBlockOperator.BLOCK, WasmBlockOperator.END, blockType ); // BranchNode unBoxing = new BranchNode( catchPos, catchPos, WasmBlockOperator.BLOCK, WasmBlockOperator.END, blockType );
catchNode.add( 0, unBoxing ); // catchNode.add( 0, unBoxing );
//
//TODO localVariables.getTempVariable( ValueType.exnref, catchPos, endPos ); https://github.com/WebAssembly/wabt/issues/1388 // //TODO localVariables.getTempVariable( ValueType.exnref, catchPos, endPos ); https://github.com/WebAssembly/wabt/issues/1388
unBoxing.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.BR_ON_EXN, null, 0 ) ); // unBoxing.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.BR_ON_EXN, null, 0 ) );
unBoxing.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.RETHROW, null ) ); // unBoxing.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.RETHROW, null ) );
} }
private AnyType getCatchType( TryCatchFinally tryCatch ) { private AnyType getCatchType( TryCatchFinally tryCatch ) {

2
src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java
View File

@ -831,7 +831,7 @@ public class TextModuleWriter extends ModuleWriter {
break; break;
case CATCH: case CATCH:
inset--; inset--;
name = options.useEH() ? "catch" : "br 0"; name = options.useEH() ? "catch " + data : "br 0";
insetAfter++; insetAfter++;
break; break;
case THROW: case THROW: