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

Rbpf v0.2.1 (#13732)

Browse Source 
* Refactoring to match rbpf-v0.2.1 and add JIT compilation caching.

* Removes obsolete bpf-trace.py which has been replaced by the rbpf CLI tool.
This commit is contained in:
Alexander Meißner
2020-11-24 18:00:19 +01:00
committed by GitHub
parent 32cb8d1462
commit c833ede4af
11 changed files with 833 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cli/src/cli.rs
View File

@ -9,7 +9,7 @@ use log::*;
use num_traits::FromPrimitive;
use serde_json::{self, json, Value};
use solana_account_decoder::{UiAccount, UiAccountEncoding};
use solana_bpf_loader_program::{bpf_verifier, BPFError};
use solana_bpf_loader_program::{bpf_verifier, BPFError, ThisInstructionMeter};
use solana_clap_utils::{
self,
commitment::commitment_arg_with_default,
@ -39,7 +39,7 @@ use solana_client::{
use solana_faucet::faucet::request_airdrop_transaction;
#[cfg(test)]
use solana_faucet::faucet_mock::request_airdrop_transaction;
use solana_rbpf::vm::Executable;
use solana_rbpf::vm::{Config, Executable};
use solana_remote_wallet::remote_wallet::RemoteWalletManager;
use solana_sdk::{
bpf_loader, bpf_loader_deprecated,
@ -1227,8 +1227,12 @@ fn do_process_deploy(
CliError::DynamicProgramError(format!("Unable to read program file: {}", err))
})?;
Executable::<BPFError>::from_elf(&program_data, Some(|x| bpf_verifier::check(x, false)))
.map_err(|err| CliError::DynamicProgramError(format!("ELF error: {}", err)))?;
Executable::<BPFError, ThisInstructionMeter>::from_elf(
&program_data,
Some(|x| bpf_verifier::check(x, false)),
Config::default(),
)
.map_err(|err| CliError::DynamicProgramError(format!("ELF error: {}", err)))?;
let loader_id = if use_deprecated_loader {
bpf_loader_deprecated::id()