randrews/vulcan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This works in release but not regular builds

Browse Source
This commit is contained in:
Ross Andrews
2022-05-01 18:12:01 -05:00
parent f63344089a
commit c3bd98b8c9
5 changed files with 138 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcore/src/cpu.rs
+28 -21
View File
@@ -373,27 +373,10 @@ impl CPU {
match self.fetch() {
Ok(instr) => {
let stack_str: Vec<String> = self
.get_stack()
.iter()
.map(|w| format!("{:#08x} ", u32::from(*w)))
.collect();
let call_str: Vec<String> = self
.get_call()
.iter()
.map(|w| format!("{:#08x} ", u32::from(*w)))
.collect();
let arg_str = instr
.arg
.map_or(String::from(""), |w| format!("{:#08x}", u32::from(w)));
println!(
"{:#8x}: {} <{}> ( {}) [ {}]",
u32::from(self.pc),
instr.opcode,
arg_str,
stack_str.join(" "),
call_str.join(" ")
);
//if cfg!(debug_assertions) {
//self.debug_instr(instr);
//}
self.pc = if let Some(err) = self.error(instr) {
self.handle_error(err)
} else {
@@ -405,6 +388,30 @@ impl CPU {
}
}
fn debug_instr(&self, instr: Instruction) {
let stack_str: Vec<String> = self
.get_stack()
.iter()
.map(|w| format!("{:#08x} ", u32::from(*w)))
.collect();
let call_str: Vec<String> = self
.get_call()
.iter()
.map(|w| format!("{:#08x} ", u32::from(*w)))
.collect();
let arg_str = instr
.arg
.map_or(String::from(""), |w| format!("{:#08x}", u32::from(w)));
println!(
"{:#8x}: {} <{}> ( {}) [ {}]",
u32::from(self.pc),
instr.opcode,
arg_str,
stack_str.join(" "),
call_str.join(" ")
);
}
pub fn interrupt(&mut self, int: usize, arg: Option<Word>) {
if int >= self.iv.len() {
panic!("Invalid interrupt: {}", int)