Cleanups.

diff --git a/debug.cpp b/debug.cpp
index 0c1b6b2e4114510c07e99d379564fedf0af4e123..06cbaa9395b010680105a7af6ce8c7ff13ff5c07 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -6812,8 +6812,6 @@ static struct trainerpatch **tpptr;
 static int tpptrcnt;
 bool debug_opcode_watch;
 
-uaecptr ShowEA(void *f, uaecptr pc, uae_u16 opcode, int reg, amodes mode, wordsizes size, TCHAR *buf, uae_u32 *eaddr, int safemode);
-
 static int debug_trainer_get_ea(struct trainerpatch *tp, uaecptr pc, uae_u16 opcode, uaecptr *addr)
 {
        struct instr *dp = table68k + opcode;

diff --git a/include/memory.h b/include/memory.h
index 0a78b2d76ccc50ddcd2883f6990660344fb08c51..8a7c891538856e089f462bff83f2ac4885700e7d 100644 (file)
--- a/include/memory.h
+++ b/include/memory.h
@@ -554,40 +554,40 @@ STATIC_INLINE uae_u32 get_wordi(uaecptr addr)
 
 STATIC_INLINE uae_u32 get_long_jit(uaecptr addr)
 {
-       addrbank *bank = &get_mem_bank(addr);
 #ifdef JIT
+       addrbank *bank = &get_mem_bank(addr);
        special_mem |= bank->jit_read_flag;
 #endif
        return memory_get_long(addr);
 }
 STATIC_INLINE uae_u32 get_word_jit(uaecptr addr)
 {
-       addrbank *bank = &get_mem_bank(addr);
 #ifdef JIT
+       addrbank *bank = &get_mem_bank(addr);
        special_mem |= bank->jit_read_flag;
 #endif
        return memory_get_word(addr);
 }
 STATIC_INLINE uae_u32 get_byte_jit(uaecptr addr)
 {
-       addrbank *bank = &get_mem_bank(addr);
 #ifdef JIT
+       addrbank *bank = &get_mem_bank(addr);
        special_mem |= bank->jit_read_flag;
 #endif
        return memory_get_byte(addr);
 }
 STATIC_INLINE uae_u32 get_longi_jit(uaecptr addr)
 {
-       addrbank *bank = &get_mem_bank(addr);
 #ifdef JIT
+       addrbank *bank = &get_mem_bank(addr);
        special_mem |= bank->jit_read_flag;
 #endif
        return memory_get_longi(addr);
 }
 STATIC_INLINE uae_u32 get_wordi_jit(uaecptr addr)
 {
-       addrbank *bank = &get_mem_bank(addr);
 #ifdef JIT
+       addrbank *bank = &get_mem_bank(addr);
        special_mem |= bank->jit_read_flag;
 #endif
        return memory_get_wordi(addr);
@@ -642,24 +642,24 @@ STATIC_INLINE void put_byte (uaecptr addr, uae_u32 b)
 
 STATIC_INLINE void put_long_jit(uaecptr addr, uae_u32 l)
 {
-       addrbank *bank = &get_mem_bank(addr);
 #ifdef JIT
+       addrbank *bank = &get_mem_bank(addr);
        special_mem |= bank->jit_write_flag;
 #endif
        memory_put_long(addr, l);
 }
 STATIC_INLINE void put_word_jit(uaecptr addr, uae_u32 l)
 {
-       addrbank *bank = &get_mem_bank(addr);
 #ifdef JIT
+       addrbank *bank = &get_mem_bank(addr);
        special_mem |= bank->jit_write_flag;
 #endif
        memory_put_word(addr, l);
 }
 STATIC_INLINE void put_byte_jit(uaecptr addr, uae_u32 l)
 {
-       addrbank *bank = &get_mem_bank(addr);
 #ifdef JIT
+       addrbank *bank = &get_mem_bank(addr);
        special_mem |= bank->jit_write_flag;
 #endif
        memory_put_byte(addr, l);

diff --git a/include/newcpu.h b/include/newcpu.h
index 0c7a0a7f52ef7cec3ce236fb695863dcd84666c6..727acfa6763b54f70fd2e5a3f881eac8d780c552 100644 (file)
--- a/include/newcpu.h
+++ b/include/newcpu.h
@@ -650,6 +650,7 @@ extern void m68k_disasm (uaecptr addr, uaecptr *nextpc, uaecptr lastpc, int cnt)
 extern void m68k_disasm_2 (TCHAR *buf, int bufsize, uaecptr addr, uaecptr *nextpc, int cnt, uae_u32 *seaddr, uae_u32 *deaddr, uaecptr lastpc, int safemode);
 extern void sm68k_disasm (TCHAR*, TCHAR*, uaecptr addr, uaecptr *nextpc, uaecptr lastpc);
 extern int m68k_asm(TCHAR *buf, uae_u16 *out, uaecptr pc);
+extern uaecptr ShowEA(void *f, uaecptr pc, uae_u16 opcode, int reg, amodes mode, wordsizes size, TCHAR *buf, uae_u32 *eaddr, int safemode);
 extern int get_cpu_model (void);
 
 extern void set_cpu_caches (bool flush);