gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull in latest rBPF that includes Rust dependent changes (#2929)

Browse Source
This commit is contained in:
Jack May
2019-02-25 12:42:48 -08:00
committed by GitHub
parent 0b37f530ae
commit 2be7896157
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
programs/native/bpf_loader/Cargo.toml
View File

@@ -18,7 +18,7 @@ byteorder = "1.3.1"
elf = "0.0.10"
libc = "0.2.49"
log = "0.4.2"
solana_rbpf = "=0.1.9"
solana_rbpf = "=0.1.10"
serde = "1.0.88"
solana-logger = { path = "../../../logger", version = "0.12.0" }
solana-sdk = { path = "../../../sdk", version = "0.12.0" }

4
programs/native/bpf_loader/src/bpf_verifier.rs
View File

@@ -298,8 +298,8 @@ pub fn check(prog: &[u8]) -> Result<(), Error> {
ebpf::JSLE_REG => {
check_jmp_offset(prog, insn_ptr)?;
}
ebpf::CALL => {}
ebpf::TAIL_CALL => unimplemented!(),
ebpf::CALL_IMM => {}
ebpf::CALL_REG => {}
ebpf::EXIT => {}
_ => {

2
programs/native/bpf_loader/src/lib.rs
View File

@@ -80,7 +80,7 @@ pub fn helper_sol_log_u64(arg1: u64, arg2: u64, arg3: u64, arg4: u64, arg5: u64)
pub fn create_vm(prog: &[u8]) -> Result<EbpfVmRaw, Error> {
let mut vm = EbpfVmRaw::new(None)?;
vm.set_verifier(bpf_verifier::check)?;
vm.set_max_instruction_count(36000)?; // 36000 is a wag, need to tune
vm.set_max_instruction_count(36000)?; // TODO 36000 is a wag, need to tune
vm.set_elf(&prog)?;
vm.register_helper_ex("sol_log", Some(helper_sol_log_verify), helper_sol_log)?;
vm.register_helper_ex("sol_log_", Some(helper_sol_log_verify), helper_sol_log)?;