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

calculate the block type of a if block for the conditional operator.

Browse Source
This commit is contained in:
Volker 2018-08-10 18:52:29 +02:00
parent 4e4fa8a28f
commit 9b554b114b
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,15 @@
*/ */
package de.inetsoftware.jwebassembly.module; package de.inetsoftware.jwebassembly.module;
import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import javax.annotation.Nonnull;
import de.inetsoftware.classparser.CodeInputStream; import de.inetsoftware.classparser.CodeInputStream;
import de.inetsoftware.jwebassembly.WasmException; import de.inetsoftware.jwebassembly.WasmException;
@ -252,11 +255,12 @@ 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, ValueType.empty ); branch = new BranchNode( startPos, startBlock.endPosition, WasmBlockOperator.IF, null );
parent.add( branch ); parent.add( branch );
if( i > 0 ) { if( i > 0 ) {
calculate( branch, parsedOperations.subList( 0, i ) ); calculate( branch, parsedOperations.subList( 0, i ) );
} }
branch.data = calculateBlockType( startPos, branch.endPos );
endPos = parsedBlock.endPosition; endPos = parsedBlock.endPosition;
int breakDeep = calculateBreakDeep( parent, endPos ); int breakDeep = calculateBreakDeep( parent, endPos );
@ -313,6 +317,39 @@ class BranchManger {
return deep; return deep;
} }
/**
* Calculate the block type. The value type that is on the stack after the block.
*
* @param startPos
* the start position of the block
* @param endPos
* the end position of the block
* @return the value type
*/
@Nonnull
private ValueType calculateBlockType( int startPos, int endPos ) {
ArrayDeque<ValueType> stack = new ArrayDeque<>();
stack.push( ValueType.empty );
for( WasmInstruction instr : instructions ) {
int codePos = instr.getCodePosition();
if( codePos < startPos ) {
continue;
}
if( codePos >= endPos ) {
break;
}
int popCount = instr.getPopCount();
for( int p = 0; p < popCount; p++ ) {
stack.pop();
}
ValueType pushValue = instr.getPushValueType();
if( pushValue != null ) {
stack.push( pushValue );
}
}
return stack.pop();
}
/** /**
* Calculate the blocks of a switch. * Calculate the blocks of a switch.
* *