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

improve the type handling of arrays

Browse Source
This commit is contained in:
Volker Berlin 2019-08-21 20:52:12 +02:00
parent 572d4d6c1f
commit 083ebf263e
4 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/de/inetsoftware/jwebassembly/javascript/NonGC.java
View File

@ -65,6 +65,26 @@ public abstract class NonGC {
return 0; // for compiler
}
@Import( js = "(a) => a.length" )
static int array_len_i64( Object array ) {
return 0; // for compiler
}
@Import( js = "(a) => a.length" )
static int array_len_f32( Object array ) {
return 0; // for compiler
}
@Import( js = "(a) => a.length" )
static int array_len_f64( Object array ) {
return 0; // for compiler
}
@Import( js = "(a) => a.length" )
static int array_len_anyref( Object array ) {
return 0; // for compiler
}
@Import( js = "(a,i,v) => a[i]=v" )
static void array_set_i8( byte[] array, int idx, byte value ) {
}

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

@ -26,9 +26,9 @@ import de.inetsoftware.classparser.ConstantClass;
import de.inetsoftware.classparser.ConstantPool;
import de.inetsoftware.classparser.ConstantRef;
import de.inetsoftware.jwebassembly.WasmException;
import de.inetsoftware.jwebassembly.module.TypeManager.StructType;
import de.inetsoftware.jwebassembly.wasm.AnyType;
import de.inetsoftware.jwebassembly.wasm.ArrayOperator;
import de.inetsoftware.jwebassembly.wasm.ArrayType;
import de.inetsoftware.jwebassembly.wasm.NamedStorageType;
import de.inetsoftware.jwebassembly.wasm.NumericOperator;
import de.inetsoftware.jwebassembly.wasm.StructOperator;
@ -539,7 +539,7 @@ class JavaMethodWasmCodeBuilder extends WasmCodeBuilder {
case 175: // dreturn
case 176: // areturn
case 177: // return void
ValueType type = null;
AnyType type = null;
switch( op ) {
case 172: // ireturn
type = ValueType.i32;
@ -603,22 +603,28 @@ class JavaMethodWasmCodeBuilder extends WasmCodeBuilder {
case 188: // newarray
int typeValue = byteCode.readByte();
switch( typeValue ) {
case 4: // boolean
case 5: // char
type = ValueType.i32;
case 4: // boolean
type = ValueType.i8;
break;
case 5: // char
type = ValueType.i16;
break;
case 6: //float
type = ValueType.f32;
break;
case 7: //double
case 7: //double
type = ValueType.f64;
break;
case 8: //byte
case 9: //short
case 10: //int
case 8: //byte
type = ValueType.i8;
break;
case 9: //short
type = ValueType.i16;
break;
case 10: //int
type = ValueType.i32;
break;
case 11: //long
case 11: //long
type = ValueType.i64;
break;
default:
@ -628,11 +634,12 @@ class JavaMethodWasmCodeBuilder extends WasmCodeBuilder {
break;
case 189: // anewarray
name = ((ConstantClass)constantPool.get( byteCode.readUnsignedShort() )).getName();
type = ValueType.anyref; //TODO we need to use the right type from name
type = ValueType.anyref; //TODO we need to use the right type from name; getTypeManager().valueOf( name );
addArrayInstruction( ArrayOperator.NEW, type, codePos, lineNumber );
break;
case 190: // arraylength
addArrayInstruction( ArrayOperator.LEN, ValueType.i32, codePos, lineNumber );
type = ((ArrayType)findValueTypeFromStack( 1 )).getArrayType();
addArrayInstruction( ArrayOperator.LEN, type, codePos, lineNumber );
break;
case 191: // athrow
addBlockInstruction( WasmBlockOperator.THROW, null, codePos, lineNumber );

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

@ -346,6 +346,9 @@ public abstract class WasmCodeBuilder {
instructions.add( new WasmArrayInstruction( op, type, javaCodePos, lineNumber ) );
} else {
try {
if( type.getCode() >= 0 ) {
type = ValueType.anyref;
}
String api = "array_" + op.toString().toLowerCase() + "_" + type;
ClassFile classFile = ClassFile.get( NonGC.class.getName().replace( '.', '/' ), getClass().getClassLoader() );
for( MethodInfo method : classFile.getMethods() ) {

8
src/de/inetsoftware/jwebassembly/wasm/ArrayType.java
View File

@ -33,6 +33,14 @@ public class ArrayType implements AnyType {
this.arrayType = arrayType;
}
/**
* The element type of the array
* @return the type
*/
public AnyType getArrayType() {
return arrayType;
}
/**
* {@inheritDoc}
*/