Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GlobalInstance should expose MutabilityType instead of HostGlobal #488

Merged
merged 2 commits into from
Aug 27, 2024
Merged

GlobalInstance should expose MutabilityType instead of HostGlobal #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a1a381
GlobalInstance should expose MutabilityType instead of HostGlobal
evacchi Aug 27, 2024
1322e79
Make field mutabilityType final
evacchi Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions aot/src/test/java/com/dylibso/chicory/imports/SpecV1DataHostFuncs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ public static HostImports fallback() {
new HostGlobal(
"test",
"global-mut-i32",
new GlobalInstance(Value.i32(0)),
MutabilityType.Var),
new GlobalInstance(Value.i32(0), MutabilityType.Var)),
new HostGlobal(
"test", "g", new GlobalInstance(Value.i32(0)), MutabilityType.Var)
"test", "g", new GlobalInstance(Value.i32(0), MutabilityType.Var))
},
new HostMemory[] {
new HostMemory("spectest", "memory", new Memory(new MemoryLimits(1, 1)))
Expand Down
5 changes: 2 additions & 3 deletions aot/src/test/java/com/dylibso/chicory/imports/SpecV1ElemHostFuncs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ public static HostImports fallback() {
new HostGlobal(
"test",
"global-mut-i32",
new GlobalInstance(Value.i32(0)),
MutabilityType.Var),
new GlobalInstance(Value.i32(0), MutabilityType.Var)),
new HostGlobal(
"test", "g", new GlobalInstance(Value.i32(0)), MutabilityType.Var))
"test", "g", new GlobalInstance(Value.i32(0), MutabilityType.Var)))
.addTable(
new HostTable(
"spectest",
Expand Down
3 changes: 1 addition & 2 deletions aot/src/test/java/com/dylibso/chicory/imports/SpecV1GlobalHostFuncs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public static HostImports fallback() {
new HostGlobal(
"test",
"global-mut-i32",
new GlobalInstance(Value.i32(0)),
MutabilityType.Var),
new GlobalInstance(Value.i32(0), MutabilityType.Var)),
new HostGlobal("", "", new GlobalInstance(Value.externRef(0))),
});
}
Expand Down
3 changes: 1 addition & 2 deletions aot/src/test/java/com/dylibso/chicory/imports/SpecV1ImportsHostFuncs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,7 @@ public static HostImports fallback() {
new HostGlobal(
"test",
"global-mut-i64",
new GlobalInstance(Value.i64(0)),
MutabilityType.Var))
new GlobalInstance(Value.i64(0), MutabilityType.Var)))
.addMemory(
new HostMemory("spectest", "memory", new Memory(new MemoryLimits(1))),
new HostMemory(
Expand Down
16 changes: 6 additions & 10 deletions aot/src/test/java/com/dylibso/chicory/imports/SpecV1LinkingHostFuncs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public static HostImports Ng() {
List.of()))
.addGlobal(
new HostGlobal("Mg", "glob", MgInstance.global(0)),
new HostGlobal("Mg", "mut_glob", MgInstance.global(1), MutabilityType.Var))
new HostGlobal("Mg", "mut_glob", MgInstance.global(1)))
.build();
}

Expand Down Expand Up @@ -186,14 +186,12 @@ public static HostImports Mref_im() {
new HostGlobal(
"Mref_ex",
"g-var-func",
new GlobalInstance(Value.funcRef(0)),
MutabilityType.Var))
new GlobalInstance(Value.funcRef(0), MutabilityType.Var)))
.addGlobal(
new HostGlobal(
"Mref_ex",
"g-var-extern",
new GlobalInstance(Value.externRef(0)),
MutabilityType.Var))
new GlobalInstance(Value.externRef(0), MutabilityType.Var)))
.build();
}

