Cleanup - Move tests into separate files

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: rbpf
+name: sbpf
 
 on:
   push:
@@ -31,7 +31,7 @@ jobs:
       run: |
         cargo fmt --all -- --check
         cargo clippy --all --tests -- --deny=warnings
-      if: matrix.rust == 'nightly'
+      if: matrix.rust == 'beta'
       shell: bash
     - name: Build and test
       run: |
@@ -45,7 +45,7 @@ jobs:
       run: |
         cargo fmt --all --manifest-path cli/Cargo.toml -- --check
         cargo clippy --all --tests --manifest-path cli/Cargo.toml -- --deny=warnings
-      if: matrix.rust == 'nightly'
+      if: matrix.rust == 'beta'
       shell: bash
     - name: CLI - Build and test
       run: |

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-name = "solana_rbpf"
-version = "0.8.2"
+name = "solana-sbpf"
+version = "0.9.0"
 description = "Virtual machine and JIT compiler for eBPF programs"
 authors = ["Solana Maintainers <[email protected]>"]
-repository = "https://github.com/solana-labs/rbpf"
+repository = "https://github.com/anza-xyz/sbpf"
 homepage = "https://solana.com/"
 keywords = ["BPF", "eBPF", "interpreter", "JIT", "filtering"]
 license = "Apache-2.0"

README.md

@@ -1,15 +1,13 @@
-# solana_rbpf
+# solana-sbpf
 
-![](misc/rbpf_256.png)
+SBPF virtual machine
 
