1.1 --- a/src/aica/armcore.c	Sun Dec 12 07:44:09 2004 +0000
     1.2 +++ b/src/aica/armcore.c	Sun Dec 11 12:00:09 2005 +0000
     1.3 @@ -6,12 +6,12 @@
     1.4  /* NB: The arm has a different memory map, but for the meantime... */
     1.5  /* Page references are as per ARM DDI 0100E (June 2000) */
     1.6  
     1.7 -#define MEM_READ_BYTE( addr ) mem_read_byte(addr)
     1.8 -#define MEM_READ_WORD( addr ) mem_read_word(addr)
     1.9 -#define MEM_READ_LONG( addr ) mem_read_long(addr)
    1.10 -#define MEM_WRITE_BYTE( addr, val ) mem_write_byte(addr, val)
    1.11 -#define MEM_WRITE_WORD( addr, val ) mem_write_word(addr, val)
    1.12 -#define MEM_WRITE_LONG( addr, val ) mem_write_long(addr, val)
    1.13 +#define MEM_READ_BYTE( addr ) arm_read_byte(addr)
    1.14 +#define MEM_READ_WORD( addr ) arm_read_word(addr)
    1.15 +#define MEM_READ_LONG( addr ) arm_read_long(addr)
    1.16 +#define MEM_WRITE_BYTE( addr, val ) arm_write_byte(addr, val)
    1.17 +#define MEM_WRITE_WORD( addr, val ) arm_write_word(addr, val)
    1.18 +#define MEM_WRITE_LONG( addr, val ) arm_write_long(addr, val)
    1.19  
    1.20  
    1.21  #define IS_NOTBORROW( result, op1, op2 ) (op2 > op1 ? 0 : 1)
    1.22 @@ -51,6 +51,10 @@
    1.23  #define UNDEF(ir) do{ ERROR( "Raising exception on undefined instruction at %08x, opcode = %04x", PC, ir ); return; } while(0)
    1.24  #define UNIMP(ir) do{ ERROR( "Halted on unimplemented instruction at %08x, opcode = %04x", PC, ir ); return; }while(0)
    1.25  
    1.26 +void arm_restore_cpsr()
    1.27 +{
    1.28 +
    1.29 +}
    1.30  
    1.31  static uint32_t arm_get_shift_operand( uint32_t ir )
    1.32  {