Noratrieb/m8db
1
0
Fork 0
mirror of https://github.com/Noratrieb/m8db.git synced 2026-01-14 15:25:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed some stepping debugging bugs

Browse source
This commit is contained in:
nora 2021-09-18 21:44:12 +02:00
parent 92b026ccba
commit 16fbd8555f
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/db.rs
View file

@ -22,7 +22,6 @@ enum VmState {
impl Vm<'_> {
fn step(&mut self) -> VmState {
let pc = self.pc;
self.pc += 1;
match self.stmts.get(pc).cloned() {
Some(Stmt::Inc(r)) => self.registers[r] += 1,
Some(Stmt::Dec(r)) => self.registers[r] -= 1,
@ -35,6 +34,7 @@ impl Vm<'_> {
Some(Stmt::Stop) => return VmState::Stop,
None => return VmState::OutOfBounds,
}
self.pc += 1;
if self.breakpoints.contains(&self.pc) {
VmState::Break
} else {
@ -160,7 +160,7 @@ fn print_registers(vm: &Vm) {
fn print_program(vm: &Vm) {
use std::cmp::min;
println!("Program:");
println!("Program: (pc = {}, line = {})", vm.pc, vm.span[vm.pc]);
let lower_stmt = if vm.pc > 5 { vm.pc - 5 } else { 0 };
let len = vm.stmts.len();
let higher_stmt = if len < 5 { len } else { min(vm.pc + 5, len) };
@ -168,12 +168,12 @@ fn print_program(vm: &Vm) {
let lower_code = vm.span[lower_stmt];
let higher_code = vm.span[higher_stmt - 1];
for line_number in lower_code..higher_code {
let code_line = vm.code_lines[line_number];
if line_number == vm.span[vm.pc] {
println!("> {} {}", line_number, code_line)
for line_index in lower_code..higher_code {
let code_line = vm.code_lines[line_index];
if line_index == vm.span[vm.pc] {
println!("> {} {}", line_index + 1, code_line)
} else {
println!("{} {}", line_number, code_line);
println!("{} {}", line_index + 1, code_line);
}
}
}

9
test.m8
View file

@ -1,8 +1,7 @@
INC 1
.test1
.test2
.test3
INC 1
JUMP end
.start
DEC 1
IS_ZERO 1 end
JUMP start
.end
STOP