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

split findPreviousPushInstruction() for the 2 different use cases

Browse Source
This commit is contained in:
Volker Berlin 2018-12-12 19:38:20 +01:00
parent 01dcb85b36
commit 461d62a321
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/de/inetsoftware/jwebassembly/module/JavaMethodWasmCodeBuilder.java
View File

@ -242,7 +242,7 @@ class JavaMethodWasmCodeBuilder extends WasmCodeBuilder {
break; break;
case 89: // dup: duplicate the value on top of the stack case 89: // dup: duplicate the value on top of the stack
case 92: // dup2 case 92: // dup2
switch( findPreviousPushInstruction().getPushValueType() ) { switch( findPreviousPushInstructionPushValueType() ) {
case i32: case i32:
addCallInstruction( new SyntheticMember( "de/inetsoftware/jwebassembly/module/NativeHelperCode", "dup_i32", "(I)II" ), codePos ); addCallInstruction( new SyntheticMember( "de/inetsoftware/jwebassembly/module/NativeHelperCode", "dup_i32", "(I)II" ), codePos );
break OP; break OP;
@ -621,7 +621,7 @@ class JavaMethodWasmCodeBuilder extends WasmCodeBuilder {
byteCode.skip( 4 - padding ); byteCode.skip( 4 - padding );
} }
startPosition--; startPosition--;
int switchValuestartPosition = findPreviousPushInstruction().getCodePosition(); int switchValuestartPosition = findPreviousPushInstructionCodePosition();
int defaultPosition = startPosition + byteCode.readInt(); int defaultPosition = startPosition + byteCode.readInt();
int[] keys; int[] keys;
@ -687,10 +687,10 @@ class JavaMethodWasmCodeBuilder extends WasmCodeBuilder {
* We need one value from the stack inside of a block. We need to find the WasmInstruction on which the block can * We need one value from the stack inside of a block. We need to find the WasmInstruction on which the block can
* start. If this a function call or numeric expression this can be complex to find the right point. * start. If this a function call or numeric expression this can be complex to find the right point.
* *
* @return the WasmInstruction that push the last instruction * @return the code position that push the last instruction
*/ */
@Nonnull @Nonnull
private WasmInstruction findPreviousPushInstruction() { private int findPreviousPushInstructionCodePosition() {
int valueCount = 0; int valueCount = 0;
List<WasmInstruction> instructions = getInstructions(); List<WasmInstruction> instructions = getInstructions();
for( int i = instructions.size() - 1; i >= 0; i-- ) { for( int i = instructions.size() - 1; i >= 0; i-- ) {
@ -701,12 +701,34 @@ class JavaMethodWasmCodeBuilder extends WasmCodeBuilder {
} }
valueCount -= instr.getPopCount(); valueCount -= instr.getPopCount();
if( valueCount == 1 ) { if( valueCount == 1 ) {
return instr; return instr.getCodePosition();
} }
} }
throw new WasmException( "Start position not found", -1 ); // should never occur throw new WasmException( "Start position not found", -1 ); // should never occur
} }
/**
* We need the value type from the stack.
*
* @return the type of the last push value
*/
@Nonnull
private ValueType findPreviousPushInstructionPushValueType() {
int valueCount = 0;
List<WasmInstruction> instructions = getInstructions();
for( int i = instructions.size() - 1; i >= 0; i-- ) {
WasmInstruction instr = instructions.get( i );
ValueType valueType = instr.getPushValueType();
if( valueType != null ) {
if( ++valueCount == 1 ) {
return valueType;
}
}
valueCount -= instr.getPopCount();
}
throw new WasmException( "Push Value not found", -1 ); // should never occur
}
/** /**
* Find the next higher value. * Find the next higher value.
* *