Macintosh-Tools/moa
1
0
Fork 0
mirror of https://github.com/transistorfet/moa.git synced 2024-08-18 18:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Fixed bug in indexing modes

Browse Source
This commit is contained in:
transistor 2021-10-17 11:13:46 -07:00
parent 1262cbd8c0
commit 758621c410
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpus/m68k/execute.rs
View File

@ -640,9 +640,9 @@ impl M68k {
get_address_sized(system, (*addr).wrapping_add(offset as u32) as Address, size) get_address_sized(system, (*addr).wrapping_add(offset as u32) as Address, size)
}, },
Target::IndirectARegXRegOffset(reg, xreg, offset, scale, target_size) => { Target::IndirectARegXRegOffset(reg, xreg, offset, scale, target_size) => {
let reg_offset = sign_extend_to_long(self.get_x_reg_value(xreg), target_size); let index = sign_extend_to_long(self.get_x_reg_value(xreg), target_size) << scale;
let addr = self.get_a_reg_mut(reg); let addr = self.get_a_reg_mut(reg);
get_address_sized(system, ((*addr).wrapping_add(reg_offset as u32).wrapping_add(offset as u32) << scale) as Address, size) get_address_sized(system, (*addr).wrapping_add(offset as u32).wrapping_add(index as u32) as Address, size)
}, },
Target::IndirectMemory(addr) => { Target::IndirectMemory(addr) => {
get_address_sized(system, addr as Address, size) get_address_sized(system, addr as Address, size)
@ -651,8 +651,8 @@ impl M68k {
get_address_sized(system, (self.decoder.start + 2).wrapping_add(offset as u32) as Address, size) get_address_sized(system, (self.decoder.start + 2).wrapping_add(offset as u32) as Address, size)
}, },
Target::IndirectPCXRegOffset(xreg, offset, scale, target_size) => { Target::IndirectPCXRegOffset(xreg, offset, scale, target_size) => {
let reg_offset = sign_extend_to_long(self.get_x_reg_value(xreg), target_size); let index = sign_extend_to_long(self.get_x_reg_value(xreg), target_size) << scale;
get_address_sized(system, ((self.decoder.start + 2).wrapping_add(reg_offset as u32).wrapping_add(offset as u32) << scale) as Address, size) get_address_sized(system, (self.decoder.start + 2).wrapping_add(offset as u32).wrapping_add(index as u32) as Address, size)
}, },
} }
} }
@ -683,9 +683,9 @@ impl M68k {
set_address_sized(system, (*addr).wrapping_add(offset as u32) as Address, value, size)?; set_address_sized(system, (*addr).wrapping_add(offset as u32) as Address, value, size)?;
}, },
Target::IndirectARegXRegOffset(reg, xreg, offset, scale, target_size) => { Target::IndirectARegXRegOffset(reg, xreg, offset, scale, target_size) => {
let reg_offset = sign_extend_to_long(self.get_x_reg_value(xreg), target_size); let index = sign_extend_to_long(self.get_x_reg_value(xreg), target_size) << scale;
let addr = self.get_a_reg_mut(reg); let addr = self.get_a_reg_mut(reg);
set_address_sized(system, ((*addr).wrapping_add(reg_offset as u32).wrapping_add(offset as u32) << scale) as Address, value, size)?; set_address_sized(system, (*addr).wrapping_add(offset as u32).wrapping_add(index as u32) as Address, value, size)?;
}, },
Target::IndirectMemory(addr) => { Target::IndirectMemory(addr) => {
set_address_sized(system, addr as Address, value, size)?; set_address_sized(system, addr as Address, value, size)?;
@ -703,9 +703,9 @@ impl M68k {
(*addr).wrapping_add(offset as u32) (*addr).wrapping_add(offset as u32)
}, },
Target::IndirectARegXRegOffset(reg, xreg, offset, scale, target_size) => { Target::IndirectARegXRegOffset(reg, xreg, offset, scale, target_size) => {
let reg_offset = sign_extend_to_long(self.get_x_reg_value(xreg), target_size); let index = sign_extend_to_long(self.get_x_reg_value(xreg), target_size) << scale;
let addr = self.get_a_reg_mut(reg); let addr = self.get_a_reg_mut(reg);
(*addr).wrapping_add(reg_offset as u32).wrapping_add(offset as u32) << scale (*addr).wrapping_add(offset as u32).wrapping_add(index as u32)
}, },
Target::IndirectMemory(addr) => { Target::IndirectMemory(addr) => {
addr addr
@ -714,8 +714,8 @@ impl M68k {
(self.decoder.start + 2).wrapping_add(offset as u32) (self.decoder.start + 2).wrapping_add(offset as u32)
}, },
Target::IndirectPCXRegOffset(xreg, offset, scale, target_size) => { Target::IndirectPCXRegOffset(xreg, offset, scale, target_size) => {
let reg_offset = sign_extend_to_long(self.get_x_reg_value(xreg), target_size); let index = sign_extend_to_long(self.get_x_reg_value(xreg), target_size) << scale;
(self.decoder.start + 2).wrapping_add(reg_offset as u32).wrapping_add(offset as u32) << scale (self.decoder.start + 2).wrapping_add(offset as u32).wrapping_add(index as u32)
}, },
_ => return Err(Error::new(&format!("Invalid addressing target: {:?}", target))), _ => return Err(Error::new(&format!("Invalid addressing target: {:?}", target))),
}; };