Expand Down Expand Up @@ -231,14 +229,12 @@ public static HostImports fallback() {
new HostGlobal(
"Mref_ex",
"g-var-func",
new GlobalInstance(Value.funcRef(0)),
MutabilityType.Var))
new GlobalInstance(Value.funcRef(0), MutabilityType.Var)))
.addGlobal(
new HostGlobal(
"Mref_ex",
"g-var-extern",
new GlobalInstance(Value.externRef(0)),
MutabilityType.Var))
new GlobalInstance(Value.externRef(0), MutabilityType.Var)))
.addTable(
new HostTable(
"Mtable_ex",
Expand All @@ -255,7 +251,7 @@ public static HostImports fallback() {
if (MgInstance != null) {
builder.addGlobal(
new HostGlobal("Mg", "glob", MgInstance.global(0)),
new HostGlobal("Mg", "mut_glob", MgInstance.global(1), MutabilityType.Var));
new HostGlobal("Mg", "mut_glob", MgInstance.global(1)));
}

if (MsInstance != null) {
Expand Down
5 changes: 2 additions & 3 deletions runtime-tests/src/test/java/com/dylibso/chicory/imports/SpecV1DataHostFuncs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ public static HostImports fallback() {
new HostGlobal(
"test",
"global-mut-i32",
new GlobalInstance(Value.i32(0)),
MutabilityType.Var),
new GlobalInstance(Value.i32(0), MutabilityType.Var)),
new HostGlobal(
"test", "g", new GlobalInstance(Value.i32(0)), MutabilityType.Var)
"test", "g", new GlobalInstance(Value.i32(0), MutabilityType.Var))
},
new HostMemory[] {
new HostMemory("spectest", "memory", new Memory(new MemoryLimits(1, 1)))
Expand Down
5 changes: 2 additions & 3 deletions runtime-tests/src/test/java/com/dylibso/chicory/imports/SpecV1ElemHostFuncs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ public static HostImports fallback() {
new HostGlobal(
"test",
"global-mut-i32",
new GlobalInstance(Value.i32(0)),
MutabilityType.Var),
new GlobalInstance(Value.i32(0), MutabilityType.Var)),
new HostGlobal(
"test", "g", new GlobalInstance(Value.i32(0)), MutabilityType.Var))
"test", "g", new GlobalInstance(Value.i32(0), MutabilityType.Var)))
.addTable(
new HostTable(
"spectest",
Expand Down
3 changes: 1 addition & 2 deletions runtime-tests/src/test/java/com/dylibso/chicory/imports/SpecV1GlobalHostFuncs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public static HostImports fallback() {
new HostGlobal(
"test",
"global-mut-i32",
new GlobalInstance(Value.i32(0)),
MutabilityType.Var),
new GlobalInstance(Value.i32(0), MutabilityType.Var)),
new HostGlobal("", "", new GlobalInstance(Value.externRef(0))),
});
}
Expand Down
3 changes: 1 addition & 2 deletions runtime-tests/src/test/java/com/dylibso/chicory/imports/SpecV1ImportsHostFuncs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,7 @@ public static HostImports fallback() {
new HostGlobal(
"test",
"global-mut-i64",
new GlobalInstance(Value.i64(0)),
MutabilityType.Var))
new GlobalInstance(Value.i64(0), MutabilityType.Var)))
.addMemory(
new HostMemory("spectest", "memory", new Memory(new MemoryLimits(1))),
new HostMemory(
Expand Down
16 changes: 6 additions & 10 deletions runtime-tests/src/test/java/com/dylibso/chicory/imports/SpecV1LinkingHostFuncs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public static HostImports Ng() {
List.of()))
.addGlobal(
new HostGlobal("Mg", "glob", MgInstance.global(0)),
new HostGlobal("Mg", "mut_glob", MgInstance.global(1), MutabilityType.Var))
new HostGlobal("Mg", "mut_glob", MgInstance.global(1)))
.build();
}

Expand Down Expand Up @@ -186,14 +186,12 @@ public static HostImports Mref_im() {
new HostGlobal(
"Mref_ex",
"g-var-func",
new GlobalInstance(Value.funcRef(0)),
MutabilityType.Var))
new GlobalInstance(Value.funcRef(0), MutabilityType.Var)))
.addGlobal(
new HostGlobal(
"Mref_ex",
"g-var-extern",
new GlobalInstance(Value.externRef(0)),
MutabilityType.Var))
new GlobalInstance(Value.externRef(0), MutabilityType.Var)))
.build();
}

