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

Handle DUP2 as two dup if used for non 64 bit values from stack (non variables)

Browse Source
This commit is contained in:
Volker Berlin 2021-06-06 21:26:24 +02:00
parent 71fad44962
commit 5fef399743
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/de/inetsoftware/jwebassembly/module/WasmCodeBuilder.java
View File

@ -374,24 +374,35 @@ public abstract class WasmCodeBuilder {
instr = dup2 && type != ValueType.i64 && type != ValueType.f64 ? // instr = dup2 && type != ValueType.i64 && type != ValueType.f64 ? //
findInstructionThatPushValue( 2, javaCodePos ) : null; findInstructionThatPushValue( 2, javaCodePos ) : null;
int slot2;
if( instr != null ) {
slot2 = getPossibleSlot( instr );
if( slot2 < 0 ) {
slot2 = getTempVariable( instr.getPushValueType(), javaCodePos, javaCodePos + 1 );
if( slot < 0 ) {
slot = getTempVariable( type, javaCodePos, javaCodePos + 1 );
instructions.add( new WasmLoadStoreInstruction( VariableOperator.set, slot, localVariables, javaCodePos, lineNumber ) );
} else {
instructions.add( new WasmBlockInstruction( WasmBlockOperator.DROP, null, javaCodePos, lineNumber ) );
}
instructions.add( new WasmLoadStoreInstruction( VariableOperator.tee, slot2, localVariables, javaCodePos, lineNumber ) );
instructions.add( new WasmLoadStoreInstruction( VariableOperator.get, slot, localVariables, javaCodePos, lineNumber ) );
}
} else {
slot2 = -1; // for compiler only
}
//alternate we need to create a new locale variable //alternate we need to create a new locale variable
if( slot < 0 ) { if( slot < 0 ) {
if( instr != null ) {
throw new WasmException( "DUP2 for two slots without variables", lineNumber );
}
slot = getTempVariable( type, javaCodePos, javaCodePos + 1 ); slot = getTempVariable( type, javaCodePos, javaCodePos + 1 );
instructions.add( new WasmLoadStoreInstruction( VariableOperator.tee, slot, localVariables, javaCodePos, lineNumber ) ); instructions.add( new WasmLoadStoreInstruction( VariableOperator.tee, slot, localVariables, javaCodePos, lineNumber ) );
instructions.add( new WasmLoadStoreInstruction( VariableOperator.get, slot, localVariables, javaCodePos, lineNumber ) );
// an alternative solution can be a function call with multiple return values but this seems to be slower
// new SyntheticFunctionName( "dup" + storeType, "local.get 0 local.get 0 return", storeType, null, storeType, storeType ), codePos, lineNumber )
} else { } else {
if( instr != null ) {
int slot2 = getPossibleSlot( instr );
instructions.add( new WasmLoadStoreInstruction( VariableOperator.get, slot2, localVariables, javaCodePos, lineNumber ) );
}
instructions.add( new WasmLoadStoreInstruction( VariableOperator.get, slot, localVariables, javaCodePos, lineNumber ) );
localVariables.expandUse( slot, javaCodePos ); localVariables.expandUse( slot, javaCodePos );
} }
if( instr != null ) {
instructions.add( new WasmLoadStoreInstruction( VariableOperator.get, slot2, localVariables, javaCodePos, lineNumber ) );
}
instructions.add( new WasmLoadStoreInstruction( VariableOperator.get, slot, localVariables, javaCodePos, lineNumber ) );
} }
/** /**

13
test/de/inetsoftware/jwebassembly/runtime/ArrayOperations.java
View File

@ -19,6 +19,7 @@ import java.lang.reflect.Array;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Objects;
import java.util.zip.CRC32; import java.util.zip.CRC32;
import org.junit.Assume; import org.junit.Assume;
@ -64,6 +65,7 @@ public class ArrayOperations extends AbstractBaseTest {
addParam( list, script, "copyBack2Front" ); addParam( list, script, "copyBack2Front" );
addParam( list, script, "copyFront2Back" ); addParam( list, script, "copyFront2Back" );
addParam( list, script, "dup2" ); addParam( list, script, "dup2" );
addParam( list, script, "dup2FromStack" );
addParam( list, script, "dup_x2" ); addParam( list, script, "dup_x2" );
addParam( list, script, "byteArrayClassName" ); addParam( list, script, "byteArrayClassName" );
addParam( list, script, "shortArrayClassName" ); addParam( list, script, "shortArrayClassName" );
@ -225,6 +227,17 @@ public class ArrayOperations extends AbstractBaseTest {
return sum; return sum;
} }
@Export
static int dup2FromStack() {
int[] data = {1,2,3};
int i = 0;
// use dup2 to duplicate the array and the index from stack (not variable)
Objects.requireNonNull( data )[i+1] |= 13;
return data[1];
}
@Export @Export
static int dup_x2() { static int dup_x2() {
Object[] data = {null,null,null}; Object[] data = {null,null,null};