Skip to content

Commit

Permalink
Merge pull request #14 from ejrgilbert/task/reorganize_code
Browse files Browse the repository at this point in the history 
Task/reorganize code
  • Loading branch information
@ejrgilbert
ejrgilbert authored May 3, 2024
2 parents a30efe1 + 92a196e commit 2fc8c13
Show file tree
Hide file tree
Showing 12 changed files with 283 additions and 273 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/rust.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: plinioh/[email protected]
with:
binaryName: wasm2wat
binaryUrl: https://github.com/WebAssembly/wabt/releases/download/1.0.34/wabt-1.0.34-ubuntu.tar.gz
binaryPathInArchive: wabt-1.0.34/bin/wasm2wat
- name: Build
run: cargo build --verbose
- name: Run tests
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ cargo test -- --nocapture # With stdout tracing

To run project (there are example Whammys in `tests/whammys` folder):
```shell
cargo run -- --app <path_to_app_wasm> --mm <path_to_whammy> <path_for_compiled_output>
cargo run -- --app <path_to_app_wasm> --whammy <path_to_whammy> <path_for_compiled_output>
```

To specify log level:
```shell
RUST_LOG={ error | warn | info | debug | trace | off } cargo run -- --app <path_to_app_wasm> --mm <path_to_whammy> <path_for_compiled_output>
RUST_LOG={ error | warn | info | debug | trace | off } cargo run -- --app <path_to_app_wasm> --whammy <path_to_whammy> <path_for_compiled_output>
```
103 changes: 44 additions & 59 deletions src/generator/emitters.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,13 @@ fn emit_stmt(table: &mut SymbolTable, module_data: &mut ModuleData, mem_id: &Mem
} else {
is_success &= emit_expr(table, module_data, mem_id, curr_mem_offset, expr, instr_builder, index);

if let Expr::VarId { name } = var_id {
return if let Expr::VarId { name } = var_id {
let var_rec_id = match table.lookup(name) {
Some(rec_id) => rec_id.clone(),
_ => {
error!("VarId '{}' does not exist in this scope!", name);
return false;
is_success &= false;
return is_success
}
};
match table.get_record_mut(&var_rec_id) {
Expand All @@ -123,20 +124,23 @@ fn emit_stmt(table: &mut SymbolTable, module_data: &mut ModuleData, mem_id: &Mem
unimplemented!()
}
}
true
is_success
},
Some(ty) => {
error!("Incorrect variable record, expected Record::Var, found: {:?}", ty);
false
is_success &= false;
is_success
},
None => {
error!("Variable symbol does not exist!");
false
is_success &= false;
is_success
}
}
} else {
error!("Expected VarId.");
false
is_success &= false;
is_success
}
}
}
Expand Down Expand Up @@ -376,7 +380,7 @@ fn emit_op(op: &Op, instr_builder: &mut InstrSeqBuilder, index: &mut usize) -> b
}
}

