Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benches/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition.workspace = true
license.workspace = true

[dependencies]
sym = { path = "../crates/sym" }
symbit = { path = "../crates/sym" }
pcode-ops = { path = "../crates/pcode-ops" }
symbolic-pcode = { path = "../crates/pcode" }

Expand Down
2 changes: 1 addition & 1 deletion benches/emulator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::time::Duration;

use criterion::{BatchSize, BenchmarkId, Criterion, criterion_group, criterion_main};
use pcode_ops::PcodeOps;
use sym::{SymbolicBitVec, SymbolicByte};
use symbit::{SymbolicBitVec, SymbolicByte};
use symbolic_pcode::emulator::{PcodeEmulator, StandardPcodeEmulator};
use symbolic_pcode::libsla::{
Address, AddressSpace, AddressSpaceId, AddressSpaceType, BoolOp, IntOp, IntSign, OpCode,
Expand Down
2 changes: 1 addition & 1 deletion crates/sym/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "sym"
name = "symbit"
description = "Symbolic representation of binary data"
version = "0.1.0"

Expand Down
2 changes: 1 addition & 1 deletion crates/sym/src/convert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl From<SymbolicBit> for SymbolicBitVec {
/// # Examples
///
/// ```
/// # use sym::{ConcreteValue, SymbolicBitBuf};
/// # use symbit::{ConcreteValue, SymbolicBitBuf};
/// let value = ConcreteValue::new(0xDEADBEEFu32);
/// let buf = SymbolicBitBuf::<32>::from(value);
/// assert_eq!(value, buf.try_into().unwrap());
Expand Down
4 changes: 2 additions & 2 deletions crates/sym/src/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ impl SymbolicBitVec {
/// # Unsigned Example
///
/// ```
/// # use sym::SymbolicBitVec;
/// # use symbit::SymbolicBitVec;
/// let x = SymbolicBitVec::constant(2, 4);
/// let y = SymbolicBitVec::constant(15, 4);
///
Expand All @@ -240,7 +240,7 @@ impl SymbolicBitVec {
/// # Signed Example
///
/// ```
/// # use sym::SymbolicBitVec;
/// # use symbit::SymbolicBitVec;
/// let x = SymbolicBitVec::constant(0x2, 4); // Positive 2
/// let y = SymbolicBitVec::constant(0xF, 4); // Negative 1
///
Expand Down
2 changes: 1 addition & 1 deletion tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition.workspace = true
aiger-circuit = "1"
symbolic-pcode = { path = "../crates/pcode" }
pcode-ops = { path = "../crates/pcode-ops" }
sym = { path = "../crates/sym" }
symbit = { path = "../crates/sym" }

[dev-dependencies]
flexi_logger = "0.31"
Expand Down
2 changes: 1 addition & 1 deletion tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::path::Path;
use std::sync::OnceLock;

use sleigh_config::{processor_aarch64, processor_x86};
use sym::{SymbolicBit, SymbolicBitVec, SymbolicByte};
use symbit::{SymbolicBit, SymbolicBitVec, SymbolicByte};
use symbolic_pcode::libsla::{self, Address, GhidraSleigh, Sleigh, VarnodeData};
use symbolic_pcode::mem::{GenericMemory, VarnodeDataStore};

Expand Down
2 changes: 1 addition & 1 deletion tests/hello_world/util.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use sym::SymbolicBitVec;
use symbit::SymbolicBitVec;
use symbolic_pcode::libsla::{Address, Sleigh, VarnodeData};
use symbolic_pcode::mem::VarnodeDataStore;

Expand Down
8 changes: 4 additions & 4 deletions tests/x86_64_emulator.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use pcode_ops::PcodeOps;
use sym::{self, Evaluator, SymbolicBitVec, VariableAssignments};
use symbit::{self, Evaluator, SymbolicBit, SymbolicBitVec, VariableAssignments};
use symbolic_pcode::{
arch::x86::processor::ProcessorHandlerX86,
emulator::StandardPcodeEmulator,
Expand Down Expand Up @@ -279,7 +279,7 @@ fn z3_integration() -> processor::Result<()> {
common::EXIT_IP_ADDR.into(),
)?;

let input_value = sym::SymbolicBitVec::with_size(32);
let input_value = SymbolicBitVec::with_size(32);

// Input register is EDI
let name = "EDI";
Expand Down Expand Up @@ -493,7 +493,7 @@ fn take_the_path_not_taken() -> processor::Result<()> {
)?;

// Create symbolic input
let input_value: [_; 32] = std::array::from_fn(sym::SymbolicBit::Variable);
let input_value: [_; 32] = std::array::from_fn(SymbolicBit::Variable);
let input_value = input_value.into_iter().collect();

// The test will emulate with a symbolic value. However if we encounter any branch that uses a
Expand Down Expand Up @@ -560,7 +560,7 @@ fn take_the_path_not_taken() -> processor::Result<()> {
let parent_path = branches
.into_iter()
.reduce(|x, y| x & y)
.unwrap_or(sym::TRUE);
.unwrap_or(symbit::TRUE);
let other_branch = parent_path & !last_branch;

// Solve with Z3
Expand Down