Expand Down Expand Up @@ -231,14 +229,12 @@ public static HostImports fallback() {
new HostGlobal(
"Mref_ex",
"g-var-func",
new GlobalInstance(Value.funcRef(0)),
MutabilityType.Var))
new GlobalInstance(Value.funcRef(0), MutabilityType.Var)))
.addGlobal(
new HostGlobal(
"Mref_ex",
"g-var-extern",
new GlobalInstance(Value.externRef(0)),
MutabilityType.Var))
new GlobalInstance(Value.externRef(0), MutabilityType.Var)))
.addTable(
new HostTable(
"Mtable_ex",
Expand All @@ -255,7 +251,7 @@ public static HostImports fallback() {
if (MgInstance != null) {
builder.addGlobal(
new HostGlobal("Mg", "glob", MgInstance.global(0)),
new HostGlobal("Mg", "mut_glob", MgInstance.global(1), MutabilityType.Var));
new HostGlobal("Mg", "mut_glob", MgInstance.global(1)));
}

if (MsInstance != null) {
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/com/dylibso/chicory/runtime/ConstantEvaluators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static Value computeConstantValue(Instance instance, List<Instruction> ex
{
var idx = (int) instruction.operands()[0];
if (idx < instance.imports().globalCount()) {
if (instance.imports().global(idx).mutabilityType()
if (instance.imports().global(idx).instance().getMutabilityType()
!= MutabilityType.Const) {
throw new InvalidException(
"constant expression required, initializer expression"
Expand Down
12 changes: 12 additions & 0 deletions runtime/src/main/java/com/dylibso/chicory/runtime/GlobalInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
package com.dylibso.chicory.runtime;

import com.dylibso.chicory.wasm.types.MutabilityType;
import com.dylibso.chicory.wasm.types.Value;

public class GlobalInstance {
private Value value;
private Instance instance;
private final MutabilityType mutabilityType;

public GlobalInstance(Value value, MutabilityType mutabilityType) {
this.value = value;
this.mutabilityType = mutabilityType;
}

public GlobalInstance(Value value) {
this.value = value;
this.mutabilityType = MutabilityType.Const;
}

public Value getValue() {
Expand All @@ -25,4 +33,8 @@ public Instance getInstance() {
public void setInstance(Instance instance) {
this.instance = instance;
}

public MutabilityType getMutabilityType() {
return mutabilityType;
}
}
13 changes: 0 additions & 13 deletions runtime/src/main/java/com/dylibso/chicory/runtime/HostGlobal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
package com.dylibso.chicory.runtime;

import com.dylibso.chicory.wasm.types.MutabilityType;

public class HostGlobal implements FromHost {
private final GlobalInstance instance;
private final MutabilityType type;
private final String moduleName;
private final String fieldName;

public HostGlobal(String moduleName, String fieldName, GlobalInstance instance) {
this(moduleName, fieldName, instance, MutabilityType.Const);
}

public HostGlobal(
String moduleName, String fieldName, GlobalInstance instance, MutabilityType type) {
this.instance = instance;
this.type = type;
this.moduleName = moduleName;
this.fieldName = fieldName;
}
Expand All @@ -24,10 +15,6 @@ public GlobalInstance instance() {
return instance;
}

public MutabilityType mutabilityType() {
return type;
}

@Override
public String moduleName() {
return moduleName;
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/main/java/com/dylibso/chicory/runtime/Instance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public Instance initialize(boolean start) {
throw new InvalidException(
"type mismatch, expected: " + g.valueType() + ", got: " + value.type());
}
globals[i] = new GlobalInstance(value);
globals[i] = new GlobalInstance(value, g.mutabilityType());
globals[i].setInstance(this);
}

Expand Down Expand Up @@ -431,7 +431,7 @@ private void validateHostFunctionSignature(FunctionImport imprt, HostFunction f)

private void validateHostGlobalType(GlobalImport i, HostGlobal g) {
if (i.type() != g.instance().getValue().type()
|| i.mutabilityType() != g.mutabilityType()) {
|| i.mutabilityType() != g.instance().getMutabilityType()) {
throw new UnlinkableException("incompatible import type");
}
}
Expand Down
Loading