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

support dynamic result type for an if block

Browse Source
This commit is contained in:
Volker 2018-08-05 14:45:18 +02:00
parent c8aecea7ab
commit b1eb27c474
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -698,7 +698,7 @@ public class BinaryModuleWriter extends ModuleWriter implements InstructionOpcod
break; break;
case IF: case IF:
codeStream.write( IF ); codeStream.write( IF );
codeStream.write( ValueType.empty.getCode() ); // void; the return type of the block. currently we does not use it codeStream.write( ((ValueType)data).getCode() );
break; break;
case ELSE: case ELSE:
codeStream.write( ELSE ); codeStream.write( ELSE );

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

@ -252,7 +252,7 @@ class BranchManger {
ParsedBlock parsedBlock = parsedOperations.get( i ); ParsedBlock parsedBlock = parsedOperations.get( i );
if( parsedBlock.startPosition == gotoPos && parsedBlock.op == JavaBlockOperator.GOTO && parsedBlock.startPosition < parsedBlock.endPosition) { if( parsedBlock.startPosition == gotoPos && parsedBlock.op == JavaBlockOperator.GOTO && parsedBlock.startPosition < parsedBlock.endPosition) {
parsedOperations.remove( i ); parsedOperations.remove( i );
branch = new BranchNode( startPos, startBlock.endPosition, WasmBlockOperator.IF, null ); branch = new BranchNode( startPos, startBlock.endPosition, WasmBlockOperator.IF, null, ValueType.empty );
parent.add( branch ); parent.add( branch );
if( i > 0 ) { if( i > 0 ) {
calculate( branch, parsedOperations.subList( 0, i ) ); calculate( branch, parsedOperations.subList( 0, i ) );
@ -276,7 +276,7 @@ class BranchManger {
} }
if( branch == null ) { if( branch == null ) {
branch = new BranchNode( startPos, endPos, WasmBlockOperator.IF, WasmBlockOperator.END ); branch = new BranchNode( startPos, endPos, WasmBlockOperator.IF, WasmBlockOperator.END, ValueType.empty );
parent.add( branch ); parent.add( branch );
} }
startBlock.negateCompare(); startBlock.negateCompare();

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

@ -282,6 +282,9 @@ public class TextModuleWriter extends ModuleWriter {
break; break;
case IF: case IF:
name = "if"; name = "if";
if( data != ValueType.empty ) {
name += " (result " + data + ")";
}
insetAfter++; insetAfter++;
break; break;
case ELSE: case ELSE: