Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 08:22:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

m68k: fix unaligned pc-relative accesses [O. Galibert]

Browse Source
This commit is contained in:
Olivier Galibert 2015-07-08 14:01:03 +02:00
parent a700b32e2b
commit cc0ed832ac
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/emu/cpu/m68000/m68kcpu.h
View File

@ -619,24 +619,35 @@ char* m68ki_disassemble_quick(unsigned int pc, unsigned int cpu_type);
/* ======================================================================== */
INLINE unsigned int m68k_read_immediate_32(m68000_base_device *m68k, unsigned int address)
{
return (m68k->/*memory.*/readimm16(address) << 16) | m68k->/*memory.*/readimm16(address + 2);
}
INLINE unsigned int m68k_read_pcrelative_8(m68000_base_device *m68k, unsigned int address)
{
return ((m68k->/*memory.*/readimm16(address&~1)>>(8*(1-(address & 1))))&0xff);
return ((m68k->readimm16(address&~1)>>(8*(1-(address & 1))))&0xff);
}
INLINE unsigned int m68k_read_pcrelative_16(m68000_base_device *m68k, unsigned int address)
{
return m68k->/*memory.*/readimm16(address);
if(address & 1)
return
(m68k->readimm16(address-1) << 8) |
(m68k->readimm16(address+1) >> 8);
else
return
(m68k->readimm16(address ) );
}
INLINE unsigned int m68k_read_pcrelative_32(m68000_base_device *m68k, unsigned int address)
{
return m68k_read_immediate_32(m68k, address);
if(address & 1)
return
(m68k->readimm16(address-1) << 24) |
(m68k->readimm16(address+1) << 8) |
(m68k->readimm16(address+3) >> 8);
else
return
(m68k->readimm16(address ) << 16) |
(m68k->readimm16(address+2) );
}