Previous 15994 Revisions Next

r972 Saturday 15th September, 2007 at 17:48:18 UTC by R. Belmont
[ARM7] Fixed several issues. (Also submitting to MAMEDev).
[src/emu/cpu]cpu.mak
[src/emu/cpu/arm7]arm7core.c arm7exec.c

src/emu/cpu/cpu.mak
r971r972
6565
6666$(CPUOBJ)/arm7/arm7.o:   $(CPUSRC)/arm7/arm7.c \
6767                  $(CPUSRC)/arm7/arm7.h \
68                  $(CPUSRC)/arm7/arm7exec.c
68                  $(CPUSRC)/arm7/arm7exec.c \
69                  $(CPUSRC)/arm7/arm7core.c
6970
7071
7172
src/emu/cpu/arm7/arm7core.c
r971r972
137137 ***************************************************************************/
138138INLINE void arm7_cpu_write32( int addr, UINT32 data )
139139{
140   if (addr & 3)
141   {
142      program_write_byte_32le(addr, data&0xff);
143      program_write_byte_32le(addr+1, (data>>8)&0xff);
144      program_write_byte_32le(addr+2, (data>>16)&0xff);
145      program_write_byte_32le(addr+3, (data>>24)&0xff);
146   }
147   else
148   {
149      program_write_dword_32le(addr,data);
150   }
140   addr &= ~3;
141   program_write_dword_32le(addr,data);
151142}
152143
153144
154145INLINE void arm7_cpu_write16( int addr, UINT16 data )
155146{
156   if (addr & 1)
157   {
158      program_write_byte_32le(addr, data&0xff);
159      program_write_byte_32le(addr+1, (data>>8)&0xff);
160   }
161   else
162   {
163      program_write_word_32le(addr,data);
164   }
147   addr &= ~1;
148   program_write_word_32le(addr,data);
165149}
166150
167151INLINE void arm7_cpu_write8( int addr, UINT8 data )
r971r972
189173{
190174   UINT16 result;
191175
192   if(addr&1)
176   result = program_read_word_32le(addr & ~1);
177
178   if (addr & 1)
193179   {
194      result = program_read_byte_32le(addr) | program_read_byte_32le(addr+1)<<8;
180      result = ((result>>8) & 0xff) | ((result&0xff)<<8);
195181   }
196   else
197   {
198      result = program_read_word_32le(addr);
199   }
200182
201183   return result;
202184}
src/emu/cpu/arm7/arm7exec.c
r971r972
357357                           rs = ( insn & THUMB_ADDSUB_RS ) >> THUMB_ADDSUB_RS_SHIFT;
358358                           rd = ( insn & THUMB_ADDSUB_RD ) >> THUMB_ADDSUB_RD_SHIFT;
359359                           rrs = GET_REGISTER(rs)&0xff;
360                           rrd = GET_REGISTER(rs);
360                           rrd = GET_REGISTER(rd);
361361                           if (rrs != 0)
362362                           {
363363                              if (rrs >= 32)

Previous 15994 Revisions Next


© 1998-2018 The MESS Team