diff --git a/src/svm/elf.zig b/src/svm/elf.zig index 05e273191..92993b7a8 100644 --- a/src/svm/elf.zig +++ b/src/svm/elf.zig @@ -483,7 +483,7 @@ pub const Elf = struct { for (instructions, 0..) |inst, i| { if (inst.opcode == .call_imm and inst.imm != ~@as(u32, 0) and - !(version.usesStaticSyscalls() and inst.src == .r0)) + !(version.enableStaticSyscalls() and inst.src == .r0)) { const target_pc = @as(i64, @intCast(i)) +| @as(i32, @bitCast(inst.imm)) +| 1; if (target_pc < 0 or target_pc >= instructions.len) diff --git a/src/svm/executable.zig b/src/svm/executable.zig index 268ce8812..1771a28c5 100644 --- a/src/svm/executable.zig +++ b/src/svm/executable.zig @@ -515,6 +515,7 @@ pub const Config = struct { minimum_version: sbpf.SBPFVersion = .v2, stack_frame_size: u64 = 4096, max_call_depth: u64 = 64, + pub fn stackSize(config: Config) u64 { return config.stack_frame_size * config.max_call_depth; } diff --git a/src/svm/sbpf.zig b/src/svm/sbpf.zig index 46b240cb0..a94bdbfd5 100644 --- a/src/svm/sbpf.zig +++ b/src/svm/sbpf.zig @@ -21,10 +21,6 @@ pub const SBPFVersion = enum { // v3, // reserved, - pub fn usesStaticSyscalls(version: SBPFVersion) bool { - return version != .v1; - } - pub fn enableDynamicStackFrames(version: SBPFVersion) bool { return version != .v1; }