marcothms/8086-rs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ft: impl flag setting closure for binary operations

Browse Source
This commit is contained in:
Marco Thomas
2025-06-10 14:35:00 +09:00
parent 35fefb7625
commit 5529fc0b89
3 changed files with 94 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/interpreter/computer.rs
View File

@@ -4,13 +4,17 @@ use crate::operands::{ImmediateOperand, ModRmTarget};
use super::{flags::Flags, memory::Memory, register::Register};
/// Wrapper for easier argument passing of arithmetic operations.
/// Wrapper for easier argument passing of multi-type operations.
#[derive(Debug, Clone)]
pub enum Operand {
Immediate(crate::operands::ImmediateOperand),
ModRmTarget(ModRmTarget),
}
type Result = ImmediateOperand;
type Lhs = ImmediateOperand;
type Rhs = ImmediateOperand;
#[derive(Debug, Clone)]
pub struct Computer {
pub regs: Register,
@@ -27,38 +31,48 @@ impl Computer {
}
}
/// Perform binary `dest` = `dest` + `src`. Sets flags.
pub fn add(&mut self, dest: ModRmTarget, src: Operand) {
let op = |lhs, rhs| lhs + rhs;
// TODO let flag_check = |_| ();
self.op(op, dest, src);
let op: fn(Lhs, Rhs) -> Result = |lhs, rhs| lhs + rhs;
let flag_set: fn(&mut Flags, Result, Lhs, Rhs) = |flags, result, lhs, rhs| {
flags.cf = result < rhs;
flags.of = lhs.msb() && rhs.msb() != result.msb();
flags.zf = result.zero();
flags.sf = result.msb();
flags.pf = result.parity();
// flags.af =
};
self.op(op, flag_set, dest, src);
}
/// Perform binary `dest` = `dest` - `src`. Sets flags.
pub fn sub(&mut self, dest: ModRmTarget, src: Operand) {
let op = |lhs, rhs| lhs - rhs;
// TODO let flag_check = |_| ();
self.op(op, dest, src);
let op: fn(Lhs, Rhs) -> Result = |lhs, rhs| lhs - rhs;
let flag_set: fn(&mut Flags, Result, Lhs, Rhs) = |_, _, _, _| ();
self.op(op, flag_set, dest, src);
}
/// Applies a binary operator [`O`] to two [`Argument`]s, saves it to `dest`
/// and sets flags, if necessary.
/// A value can never be saved to an immediate Operand, so `dest` can only
/// Applies a binary operator [`O`] to the value of two [`Operand`]s, saves
/// it to `dest` and sets flags, according to [`F`].
/// A result can never be saved to an immediate Operand, so `dest` can only
/// be a [`ModRmTarget`].
fn op<O>(&mut self, op: O, dest: ModRmTarget, src: Operand)
fn op<O, F>(&mut self, op: O, flag_set: F, dest: ModRmTarget, src: Operand)
where
O: Fn(ImmediateOperand, ImmediateOperand) -> ImmediateOperand,
// F: Fn(&mut Flags);
O: Fn(Lhs, Rhs) -> Result,
F: Fn(&mut Flags, Result, Lhs, Rhs),
{
match src {
Operand::ModRmTarget(src_target) => self.op_modrm(op, dest, src_target),
Operand::Immediate(src_operand) => self.op_imm(op, dest, src_operand),
Operand::ModRmTarget(src_target) => self.op_modrm(op, flag_set, dest, src_target),
Operand::Immediate(src_operand) => self.op_imm(op, flag_set, dest, src_operand),
}
}
/// Applies a binary operator [`O`] to two [`ModRmTargets`]s, saves it to
/// dest and sets flags, if necessary.
fn op_modrm<O>(&mut self, op: O, dest: ModRmTarget, src: ModRmTarget)
/// Applies a binary operator [`O`] to two memory locations, pointed to by a
/// [`ModRmTargets`]s, saves it to dest and sets flags, according to [`F`].
fn op_modrm<O, F>(&mut self, op: O, flag_set: F, dest: ModRmTarget, src: ModRmTarget)
where
O: Fn(ImmediateOperand, ImmediateOperand) -> ImmediateOperand,
O: Fn(Lhs, Rhs) -> Result,
F: Fn(&mut Flags, Result, Lhs, Rhs),
{
match dest {
ModRmTarget::Memory(dest_memory_idx) => match src {
@@ -72,7 +86,7 @@ impl Computer {
let rhs = self.regs.read(src_register);
let result = op(lhs, rhs);
self.memory.write(&self.regs, dest_memory_idx, result);
// flag_check(&mut self.flags);
flag_set(&mut self.flags, result, lhs, rhs);
}
},
ModRmTarget::Register(dest_register) => match src {
@@ -82,7 +96,7 @@ impl Computer {
let rhs = self.memory.read(&self.regs, src_memory_index);
let result = op(lhs, rhs);
self.regs.write(dest_register, result);
// flag_check(&mut self.flags);
flag_set(&mut self.flags, result, lhs, rhs);
}
// reg, reg
ModRmTarget::Register(src_register) => {
@@ -90,7 +104,7 @@ impl Computer {
let rhs = self.regs.read(src_register);
let result = op(lhs, rhs);
self.regs.write(dest_register, result);
// flag_check(&mut self.flags);
flag_set(&mut self.flags, result, lhs, rhs);
}
},
}
@@ -98,24 +112,24 @@ impl Computer {
/// Applies a binary operator [`O`] to [`ImmediateOperand`] and a location
/// pointed to by a [`ModRmTarget`], saves it to dest and sets flags,
/// if necessary.
fn op_imm<O>(&mut self, op: O, dest: ModRmTarget, src: ImmediateOperand)
/// according to [`F`].
fn op_imm<O, F>(&mut self, op: O, flag_set: F, dest: ModRmTarget, src: ImmediateOperand)
where
O: Fn(ImmediateOperand, ImmediateOperand) -> ImmediateOperand,
// F: for<'F> Fn(&'F mut Flags),
O: Fn(Lhs, Rhs) -> Result,
F: Fn(&mut Flags, Result, Lhs, Rhs),
{
match dest {
ModRmTarget::Memory(dest_mem) => {
let lhs = self.memory.read(&self.regs, dest_mem);
let result = op(lhs, src);
self.memory.write(&self.regs, dest_mem, result);
// flag_check(&mut self.flags);
flag_set(&mut self.flags, result, lhs, src);
}
ModRmTarget::Register(dest_reg) => {
let lhs = self.regs.read(dest_reg);
let result = op(lhs, src);
self.regs.write(dest_reg, result);
// flag_check(&mut self.flags);
flag_set(&mut self.flags, result, lhs, src);
}
}
}

12
src/interpreter/interpreter.rs
View File

@@ -78,6 +78,18 @@ impl Interpreter {
ModRmTarget::Register(crate::register::Register::AX),
Operand::Immediate(ImmediateOperand::Word(src_word)),
),
/*
* PUSH
*/
/*
* POP
*/
/*
* OR
*/
/*
* SUB
*/