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

wasm: display inherited fields in debugger

Browse Source
This commit is contained in:
Alexey Andreev 2023-02-17 21:04:51 +01:00
parent 7bde7d9642
commit f2ae748705
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
core/src/main/java/org/teavm/debugging/WasmValueImpl.java
View File

@ -336,33 +336,37 @@ class WasmValueImpl extends Value {
return Collections.emptyMap();
}
var properties = new LinkedHashMap<String, Variable>();
for (var field : cls.instanceFields()) {
long longValue;
switch (field.type()) {
case BOOLEAN:
case BYTE:
longValue = data[field.address()];
break;
case SHORT:
case CHAR:
longValue = readShort(data, field.address());
break;
case INT:
case FLOAT:
case ADDRESS:
case OBJECT:
longValue = readInt(data, field.address());
break;
case LONG:
case DOUBLE:
longValue = readLong(data, field.address());
break;
default:
longValue = 0;
break;
var ancestorCls = cls;
while (ancestorCls != null) {
for (var field : ancestorCls.instanceFields()) {
long longValue;
switch (field.type()) {
case BOOLEAN:
case BYTE:
longValue = data[field.address()];
break;
case SHORT:
case CHAR:
longValue = readShort(data, field.address());
break;
case INT:
case FLOAT:
case ADDRESS:
case OBJECT:
longValue = readInt(data, field.address());
break;
case LONG:
case DOUBLE:
longValue = readLong(data, field.address());
break;
default:
longValue = 0;
break;
}
var value = new WasmValueImpl(debugger, debugInfo, field.type(), callFrame, longValue);
properties.put(field.name(), new Variable(field.name(), value));
}
var value = new WasmValueImpl(debugger, debugInfo, field.type(), callFrame, longValue);
properties.put(field.name(), new Variable(field.name(), value));
ancestorCls = ancestorCls.superclass();
}
addCommonProperties(properties, cls);
return properties;