implements PR-O2.2

This commit is contained in:
2026-03-24 13:42:26 +00:00
parent 5f78df750d
commit 804fc27959
7 changed files with 257 additions and 2 deletions
@@ -11,4 +11,5 @@ public enum BytecodeMarshalingErrorCode {
MARSHAL_VERIFY_PRECHECK_EXPORT_FUNC_INDEX_INVALID,
MARSHAL_VERIFY_PRECHECK_HOSTCALL_INDEX_INVALID,
MARSHAL_VERIFY_PRECHECK_TRUNCATED_INSTRUCTION,
MARSHAL_VERIFY_PRECHECK_UNTERMINATED_FUNCTION,
}
@@ -0,0 +1,67 @@
package p.studio.compiler.backend.bytecode;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Set;
public class BytecodePreloadVerifierService {
private static final Set<Integer> TERMINATORS = Set.of(0x01, 0x02, 0x51);
public void verify(final BytecodeModule module) {
final var input = module == null ? BytecodeModule.empty() : module;
for (final var function : input.functions()) {
verifyFunction(input.code(), function);
}
}
private void verifyFunction(final byte[] code, final BytecodeModule.FunctionMeta function) {
final var start = function.codeOffset();
final var end = start + function.codeLen();
if (end <= start) {
return;
}
var pc = start;
var lastOpcode = -1;
while (pc < end) {
if (pc + 2 > end) {
throw new BytecodeMarshalingException(
BytecodeMarshalingErrorCode.MARSHAL_VERIFY_PRECHECK_TRUNCATED_INSTRUCTION,
"truncated opcode in function at pc=" + pc);
}
final var opcode = readU16(code, pc);
if (opcode == 0x70) {
throw new BytecodeMarshalingException(
BytecodeMarshalingErrorCode.MARSHAL_LINKAGE_RAW_SYSCALL_IN_PRELOAD,
"raw syscall is forbidden in pre-load artifact");
}
final var size = sizeForOpcode(opcode);
if (pc + size > end) {
throw new BytecodeMarshalingException(
BytecodeMarshalingErrorCode.MARSHAL_VERIFY_PRECHECK_TRUNCATED_INSTRUCTION,
"truncated instruction in function at pc=" + pc);
}
lastOpcode = opcode;
pc += size;
}
if (!TERMINATORS.contains(lastOpcode)) {
throw new BytecodeMarshalingException(
BytecodeMarshalingErrorCode.MARSHAL_VERIFY_PRECHECK_UNTERMINATED_FUNCTION,
"function ends without terminator opcode");
}
}
private int sizeForOpcode(final int opcode) {
return switch (opcode) {
case 0x50, 0x70, 0x71, 0x72, 0x02, 0x03, 0x04, 0x10, 0x18, 0x40, 0x41, 0x42, 0x43, 0x56 -> 6;
case 0x14, 0x15, 0x52, 0x54 -> 10;
case 0x16 -> 3;
default -> 2;
};
}
private int readU16(final byte[] code, final int offset) {
return ByteBuffer.wrap(code, offset, 2).order(ByteOrder.LITTLE_ENDIAN).getShort() & 0xFFFF;
}
}
@@ -22,7 +22,8 @@ public class BuilderPipelineService {
new LowerToIRVMPipelineStage(),
new OptimizeIRVMPipelineStage(),
new EmitBytecodePipelineStage(),
new LinkBytecodePipelineStage()
new LinkBytecodePipelineStage(),
new VerifyBytecodePipelineStage()
);
INSTANCE = new BuilderPipelineService(stages);
}
@@ -0,0 +1,48 @@
package p.studio.compiler.workspaces.stages;
import lombok.extern.slf4j.Slf4j;
import p.studio.compiler.backend.bytecode.BytecodeMarshalingException;
import p.studio.compiler.backend.bytecode.BytecodePreloadVerifierService;
import p.studio.compiler.messages.BuildingIssueSink;
import p.studio.compiler.models.BuilderPipelineContext;
import p.studio.compiler.workspaces.PipelineStage;
import p.studio.utilities.logs.LogAggregator;
@Slf4j
public class VerifyBytecodePipelineStage implements PipelineStage {
private final BytecodePreloadVerifierService verifierService;
public VerifyBytecodePipelineStage() {
this(new BytecodePreloadVerifierService());
}
VerifyBytecodePipelineStage(final BytecodePreloadVerifierService verifierService) {
this.verifierService = verifierService;
}
@Override
public BuildingIssueSink run(BuilderPipelineContext ctx, LogAggregator logs) {
if (ctx.bytecodeModule == null) {
return BuildingIssueSink.empty()
.report(builder -> builder
.error(true)
.phase("BACKEND_VERIFY_PRELOAD")
.code("MARSHAL_FORMAT_STAGE_INPUT_MISSING")
.message("[BUILD]: bytecode module is missing before VerifyBytecode stage"));
}
try {
verifierService.verify(ctx.bytecodeModule);
} catch (BytecodeMarshalingException e) {
return BuildingIssueSink.empty()
.report(builder -> builder
.error(true)
.phase("BACKEND_VERIFY_PRELOAD")
.code(e.code().name())
.message("[BUILD]: preload verifier failed: " + e.getMessage())
.exception(e));
}
return BuildingIssueSink.empty();
}
}