Cleanups.

diff --git a/disasm.cpp b/disasm.cpp
index cf2849b724f0d521e8d6b33d7d87cbd40803752d..2f4c40c2b177279be3d08ffc1c546b78126dadaa 100644 (file)
--- a/disasm.cpp
+++ b/disasm.cpp
@@ -66,7 +66,7 @@ static const int datasizes[] = {
 static void showea_val(TCHAR *buffer, uae_u16 opcode, uaecptr addr, int size)
 {
        struct mnemolookup *lookup;
-       instr *table = &table68k[opcode];
+       struct instr *table = &table68k[opcode];
 
        if (addr >= 0xe90000 && addr < 0xf00000)
                goto skip;

diff --git a/newcpu.cpp b/newcpu.cpp
index 76a8cfee2bccc3d6a7c025c176120de5c2564d1b..84516cce25ec057ef3e8275a81c6f4709dabcd5a 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -1620,7 +1620,7 @@ static void flush_cpu_caches_040_2(int cache, int scope, uaecptr addr, bool push
                                        pagesize = 16;
                                }
                                addr &= ~(pagesize - 1);
-                               for (int j = 0; j < pagesize; j += 16, addr += 16) {
+                               for (uae_u32 j = 0; j < pagesize; j += 16, addr += 16) {
                                        int index;
                                        uae_u32 tag;
                                        uae_u32 tagmask;
@@ -1821,7 +1821,7 @@ static void build_cpufunctbl (void)
        opcnt = 0;
        for (opcode = 0; opcode < 65536; opcode++) {
                cpuop_func *f;
-               instr *table = &table68k[opcode];
+               struct instr *table = &table68k[opcode];
 
                if (table->mnemo == i_ILLG)
                        continue;               
@@ -5138,7 +5138,7 @@ static void m68k_run_mmu060 (void)
 /* Aranym MMU 68040  */
 static void m68k_run_mmu040 (void)
 {
-       flag_struct f;
+       struct flag_struct f;
        int halt = 0;
 
        check_halt();