fn emit_datatype(_datatype: &DataType, _instr_builder: &InstrSeqBuilder, _index: &mut usize) -> bool {
fn _emit_datatype(_datatype: &DataType, _instr_builder: &InstrSeqBuilder, _index: &mut usize) -> bool {
// don't think i actually need this
false
}
Expand Down Expand Up @@ -555,7 +559,7 @@ impl WasmRewritingEmitter {
}

for (function_name, ProbeLoc {positions}) in probe_locs.iter() {
for (func_name, func_id, instr_seq_id, index, instr) in positions.iter() {
for (_func_name, func_id, instr_seq_id, index, instr) in positions.iter() {
// if let Some(name) = func_name.as_ref() {
// if name.contains("CallFuture$LT") {
// println!("Possibly injecting probes for {name}");
Expand All @@ -573,6 +577,16 @@ impl WasmRewritingEmitter {
is_success
}

fn override_var_val(&mut self, rec_id: &usize, val: Option<Value>) {
let mut rec = self.table.get_record_mut(&rec_id);
match &mut rec {
Some(Record::Var { value, .. }) => {
*value = val;
}
_ => {}
}
}

fn preprocess_instr(&mut self, instr: &Instr, function: &mut Function) -> Option<Vec<ValType>> {
if function.name.to_lowercase() == "call" {
if let Instr::Call(func) = &instr {
Expand Down Expand Up @@ -613,17 +627,11 @@ impl WasmRewritingEmitter {
return Some(params);
}
};
let mut rec = self.table.get_record_mut(&rec_id);
match &mut rec {
Some(Record::Var { value, .. }) => {
*value = Some(Value::Str {
ty: DataType::Str,
val: func_kind.to_string(),
addr: None
});
}
_ => {}
}
self.override_var_val(&rec_id, Some(Value::Str {
ty: DataType::Str,
val: func_kind.to_string(),
addr: None
}));

let tuple = function.globals.get_mut("target_fn_type").unwrap();
tuple.2 = Some(Value::Str {
Expand All @@ -639,17 +647,12 @@ impl WasmRewritingEmitter {
return Some(params);
}
};
let mut rec = self.table.get_record_mut(&rec_id);
match &mut rec {
Some(Record::Var { value, .. }) => {
*value = Some(Value::Str {
ty: DataType::Str,
val: module.clone(),
addr: None
});
}
_ => {}
}
self.override_var_val(&rec_id, Some(Value::Str {
ty: DataType::Str,
val: module.clone(),
addr: None
}));

let tuple = function.globals.get_mut("target_imp_module").unwrap();
tuple.2 = Some(Value::Str {
ty: DataType::Str,
Expand All @@ -664,17 +667,12 @@ impl WasmRewritingEmitter {
return Some(params);
}
};
let mut rec = self.table.get_record_mut(&rec_id);
match &mut rec {
Some(Record::Var { value, .. }) => {
*value = Some(Value::Str {
ty: DataType::Str,
val: name.clone(),
addr: None
});
}
_ => {}
}
self.override_var_val(&rec_id, Some(Value::Str {
ty: DataType::Str,
val: name.clone(),
addr: None
}));

let tuple = function.globals.get_mut("target_imp_name").unwrap();
tuple.2 = Some(Value::Str {
ty: DataType::Str,
Expand Down Expand Up @@ -956,7 +954,7 @@ impl WasmRewritingEmitter {
}

/// Returns the InstrSeqId of the `then` block
fn emit_alt_body(&mut self, function_name: &String, probe: &mut Probe, emitted_params: &Option<Vec<(String, usize)>>, mem_id: &MemoryId, curr_mem_offset: &mut u32, func_id: FunctionId,
fn emit_alt_body(&mut self, _function_name: &String, probe: &mut Probe, _emitted_params: &Option<Vec<(String, usize)>>, mem_id: &MemoryId, curr_mem_offset: &mut u32, func_id: FunctionId,
instr_seq_id: &InstrSeqId, index: &mut usize) -> (InstrSeqId, usize, InstrSeqId, usize) {
let mut is_success = true;

Expand Down Expand Up @@ -1026,28 +1024,15 @@ impl WasmRewritingEmitter {
};

if let Some(f_call_id) = func_call_id {
// we need to inject an alternate call to the specified fn name!
// replace the arguments
self.emit_params(&emitted_params, func_id, &instr_seq_id, index);

// This MUST be `self.app_wasm` so we're mutating what will be the instrumented application.
let func = self.app_wasm.funcs.get_mut(func_id).kind.unwrap_local_mut();
let func_builder = func.builder_mut();
let mut instr_seq = func_builder.instr_seq(*instr_seq_id);

// we need to inject an alternate call to the specified fn name!
// replace the arguments
if let Some(params) = emitted_params {
for (_param_name, param_rec_id) in params.iter() {
let param_rec = self.table.get_record_mut(&param_rec_id);
if let Some(Record::Var { addr: Some(VarAddr::Local {addr}), .. }) = param_rec {
instr_seq.instr_at(*index, walrus::ir::LocalGet {
local: addr.clone()
});
*index += 1;
} else {
error!("Could not inject alternate call to function, something went wrong...");
exit(1);
}
}
}

// inject call
instr_seq.instr_at(*index, walrus::ir::Call {
func: f_call_id.clone()
Expand Down
4 changes: 2 additions & 2 deletions src/generator/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ fn assert_simplified_predicate(pred: &Expr) {
fn basic_run(script: &str) {
match tests::get_ast(script) {
Some(whamm) => {
let mut table = verifier::verify(&whamm);
let mut table = verifier::verify(&whamm, false);
table.reset();

let pred = get_pred(&whamm);
Expand Down Expand Up @@ -210,7 +210,7 @@ wasm::call:alt /

match tests::get_ast(script) {
Some(whamm) => {
let mut table = verifier::verify(&whamm);
let mut table = verifier::verify(&whamm, false);
table.reset();

let pred = get_pred(&whamm);
Expand Down
Loading

0 comments on commit 2fc8c13

Please sign in to comment.