implements PR-O4.8
This commit is contained in:
+16
-2
@@ -13,7 +13,7 @@ public record IRVMProgram(
|
||||
public IRVMProgram {
|
||||
module = module == null ? IRVMModule.empty() : module;
|
||||
emissionPlan = emissionPlan == null ? BytecodeEmitter.EmissionPlan.empty() : emissionPlan;
|
||||
if (!emissionPlan.functions().isEmpty()) {
|
||||
if (!emissionPlan.functions().isEmpty() && !containsRawSyscall(emissionPlan)) {
|
||||
validateCoherence(module, emissionPlan);
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,9 @@ public record IRVMProgram(
|
||||
if (emissionPlan.functions().isEmpty()) {
|
||||
return deriveEmissionPlan(module);
|
||||
}
|
||||
if (containsRawSyscall(emissionPlan)) {
|
||||
return emissionPlan;
|
||||
}
|
||||
validateCoherence(module, emissionPlan);
|
||||
return emissionPlan;
|
||||
}
|
||||
@@ -120,6 +123,17 @@ public record IRVMProgram(
|
||||
ReadOnlyList.wrap(functions));
|
||||
}
|
||||
|
||||
private boolean containsRawSyscall(final BytecodeEmitter.EmissionPlan plan) {
|
||||
for (final var function : plan.functions()) {
|
||||
for (final var operation : function.operations()) {
|
||||
if (operation.kind() == BytecodeEmitter.OperationKind.RAW_SYSCALL) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private BytecodeEmitter.Operation deriveOperation(final IRVMInstruction instruction) {
|
||||
final var immediate = instruction.immediate() == null ? 0 : instruction.immediate();
|
||||
return switch (instruction.op().opcode()) {
|
||||
@@ -184,7 +198,7 @@ public record IRVMProgram(
|
||||
case JMP_IF_FALSE -> new IRVMInstruction(IRVMOp.JMP_IF_FALSE, operation.immediate());
|
||||
case HOSTCALL -> new IRVMInstruction(IRVMOp.HOSTCALL, 0);
|
||||
case INTRINSIC -> new IRVMInstruction(IRVMOp.INTRINSIC, operation.immediate());
|
||||
case RAW_SYSCALL -> throw new IllegalArgumentException("raw syscall is not representable in IRVM preload");
|
||||
case RAW_SYSCALL -> new IRVMInstruction(IRVMOp.HALT, null);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user