unspeaker/vestal
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/vestal.git synced 2025-12-07 08:26:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

alignment; more verbose error log

Browse source
This commit is contained in:
🪞👃🪞 2025-02-24 15:50:51 +02:00
parent 830e75db19
commit 32a693e1c4
5 changed files with 59 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/vestal/src/call_sites.rs
View file

@ -173,7 +173,7 @@ impl CallSite {
_ => {}
},
0xff => match opcodes[1] {
0x10 | 0x12 | 0x13 |
0x10 | 0x12 | 0x13 | 0x16 |
0x50 | 0x51 | 0x52 | 0x53 | 0x54 | 0x55 | 0x56 | 0x57 |
0x60 | 0x90 | 0x92 | 0x93 | 0x94 | 0x97 => return true,
_ => {}

8
crates/vestal/src/imports.rs
View file

@ -6,9 +6,13 @@ impl Module {
println!(" {DIM}(load-imports){RESET}");
}
let pe = self.pe.clone();
let directory = ImportDirectory::parse(pe.as_ref())?;
let directory = ImportDirectory::parse(pe.as_ref());
if let Err(e) = directory {
println!("failed to parse import directory of {}: {e:?}", &self.name);
return Ok(self)
}
let mut new_modules = vec![];
for descriptor in directory.descriptors.iter() {
for descriptor in directory.unwrap().descriptors.iter() {
let (module_name, imports) = Self::parse_import(pe.as_ref(), descriptor)?;
let create = !self.namespace.read().unwrap().contains_key(&module_name);
if create {

44
crates/vestal/src/main.rs
View file

@ -75,13 +75,18 @@ fn main () -> Usually<()> {
// Parse command line arguments.
let args = cli().get_matches();
if let Some(path) = args.get_one::<PathBuf>("path") {
Arc::new(Module::from_path(path, *(args.get_one::<bool>("verbose").unwrap_or(&false)))?)
Module::from_path(path, *(args.get_one::<bool>("verbose").unwrap_or(&false)))
.map(Arc::new)
.unwrap_or_else(|e|panic!("failed to open: {e:?}"))
.search(std::env::current_dir()?)
.search(canonicalize(path.clone().parent().expect("invalid parent path"))?)
.search("/home/user/Lab/Cosmo/wineprefix/drive_c/windows/system32")
.load(true)?
.resolve(true)?
.relink()?;
.load(true)
.unwrap_or_else(|e|panic!("failed to load: {e:?}"))
.resolve(true)
.unwrap_or_else(|e|panic!("failed to resolve: {e:?}"))
.relink()
.unwrap_or_else(|e|panic!("failed to relink: {e:?}"));
} else {
println!("Pass a path to a VST DLL");
}
@ -99,7 +104,6 @@ impl Module {
let (code, code_start, code_size) = read_code(&pe)?;
Ok(Self {
bang,
name: to_dll_name(&path),
path: path.as_ref().to_path_buf().into(),
code,
code_start,
@ -114,6 +118,11 @@ impl Module {
call_sites: Default::default(),
pe,
verbose,
name: Arc::from(path.as_ref()
.file_name()
.expect("no file name")
.to_str()
.expect("non-unicode filename")),
})
}
/// Add a search path
@ -138,7 +147,8 @@ impl Module {
}
/// Load the dependency tree reachable from this module.
fn load (self: Arc<Self>, recurse: bool) -> Usually<Arc<Self>> {
let module = self.load_exports()?.load_imports(recurse)?;
let module = self.load_exports()?;
let module = module.load_imports(recurse)?;
if module.verbose {
println!("{:?}", &module);
}
@ -192,14 +202,6 @@ impl Module {
}
}
fn to_dll_name (path: &impl AsRef<Path>) -> Arc<str> {
Arc::from(path.as_ref()
.file_name()
.expect("no file name")
.to_str()
.expect("non-unicode filename"))
}
fn read_pe (path: &impl AsRef<Path>) -> Usually<(Arc<VecPE>, Arc<[u8]>, Arc<[u8]>)> {
let (bang, data) = crate::bang::slice_shebang(read(path.as_ref())?.as_slice());
let pe = Arc::new(VecPE::from_disk_data(data.clone()));
@ -207,11 +209,15 @@ fn read_pe (path: &impl AsRef<Path>) -> Usually<(Arc<VecPE>, Arc<[u8]>, Arc<[u8]
}
fn read_code (pe: &VecPE) -> Usually<(Arc<[u8]>, usize, usize)> {
let code = pe.get_section_by_name(".text")?;
let start = code.pointer_to_raw_data.0 as usize;
let size = code.size_of_raw_data as usize;
let text = &pe.as_slice()[start..start+size];
Ok((text.into(), start, size))
if let Ok(code) = pe.get_section_by_name(".text") {
let code = pe.get_section_by_name(".text")?;
let start = code.pointer_to_raw_data.0 as usize;
let size = code.size_of_raw_data as usize;
let text = &pe.as_slice()[start..start+size];
Ok((text.into(), start, size))
} else {
Ok(([].into(), 0, 0))
}
}
fn base_of_code (pe: &VecPE) -> Usually<u32> {

37
crates/vestal/src/show.rs
View file

@ -46,12 +46,7 @@ impl Log {
depth: Option<usize>,
) {
if show {
if let Some(depth) = depth {
for i in 0..depth {
print!(" ");
}
}
call.show(opcodes);
call.show(depth.unwrap_or(0), opcodes);
}
}
pub fn call_sites (
@ -61,19 +56,14 @@ impl Log {
depth: Option<usize>
) {
for (target, call_sites) in targets.iter() {
if let Some(depth) = depth {
for i in 0..depth {
print!(" ");
}
}
//if let Some(depth) = depth {
//for i in 0..depth {
//print!(" ");
//}
//}
//println!(" (call {:15} {})", name.as_ref(), fmt_num(*target as usize));
for call_site in call_sites.iter() {
if let Some(depth) = depth {
for i in 0..depth {
print!(" ");
}
}
call_site.show(None);
call_site.show(depth.unwrap_or(0), None);
}
}
}
@ -184,14 +174,17 @@ impl Module {
print!("{output}");
}
}
impl CallSite {
pub fn show (&self, opcodes: Option<&[u8]>) {
pub fn show (&self, depth: usize, opcodes: Option<&[u8]>) {
let mut call = String::new();
for i in 0..depth {
write!(&mut call, " ");
}
let label = self.caller.imports.read().unwrap().get(&self.target)
.map(|(module, method)|format!("{GREEN}{module}::{method}{RESET}"))
.map(|(module, method)|format!("{GREEN}{}{module}::{method}{RESET}", if depth > 0 { DIM } else { "" }))
.unwrap_or_else(||format!("{RED}unresolved{RESET}"));
println!(" {DIM}╰->{RESET} (call {:15} {} {} {DIM}{:20}{RESET} {} {BOLD}{}{RESET})",
&self.caller.name,
write!(&mut call, "{DIM}╰->{RESET} (call {}", &self.caller.name);
println!("{call:40} {} {} {DIM}{:20}{RESET} {} {BOLD}{}{RESET})",
fmt_num(self.offset as usize),
fmt_num(self.source as usize),
fmt_bytes(opcodes.unwrap_or(&[])),