jrd/vrtue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emu: Rename "Addr" to "FarPtr"

Browse Source 
It was a little confusing with the "Address" trait. And FarPtr carries
with it a segment.
This commit is contained in:
Jared Burce
2021-03-18 00:38:06 -07:00
parent 3b746b75ec
commit 73c537183e
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/emu/operations.rs
View File

@@ -2,7 +2,7 @@ use std::fmt::Debug;
use emu::dos;
use emu::i8088::{Flags, RepPrefix, i8088};
use emu::operands::{Addr, Address, LValue, Operand, Reg, RValue};
use emu::operands::{Address, FarPtr, LValue, Operand, Reg, RValue};
use emu::pc::Bus;
macro_rules! string_op {
@@ -112,8 +112,8 @@ pub fn cmpsb(flags: &mut Flags,
es: &mut Reg,
di: &mut Reg) {
string_op!((u8, flags, rep, cx, di=di, zf=flags.zf), {
let src = <Addr as RValue<u8>>::read(&Addr { bus: bus, segment: seg, offset: si.read() });
let dst = <Addr as RValue<u8>>::read(&Addr { bus: bus, segment: es.read(), offset: di.read() });
let src = <FarPtr as RValue<u8>>::read(&FarPtr { bus: bus, segment: seg, offset: si.read() });
let dst = <FarPtr as RValue<u8>>::read(&FarPtr { bus: bus, segment: es.read(), offset: di.read() });
cmp(flags, &dst, &src);
});
@@ -128,8 +128,8 @@ pub fn cmpsw(flags: &mut Flags,
es: &mut Reg,
di: &mut Reg) {
string_op!((u16, flags, rep, cx, di=di, zf=flags.zf), {
let src = <Addr as RValue<u16>>::read(&Addr { bus: bus, segment: seg, offset: si.read() });
let dst = <Addr as RValue<u16>>::read(&Addr { bus: bus, segment: es.read(), offset: di.read() });
let src = <FarPtr as RValue<u16>>::read(&FarPtr { bus: bus, segment: seg, offset: si.read() });
let dst = <FarPtr as RValue<u16>>::read(&FarPtr { bus: bus, segment: es.read(), offset: di.read() });
cmp(flags, &dst, &src);
});
@@ -142,7 +142,7 @@ pub fn int(cpu: &mut i8088, bus: &mut Bus, num: &u8) {
}
}
pub fn lea(dst: &mut Reg, addr: &Addr) {
pub fn lea(dst: &mut Reg, addr: &FarPtr) {
dst.write(addr.offset)
}
@@ -154,7 +154,7 @@ pub fn lodsb(flags: &Flags,
si: &mut Reg,
al: &mut impl LValue<u8>) {
string_op!((u8, flags, rep, cx, si=si), {
al.write(Addr { bus: bus, segment: seg, offset: si.read() }.read());
al.write(FarPtr { bus: bus, segment: seg, offset: si.read() }.read());
});
}
@@ -166,7 +166,7 @@ pub fn lodsw(flags: &Flags,
si: &mut Reg,
ax: &mut impl LValue<u16>) {
string_op!((u16, flags, rep, cx, si=si), {
ax.write(Addr { bus: bus, segment: seg, offset: si.read() }.read());
ax.write(FarPtr { bus: bus, segment: seg, offset: si.read() }.read());
});
}
@@ -183,9 +183,9 @@ pub fn movsb(flags: &Flags,
es: &Reg,
di: &mut Reg) {
string_op!((u8, flags, rep, cx, si=si, di=di), {
let src = <Addr as RValue<u8>>::read(&Addr { bus: bus, segment: seg, offset: si.read() });
let mut dst = Addr { bus: bus, segment: es.read(), offset: di.read() };
<Addr as LValue<u8>>::write(&mut dst, src);
let src = <FarPtr as RValue<u8>>::read(&FarPtr { bus: bus, segment: seg, offset: si.read() });
let mut dst = FarPtr { bus: bus, segment: es.read(), offset: di.read() };
<FarPtr as LValue<u8>>::write(&mut dst, src);
});
}
@@ -198,16 +198,16 @@ pub fn movsw(flags: &Flags,
es: &Reg,
di: &mut Reg) {
string_op!((u16, flags, rep, cx, si=si, di=di), {
let src = <Addr as RValue<u16>>::read(&Addr { bus: bus, segment: seg, offset: si.read() });
let mut dst = Addr { bus: bus, segment: es.read(), offset: di.read() };
<Addr as LValue<u16>>::write(&mut dst, src);
let src = <FarPtr as RValue<u16>>::read(&FarPtr { bus: bus, segment: seg, offset: si.read() });
let mut dst = FarPtr { bus: bus, segment: es.read(), offset: di.read() };
<FarPtr as LValue<u16>>::write(&mut dst, src);
});
}
pub fn nop() {}
pub fn pop(bus: &mut Bus, ss: u16, sp: &mut Reg, dst: &mut Reg) {
let ptr = Addr { bus: bus, segment: ss, offset: sp.read() };
let ptr = FarPtr { bus: bus, segment: ss, offset: sp.read() };
dst.write(ptr.read());
sp.write(sp.read() + 2);
}
@@ -215,7 +215,7 @@ pub fn pop(bus: &mut Bus, ss: u16, sp: &mut Reg, dst: &mut Reg) {
pub fn push(bus: &mut Bus, ss: u16, sp: &mut Reg, val: u16) {
// XXX: Not checking for stack faults or anything
sp.write(sp.read() - 2);
let mut ptr = Addr { bus: bus, segment: ss, offset: sp.read() };
let mut ptr = FarPtr { bus: bus, segment: ss, offset: sp.read() };
ptr.write(val);
}
@@ -227,7 +227,7 @@ pub fn scasb(flags: &mut Flags,
di: &mut Reg,
needle: &impl RValue<u8>) {
string_op!((u8, flags, rep, cx, di=di, zf=flags.zf), {
let elem = Addr { bus: bus, segment: es.read(), offset: di.read() };
let elem = FarPtr { bus: bus, segment: es.read(), offset: di.read() };
cmp(flags, &elem, needle);
});
}
@@ -240,7 +240,7 @@ pub fn scasw(flags: &mut Flags,
di: &mut Reg,
needle: &impl RValue<u16>) {
string_op!((u16, flags, rep, cx, di=di, zf=flags.zf), {
let elem = Addr { bus: bus, segment: es.read(), offset: di.read() };
let elem = FarPtr { bus: bus, segment: es.read(), offset: di.read() };
cmp(flags, &elem, needle);
});
}
@@ -253,7 +253,7 @@ pub fn stosb(flags: &Flags,
di: &mut Reg,
val: &impl RValue<u8>) {
string_op!((u8, flags, rep, cx, di=di), {
let mut dst = Addr { bus: bus, segment: es.read(), offset: di.read() };
let mut dst = FarPtr { bus: bus, segment: es.read(), offset: di.read() };
dst.write(val.read());
});
}
@@ -266,7 +266,7 @@ pub fn stosw(flags: &Flags,
di: &mut Reg,
val: &impl RValue<u16>) {
string_op!((u16, flags, rep, cx, di=di), {
let mut dst = Addr { bus: bus, segment: es.read(), offset: di.read() };
let mut dst = FarPtr { bus: bus, segment: es.read(), offset: di.read() };
dst.write(val.read());
});
}