|
@@ -16,6 +16,7 @@ fn _unwind(a: u64, _b: u64, _c: u64, _d: u64, _e: u64) -> u64
|
|
fn main() {
|
|
fn main() {
|
|
let mut args: Vec<String> = std::env::args().collect();
|
|
let mut args: Vec<String> = std::env::args().collect();
|
|
let mut jit : bool = false;
|
|
let mut jit : bool = false;
|
|
|
|
+ let mut cranelift : bool = false;
|
|
let mut program_text = String::new();
|
|
let mut program_text = String::new();
|
|
let mut memory_text = String::new();
|
|
let mut memory_text = String::new();
|
|
|
|
|
|
@@ -32,20 +33,29 @@ fn main() {
|
|
// Process the rest of the arguments.
|
|
// Process the rest of the arguments.
|
|
while !args.is_empty() {
|
|
while !args.is_empty() {
|
|
match args[0].as_str() {
|
|
match args[0].as_str() {
|
|
- "--help" => {
|
|
|
|
|
|
+ "--help" => {
|
|
println!("Usage: rbpf_plugin [memory] < program");
|
|
println!("Usage: rbpf_plugin [memory] < program");
|
|
return;
|
|
return;
|
|
},
|
|
},
|
|
- "--jit" => {
|
|
|
|
|
|
+ "--jit" => {
|
|
#[cfg(windows)] {
|
|
#[cfg(windows)] {
|
|
println!("JIT not supported on Windows");
|
|
println!("JIT not supported on Windows");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
#[cfg(not(windows))] {
|
|
#[cfg(not(windows))] {
|
|
- jit = true;
|
|
|
|
|
|
+ jit = true;
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- "--program" => {
|
|
|
|
|
|
+ "--cranelift" => {
|
|
|
|
+ cranelift = true;
|
|
|
|
+
|
|
|
|
+ #[cfg(not(feature = "cranelift"))] {
|
|
|
|
+ let _ = cranelift;
|
|
|
|
+ println!("Cranelift is not enabled");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ "--program" => {
|
|
if args.len() < 2 {
|
|
if args.len() < 2 {
|
|
println!("Missing argument to --program");
|
|
println!("Missing argument to --program");
|
|
return;
|
|
return;
|
|
@@ -88,11 +98,19 @@ fn main() {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
#[cfg(not(windows))] {
|
|
#[cfg(not(windows))] {
|
|
- unsafe {
|
|
|
|
|
|
+ unsafe {
|
|
vm.jit_compile().unwrap();
|
|
vm.jit_compile().unwrap();
|
|
result = vm.execute_program_jit(&mut memory).unwrap();
|
|
result = vm.execute_program_jit(&mut memory).unwrap();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } else if cranelift {
|
|
|
|
+ #[cfg(not(feature = "cranelift"))] {
|
|
|
|
+ println!("Cranelift is not enabled");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ #[cfg(feature = "cranelift")] {
|
|
|
|
+ result = vm.execute_cranelift(&mut memory).unwrap();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
result = vm.execute_program(&mut memory).unwrap();
|
|
result = vm.execute_program(&mut memory).unwrap();
|