eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-23 00:24:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix support of primitive arrays

Browse Source
This commit is contained in:
Alexey Andreev 2016-08-15 19:07:32 +03:00
parent 164ebeb629
commit 278b926c04
2 changed files with 85 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/teavm/wasm/Example.java
View File

@ -45,6 +45,11 @@ public final class Example {
WasmRuntime.print((Object) new Derived2() instanceof Derived1 ? 1 : 0); WasmRuntime.print((Object) new Derived2() instanceof Derived1 ? 1 : 0);
WasmRuntime.print((Object) new Derived2() instanceof A ? 1 : 0); WasmRuntime.print((Object) new Derived2() instanceof A ? 1 : 0);
WasmRuntime.print(new A(23) instanceof Base ? 1 : 0); WasmRuntime.print(new A(23) instanceof Base ? 1 : 0);
byte[] bytes = { 5, 6, 10, 15 };
for (byte bt : bytes) {
WasmRuntime.print(bt);
}
} }
private static Base instance(int index) { private static Base instance(int index) {

90
core/src/main/java/org/teavm/wasm/generate/WasmGenerationVisitor.java
View File

@ -406,7 +406,7 @@ class WasmGenerationVisitor implements StatementVisitor, ExprVisitor {
storeField(lhs.getQualified(), lhs.getField(), statement.getRightValue()); storeField(lhs.getQualified(), lhs.getField(), statement.getRightValue());
} else if (left instanceof SubscriptExpr) { } else if (left instanceof SubscriptExpr) {
SubscriptExpr lhs = (SubscriptExpr) left; SubscriptExpr lhs = (SubscriptExpr) left;
storeArrayItem(lhs.getArray(), lhs.getIndex(), statement.getRightValue()); storeArrayItem(lhs, statement.getRightValue());
} else { } else {
throw new UnsupportedOperationException("This expression is not supported yet"); throw new UnsupportedOperationException("This expression is not supported yet");
} }
@ -446,10 +446,34 @@ class WasmGenerationVisitor implements StatementVisitor, ExprVisitor {
} }
} }
private void storeArrayItem(Expr array, Expr index, Expr rightValue) { private void storeArrayItem(SubscriptExpr leftValue, Expr rightValue) {
WasmExpression ptr = getArrayElementPointer(array, index); WasmExpression ptr = getArrayElementPointer(leftValue);
rightValue.acceptVisitor(this); rightValue.acceptVisitor(this);
result = new WasmStoreInt32(4, ptr, result, WasmInt32Subtype.INT32);
switch (leftValue.getType()) {
case BYTE:
result = new WasmStoreInt32(1, ptr, result, WasmInt32Subtype.INT8);
break;
case SHORT:
result = new WasmStoreInt32(2, ptr, result, WasmInt32Subtype.INT16);
break;
case CHAR:
result = new WasmStoreInt32(2, ptr, result, WasmInt32Subtype.UINT16);
break;
case INT:
case OBJECT:
result = new WasmStoreInt32(4, ptr, result, WasmInt32Subtype.INT32);
break;
case LONG:
result = new WasmStoreInt64(8, ptr, result, WasmInt64Subtype.INT64);
break;
case FLOAT:
result = new WasmStoreFloat32(4, ptr, result);
break;
case DOUBLE:
result = new WasmStoreFloat64(8, ptr, result);
break;
}
} }
@Override @Override
@ -518,19 +542,65 @@ class WasmGenerationVisitor implements StatementVisitor, ExprVisitor {
@Override @Override
public void visit(SubscriptExpr expr) { public void visit(SubscriptExpr expr) {
WasmExpression ptr = getArrayElementPointer(expr.getArray(), expr.getIndex()); WasmExpression ptr = getArrayElementPointer(expr);
result = new WasmLoadInt32(4, ptr, WasmInt32Subtype.INT32); switch (expr.getType()) {
case BYTE:
result = new WasmLoadInt32(1, ptr, WasmInt32Subtype.INT8);
break;
case SHORT:
result = new WasmLoadInt32(2, ptr, WasmInt32Subtype.INT16);
break;
case CHAR:
result = new WasmLoadInt32(2, ptr, WasmInt32Subtype.UINT16);
break;
case INT:
case OBJECT:
result = new WasmLoadInt32(4, ptr, WasmInt32Subtype.INT32);
break;
case LONG:
result = new WasmLoadInt64(8, ptr, WasmInt64Subtype.INT64);
break;
case FLOAT:
result = new WasmLoadFloat32(4, ptr);
break;
case DOUBLE:
result = new WasmLoadFloat64(8, ptr);
break;
}
} }
private WasmExpression getArrayElementPointer(Expr arrayExpr, Expr indexExpr) { private WasmExpression getArrayElementPointer(SubscriptExpr expr) {
arrayExpr.acceptVisitor(this); expr.getArray().acceptVisitor(this);
WasmExpression array = result; WasmExpression array = result;
indexExpr.acceptVisitor(this); expr.getIndex().acceptVisitor(this);
WasmExpression index = result; WasmExpression index = result;
int size = -1;
switch (expr.getType()) {
case BYTE:
size = 0;
break;
case SHORT:
case CHAR:
size = 1;
break;
case INT:
case FLOAT:
case OBJECT:
size = 2;
break;
case LONG:
case DOUBLE:
size = 3;
break;
}
int base = classGenerator.getClassSize(RuntimeArray.class.getName()); int base = classGenerator.getClassSize(RuntimeArray.class.getName());
array = new WasmIntBinary(WasmIntType.INT32, WasmIntBinaryOperation.ADD, array, new WasmInt32Constant(base)); array = new WasmIntBinary(WasmIntType.INT32, WasmIntBinaryOperation.ADD, array, new WasmInt32Constant(base));
index = new WasmIntBinary(WasmIntType.INT32, WasmIntBinaryOperation.SHL, index, new WasmInt32Constant(2)); if (size != 0) {
index = new WasmIntBinary(WasmIntType.INT32, WasmIntBinaryOperation.SHL, index,
new WasmInt32Constant(size));
}
return new WasmIntBinary(WasmIntType.INT32, WasmIntBinaryOperation.ADD, array, index); return new WasmIntBinary(WasmIntType.INT32, WasmIntBinaryOperation.ADD, array, index);
} }