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

chore(interpreter): rewrite displacement memoryindex logic

Browse Source 
Previously, the displacement for a MemoryIndex was directly interpreted
and saved as a signed value.
Change this to the normal unsigned ImmediateOperand version to allow
for more flexible usage of this struct for general memoryaccess (future
commit) and just interpret the displacement member as signed, only when
being interpreted as such (memory access, display, ....
This commit is contained in:
Marco Thomas
2025-06-18 17:59:55 +09:00
parent 5a61eb5fd6
commit 79dc560689
5 changed files with 131 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/interpreter/memory.rs
View File

@@ -1,4 +1,4 @@
use crate::operands::{Byte, Displacement, ImmediateOperand, MemoryIndex, Word};
use crate::operands::{Byte, ImmediateOperand, ImmediateOperandSigned, MemoryIndex, Word};
use super::interpreter::InterpreterError;
use crate::interpreter::register::{Register, SegmentRegister};
@@ -97,7 +97,7 @@ impl Memory {
) -> Word {
let mut base = ImmediateOperand::Word(0);
let mut index = ImmediateOperand::Word(0);
let mut disp = Displacement::IWord(0);
let mut disp = ImmediateOperandSigned::Word(0);
if let Some(base_reg) = idx.base {
base = regs.read(base_reg);
@@ -106,7 +106,7 @@ impl Memory {
index = regs.read(index_reg);
};
if let Some(displacement) = idx.displacement {
disp = displacement;
disp = ImmediateOperandSigned::from(displacement);
}
Self::addr_offset((base + index + disp).into(), sregs)