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

fix IF-GOTO analyzing for multiple sub IF inside the THEN part.

Browse Source
This commit is contained in:
Volker Berlin 2020-05-25 19:28:47 +02:00
parent 87199e46ba
commit 8f1cc4bf97
2 changed files with 66 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,8 +156,27 @@ class BranchManger {
*/
void calculate() {
addLoops();
Collections.sort( allParsedOperations );
calculate( root, allParsedOperations );
List<ParsedBlock> parsedOperations = allParsedOperations;
Collections.sort( parsedOperations );
//
// int parsedOpCount = parsedOperations.size();
// for( int i = 0; i < parsedOpCount; i++ ) {
// ParsedBlock startBlock = parsedOperations.get( i );
// if( startBlock.op == JavaBlockOperator.IF ) {
// int jumpPos = startBlock.endPosition;
// for( int k = i + 1; k < parsedOpCount; k++ ) {
// ParsedBlock parsedBlock = parsedOperations.get( k );
// if( parsedBlock.op == JavaBlockOperator.GOTO && parsedBlock.startPosition < parsedBlock.endPosition ) {
// if( jumpPos == parsedBlock.endPosition ) {
// startBlock.endPosition = parsedBlock.startPosition;
// break;
// }
// }
// }
// }
// }
calculate( root, parsedOperations );
}
/**
@ -430,15 +449,30 @@ class BranchManger {
* @return the calculated positions
*/
private IfPositions searchElsePosition( IfParsedBlock startBlock, List<ParsedBlock> parsedOperations ) {
// first search for first GOTO, any IF that point after the GOTO can not be part of the primary IF condition.
// This occur with a second IF inside of the THEN. This can jump directly to the end of the ELSE.
int maxElse = Integer.MAX_VALUE;
// find the end position of the else block
int endElse = startBlock.endPosition;
int parsedOpCount = parsedOperations.size();
for( int i = 0; i < parsedOpCount; i++ ) {
ParsedBlock parsedBlock = parsedOperations.get( i );
if( parsedBlock.op == JavaBlockOperator.GOTO ) {
maxElse = parsedBlock.endPosition;
switch( parsedBlock.op ) {
case IF:
case GOTO:
if( parsedBlock.startPosition < endElse ) {
endElse = Math.max( endElse, parsedBlock.endPosition );
}
break;
}
if( parsedBlock.startPosition > endElse ) {
parsedOpCount = i;
break;
}
}
// first search for the first GOTO, any IF that point after the GOTO can not be part of the primary IF condition.
// This occur with a second IF inside of the THEN. This can jump directly to the end of the ELSE.
for( int i = 0; i < parsedOpCount; i++ ) {
ParsedBlock parsedBlock = parsedOperations.get( i );
if( parsedBlock.op == JavaBlockOperator.GOTO ) {
// find the last IF that point to this GOTO
int gotoNext = parsedBlock.nextPosition;
for( ; i > 0; i-- ) {
@ -457,7 +491,7 @@ class BranchManger {
int elsePos = startBlock.endPosition;
for( ; ifCount < parsedOpCount; ifCount++ ) {
ParsedBlock parsedBlock = parsedOperations.get( ifCount );
if( parsedBlock.op != JavaBlockOperator.IF || parsedBlock.endPosition < elsePos || parsedBlock.endPosition > maxElse ) {
if( parsedBlock.op != JavaBlockOperator.IF || parsedBlock.endPosition < elsePos || parsedBlock.endPosition > endElse ) {
// seems a second IF inside the THEN part.
break;
}
@ -1455,13 +1489,13 @@ class BranchManger {
* Positions inside a IF control structure.
*/
private static class IfPositions {
/** Count of boolean operations in the IF condition */
/** Count of boolean operations in the IF top level condition. This can be (&&) or (||) operations. */
private int ifCount;
/** The position of the first instruction in the THEN part */
/** The position of the first instruction in the THEN part. */
private int thenPos;
/** The position of the first instruction in the ELSE part */
/** The position of the first instruction in the ELSE part. */
private int elsePos;
}
}

21
test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java
View File

@ -74,6 +74,7 @@ public class ControlFlowOperators extends AbstractBaseTest {
addParam( list, script, "ifAndOr8" );
addParam( list, script, "ifWithoutElseAndLoop" );
addParam( list, script, "ifOrWithMulti" );
addParam( list, script, "ifMultipleInsideThen" );
addParam( list, script, "stringSwitchNormalFoo" );
addParam( list, script, "stringSwitchNormalBar" );
addParam( list, script, "stringSwitchNormalDefault" );
@ -511,6 +512,26 @@ public class ControlFlowOperators extends AbstractBaseTest {
return len;
}
@Export
static int ifMultipleInsideThen() {
int result = 0;
if( (result == 7) || (result == 13) ) {
// multiple IF inside the primary IF
if( result == -1 ) {
result = 1;
} else {
result = 2;
}
if( result > result ) {
result = 3;
}
} else {
result = 4;
}
return result;
}
@Export
static int stringSwitchNormalFoo() {
return stringSwitchNormal( "foo" );