Adds EbpfVm::invoke_function().

solana-labs · Oct 12, 2023 · c41b8aa · c41b8aa
1 parent 47f57fa
commit c41b8aa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/src/interpreter.rs b/src/interpreter.rs
@@ -16,7 +16,7 @@ use crate::{
     ebpf::{self, STACK_PTR_REG},
     elf::Executable,
     error::{EbpfError, ProgramResult},
-    vm::{get_runtime_environment_key, Config, ContextObject, EbpfVm},
+    vm::{Config, ContextObject, EbpfVm},
 };
 
 /// Virtual memory operation helper.
@@ -475,14 +475,8 @@ impl<'a, 'b, C: ContextObject> Interpreter<'a, 'b, C> {
                         resolved = true;
 
                         self.vm.due_insn_count = self.vm.previous_instruction_meter - self.vm.due_insn_count;
-                        function(
-                            unsafe { (self.vm as *mut _ as *mut u64).offset(get_runtime_environment_key() as isize) as *mut _ },
-                            self.reg[1],
-                            self.reg[2],
-                            self.reg[3],
-                            self.reg[4],
-                            self.reg[5],
-                        );
+                        self.vm.registers[0..6].copy_from_slice(&self.reg[0..6]);
+                        self.vm.invoke_function(function);
                         self.vm.due_insn_count = 0;
                         self.reg[0] = match &self.vm.program_result {
                             ProgramResult::Ok(value) => *value,

diff --git a/src/vm.rs b/src/vm.rs
@@ -18,7 +18,7 @@ use crate::{
     error::{EbpfError, ProgramResult},
     interpreter::Interpreter,
     memory_region::MemoryMapping,
-    program::{BuiltinProgram, FunctionRegistry, SBPFVersion},
+    program::{BuiltinFunction, BuiltinProgram, FunctionRegistry, SBPFVersion},
     static_analysis::{Analysis, TraceLogEntry},
 };
 use rand::Rng;
@@ -421,4 +421,19 @@ impl<'a, C: ContextObject> EbpfVm<'a, C> {
         std::mem::swap(&mut result, &mut self.program_result);
         (instruction_count, result)
     }
+
+    /// Invokes a built-in function
+    pub fn invoke_function(&mut self, function: BuiltinFunction<C>) {
+        function(
+            unsafe {
+                (self as *mut _ as *mut u64).offset(get_runtime_environment_key() as isize)
+                    as *mut _
+            },
+            self.registers[1],
+            self.registers[2],
+            self.registers[3],
+            self.registers[4],
+            self.registers[5],
+        );
+    }
 }