-Rust (user-space) virtual machine for eBPF
-
-[![Build Status](https://github.com/solana-labs/rbpf/actions/workflows/main.yml/badge.svg)](https://github.com/solana-labs/rbpf/actions/workflows/main.yml)
-[![Crates.io](https://img.shields.io/crates/v/solana_rbpf.svg)](https://crates.io/crates/solana_rbpf)
+[![Build Status](https://github.com/anza-xyz/sbpf/actions/workflows/main.yml/badge.svg)](https://github.com/anza-xyz/sbpf/actions/workflows/main.yml)
+[![Crates.io](https://img.shields.io/crates/v/solana-sbpf.svg)](https://crates.io/crates/solana-sbpf)
 
 ## Description
 
-This is a fork of [RBPF](https://github.com/qmonnet/rbpf) by Quentin Monnet.
+This is a fork of [RBPF](https://github.com/solana-labs/rbpf) which in turn is a fork of [RBPF](https://github.com/qmonnet/rbpf) by Quentin Monnet.
 
 This crate contains a virtual machine for eBPF program execution. BPF, as in
 _Berkeley Packet Filter_, is an assembly-like language initially developed for
@@ -26,48 +24,48 @@ although the JIT-compiler does not work with Windows at this time.
 
 ## Link to the crate
 
-This crate is available from [crates.io](https://crates.io/crates/solana_rbpf),
+This crate is available from [crates.io](https://crates.io/crates/solana-sbpf),
 so it should work out of the box by adding it as a dependency in your
 `Cargo.toml` file:
 
 ```toml
 [dependencies]
-solana_rbpf = "0.8.2"
+solana-sbpf = "0.9.0"
 ```
 
 You can also use the development version from this GitHub repository. This
 should be as simple as putting this inside your `Cargo.toml`:
 
 ```toml
 [dependencies]
-solana_rbpf = { git = "https://github.com/solana-labs/rbpf", branch = "main" }
+solana-sbpf = { git = "https://github.com/anza-xyz/sbpf", branch = "main" }
 ```
 
 Of course, if you prefer, you can clone it locally, possibly hack the crate,
 and then indicate the path of your local version in `Cargo.toml`:
 
 ```toml
 [dependencies]
-solana_rbpf = { path = "path/to/solana_rbpf" }
+solana-sbpf = { path = "path/to/sbpf" }
 ```
 
 Then indicate in your source code that you want to use the crate:
 
 ```rust,ignore
-extern crate solana_rbpf;
+extern crate solana_sbpf;
 ```
 
 ## API
 
 The API is pretty well documented inside the source code. You should also be
 able to access [an online version of the documentation from
-here](https://docs.rs/solana_rbpf/), automatically generated from the
-[crates.io](https://crates.io/crates/solana_rbpf)
+here](https://docs.rs/solana-sbpf/), automatically generated from the
+[crates.io](https://crates.io/crates/solana-sbpf)
 version (may not be up-to-date with master branch).
 [Examples](examples), [unit tests](tests) and [performance benchmarks](benches)
 should also prove helpful.
 
-Here are the steps to follow to run an eBPF program with rbpf:
+Here are the steps to follow to run an SBPF:
 
 1. Create the config and a loader built-in program, add some functions.
 2. Create an executable, either from the bytecode or an ELF.
@@ -81,7 +79,7 @@ Here are the steps to follow to run an eBPF program with rbpf:
 ## Developer
 
 ### Dependencies
-- rustc version 1.72 or higher
+- rustc version 1.83 or higher
 
 ### Build and test instructions
 - To build run `cargo build`
@@ -90,7 +88,7 @@ Here are the steps to follow to run an eBPF program with rbpf:
 ## License
 
 Following the effort of the Rust language project itself in order to ease
-integration with other projects, the rbpf crate is distributed under the terms
+integration with other projects, the sbpf crate is distributed under the terms
 of both the MIT license and the Apache License (Version 2.0).
 
 See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) for details.

benches/elf_loader.rs

@@ -6,11 +6,11 @@
 
 #![feature(test)]
 
-extern crate solana_rbpf;
+extern crate solana_sbpf;
 extern crate test;
 extern crate test_utils;
 
-use solana_rbpf::{
+use solana_sbpf::{
     elf::Executable,
     program::{BuiltinFunction, BuiltinProgram, FunctionRegistry},
     syscalls,

benches/jit_compile.rs

@@ -6,10 +6,10 @@
 
 #![feature(test)]
 
-extern crate solana_rbpf;
+extern crate solana_sbpf;
 extern crate test;
 
-use solana_rbpf::{
+use solana_sbpf::{
     elf::Executable, program::BuiltinProgram, verifier::RequisiteVerifier, vm::TestContextObject,
 };
 use std::{fs::File, io::Read, sync::Arc};

benches/memory_mapping.rs

@@ -7,11 +7,11 @@
 #![feature(test)]
 
 extern crate rand;
-extern crate solana_rbpf;
+extern crate solana_sbpf;
 extern crate test;
 
 use rand::{rngs::SmallRng, Rng, SeedableRng};
-use solana_rbpf::{
+use solana_sbpf::{
     memory_region::{
         AccessType, AlignedMemoryMapping, MemoryRegion, MemoryState, UnalignedMemoryMapping,
     },

benches/vm_execution.rs

@@ -6,17 +6,17 @@
 
 #![feature(test)]
 
-extern crate solana_rbpf;
+extern crate solana_sbpf;
 extern crate test;
 
 #[cfg(all(feature = "jit", not(target_os = "windows"), target_arch = "x86_64"))]
-use solana_rbpf::{
+use solana_sbpf::{
     ebpf,
     memory_region::MemoryRegion,
     program::{FunctionRegistry, SBPFVersion},
     vm::Config,
 };
-use solana_rbpf::{
+use solana_sbpf::{
     elf::Executable, program::BuiltinProgram, verifier::RequisiteVerifier, vm::TestContextObject,
 };
 use std::{fs::File, io::Read, sync::Arc};
@@ -83,7 +83,7 @@ fn bench_jit_vs_interpreter(
     instruction_meter: u64,
     mem: &mut [u8],
 ) {
-    let mut executable = solana_rbpf::assembler::assemble::<TestContextObject>(
+    let mut executable = solana_sbpf::assembler::assemble::<TestContextObject>(
         assembly,
         Arc::new(BuiltinProgram::new_loader(
             config,

cli/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
-name = "rbpf_cli"
-version = "0.8.2"
+name = "sbpf_cli"
+version = "0.9.0"
 description = "CLI to test and analyze eBPF programs"
 authors = ["Solana Maintainers <[email protected]>"]
-repository = "https://github.com/solana-labs/rbpf"
+repository = "https://github.com/anza-xyz/sbpf"
 homepage = "https://solana.com/"
 keywords = ["BPF", "eBPF", "interpreter", "JIT"]
 edition = "2018"
 
 [dependencies]
-solana_rbpf = { path = "../", features = ["debugger"] }
+solana-sbpf = { path = "../", features = ["debugger"] }
 test_utils = { path = "../test_utils/" }
 clap = "3.0.0-beta.2"

cli/src/main.rs

@@ -1,5 +1,5 @@
 use clap::{crate_version, App, Arg};
-use solana_rbpf::{
+use solana_sbpf::{
     aligned_memory::AlignedMemory,
     assembler::assemble,
     ebpf,

doc/bytecode.md

@@ -114,7 +114,7 @@ The following Rust equivalents assume that:
 | `9C` / `01111001`  | from v2     | `ldxdw dst, [src + off]`
 | `A4` / `10100100`  | all         | `xor32 dst, imm`       | `dst = (dst as u32).xor(imm) as u64`
 | `AC` / `10101100`  | all         | `xor32 dst, src`       | `dst = (dst as u32).xor(src as u32) as u64`
-| `B4` / `10110100`  | all         | `mov32 dst, imm`       | `dst = imm as i32 as i64 as u64`
+| `B4` / `10110100`  | all         | `mov32 dst, imm`       | `dst = imm as u64`
 | `BC` / `10111100`  | until v2    | `mov32 dst, src`       | `dst = src as u32 as u64`
 | `BC` / `10111100`  | from v2     | `mov32 dst, src`       | `dst = src as i32 as i64 as u64`
 | `C4` / `11000100`  | all         | `ash32 dst, imm`       | `dst = (dst as i32).wrapping_shr(imm) as u32 as u64`
@@ -158,7 +158,7 @@ The following Rust equivalents assume that:
 | `9F` / `01111011`  | from v2     | `stxdw [dst + off], src`
 | `A7` / `10100111`  | all         | `xor64 dst, imm`   | `dst = dst.xor(imm)`
 | `AF` / `10101111`  | all         | `xor64 dst, src`   | `dst = dst.xor(src)`
-| `B7` / `10110111`  | all         | `mov64 dst, imm`   | `dst = imm as u64`
+| `B7` / `10110111`  | all         | `mov64 dst, imm`   | `dst = imm as i32 as i64 as u64`
 | `BF` / `10111111`  | all         | `mov64 dst, src`   | `dst = src`
 | `C7` / `11000111`  | all         | `ash64 dst, imm`   | `dst = (dst as i64).wrapping_shr(imm)`
 | `CF` / `11001111`  | all         | `ash64 dst, src`   | `dst = (dst as i64).wrapping_shr(src as u32)`

examples/disassemble.rs

@@ -4,8 +4,8 @@
 // the MIT license <http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 
-extern crate solana_rbpf;
-use solana_rbpf::{
+extern crate solana_sbpf;
+use solana_sbpf::{
     elf::Executable,
     program::{BuiltinProgram, FunctionRegistry, SBPFVersion},
     static_analysis::Analysis,

examples/to_json.rs

@@ -10,8 +10,8 @@ extern crate json;
 extern crate elf;
 use std::path::PathBuf;
 
-extern crate solana_rbpf;
-use solana_rbpf::{
+extern crate solana_sbpf;
+use solana_sbpf::{
     elf::Executable,
     program::{BuiltinProgram, FunctionRegistry, SBPFVersion},
     static_analysis::Analysis,

fuzz/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "solana_rbpf-fuzz"
-version = "0.8.2"
+name = "solana-sbpf-fuzz"
+version = "0.9.0"
 authors = ["Automatically generated"]
 publish = false
 edition = "2018"
@@ -15,7 +15,7 @@ num-traits = "0.2"
 rayon = "1.5"
 test_utils = { path = "../test_utils/" }
 
-[dependencies.solana_rbpf]
+[dependencies.solana-sbpf]
 path = ".."
 features = ["fuzzer-not-safe-for-production"]