2900b17

diff --git a/autoconf.cpp b/autoconf.cpp
index 63f3fc9880610a398ded7be162de5a4c870200c8..f3477cc9cefa6932fd072cb17418bd368159329f 100644 (file)
--- a/autoconf.cpp
+++ b/autoconf.cpp
@@ -185,7 +185,7 @@ uae_u32 ds_bstr_ansi (const uae_char *str)
 
 void calltrap (uae_u32 n)
 {
-       dw (0xA000 + n);
+       dw(0xA000 + n);
 }
 
 void org (uae_u32 a)

diff --git a/cd32_fmv.cpp b/cd32_fmv.cpp
index f85eb0e33e3fc8bb973ee3f93a6bdf602719dfef..d2942fe7cb7d7c4487bb372aedc54933f06f4ea1 100644 (file)
--- a/cd32_fmv.cpp
+++ b/cd32_fmv.cpp
@@ -257,7 +257,7 @@ static uae_u16 l64111_regs[32];
 static uae_u16 l64111intmask[2], l64111intstatus[2];
 #define L64111_CHANNEL_BUFFERS 128
 
-static uae_u16 io_reg;
+static uae_u16 mpeg_io_reg;
 
 static mpeg2dec_t *mpeg_decoder;
 static const mpeg2_info_t *mpeg_info;
@@ -383,7 +383,7 @@ static void l64111_set_status(int num, uae_u16 mask)
 static void l64111_setvolume(void)
 {
        int volume = 32768;
-       if (l64111_regs[A_CONTROL2] & (1 << 5) || (io_reg & IO_L64111_MUTE))
+       if (l64111_regs[A_CONTROL2] & (1 << 5) || (mpeg_io_reg & IO_L64111_MUTE))
                volume = 0;
        if (!pcmaudio)
                return;
@@ -1260,9 +1260,9 @@ static void io_wput(uaecptr addr, uae_u16 v)
        if (addr != 0)
                return;
        write_log(_T("FMV: IO=%04x\n"), v);
-       io_reg = v;
+       mpeg_io_reg = v;
        l64111_setvolume();
-       cd32_fmv_state((io_reg & IO_CL450_VIDEO) ? 1 : 0);
+       cd32_fmv_state((mpeg_io_reg & IO_CL450_VIDEO) ? 1 : 0);
 }
 
 static uae_u32 REGPARAM2 fmv_wget (uaecptr addr)

diff --git a/cfgfile.cpp b/cfgfile.cpp
index 214a39917ef77bd550cf6cf366b65cb8def65e7c..76df8ab495ab2d0fa269467bbeb3a14ce103584b 100644 (file)
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -229,6 +229,20 @@ static const TCHAR *ppc_implementations[] = {
        _T("qemu"),
        NULL
 };
+static const TCHAR *ppc_cpu_idle[] = {
+       _T("disabled"),
+       _T("1"),
+       _T("2"),
+       _T("3"),
+       _T("4"),
+       _T("5"),
+       _T("6"),
+       _T("7"),
+       _T("8"),
+       _T("9"),
+       _T("max"),
+       NULL
+};
 static const TCHAR *waitblits[] = { _T("disabled"), _T("automatic"), _T("noidleonly"), _T("always"), 0 };
 static const TCHAR *autoext2[] = { _T("disabled"), _T("copy"), _T("replace"), 0 };
 static const TCHAR *leds[] = { _T("power"), _T("df0"), _T("df1"), _T("df2"), _T("df3"), _T("hd"), _T("cd"), _T("fps"), _T("cpu"), _T("snd"), _T("md"), 0 };
@@ -1507,8 +1521,10 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
                cfgfile_write (f, _T("fpu_model"), _T("%d"), p->fpu_model);
        if (p->mmu_model)
                cfgfile_write (f, _T("mmu_model"), _T("%d"), p->mmu_model);
-       if (p->ppc_mode)
-               cfgfile_write_str(f, _T("ppc_model"), p->ppc_mode == 1 ? _T("automatic") : _T("manual"));
+       if (p->ppc_mode) {
+               cfgfile_write_str(f, _T("ppc_model"), p->ppc_model[0] ? p->ppc_model : (p->ppc_mode == 1 ? _T("automatic") : _T("manual")));
+               cfgfile_write_str(f, _T("ppc_cpu_idle"), ppc_cpu_idle[p->ppc_cpu_idle]);
+       }
        cfgfile_write_bool (f, _T("cpu_compatible"), p->cpu_compatible);
        cfgfile_write_bool (f, _T("cpu_24bit_addressing"), p->address_space_24);
        /* do not reorder end */
@@ -3831,12 +3847,21 @@ static int cfgfile_parse_hardware (struct uae_prefs *p, const TCHAR *option, TCH
                return 1;
        if (cfgfile_string(option, value, _T("ppc_model"), tmpbuf, sizeof tmpbuf / sizeof(TCHAR))) {
                p->ppc_mode = 0;
-               if (!_tcsicmp(tmpbuf, _T("automatic")))
+               p->ppc_model[0] = 0;
+               if (!_tcsicmp(tmpbuf, _T("automatic"))) {
                        p->ppc_mode = 1;
-               else if (!_tcsicmp(tmpbuf, _T("manual")))
+               } else if (!_tcsicmp(tmpbuf, _T("manual"))) {
                        p->ppc_mode = 2;
+               } else {
+                       if (tmpbuf[0] && _tcslen(tmpbuf) < sizeof(p->ppc_model) / sizeof(TCHAR)) {
+                               _tcscpy(p->ppc_model, tmpbuf);
+                               p->ppc_mode = 2;
+                       }
+               }
                return 1;
        }
+       if (cfgfile_strval(option, value, _T("ppc_cpu_idle"), &p->ppc_cpu_idle, ppc_cpu_idle, 0))
+               return 1;
 
        /* old-style CPU configuration */
        if (cfgfile_string (option, value, _T("cpu_type"), tmpbuf, sizeof tmpbuf / sizeof (TCHAR))) {

diff --git a/cpuboard.cpp b/cpuboard.cpp
index e42963018d0ae46c44de79a4e672df874949708e..c4151b5037ea9cf37b09101c0f0a9abee733d2b3 100644 (file)
--- a/cpuboard.cpp
+++ b/cpuboard.cpp
@@ -71,7 +71,7 @@
 // 0x04
 #define P5_IRQ_PPC_1           0x08
 #define P5_IRQ_PPC_2           0x10
-// 0x20
+#define P5_IRQ_PPC_3           0x20 // MOS sets this bit
 // 0x40 always cleared
 
 /* REG_WAITSTATE 0x10 */
@@ -102,7 +102,7 @@
 // 0x20
 // 0x10 always cleared
 // 0x08
-// 0x04
+// 0x04 // MOS sets this bit
 #define        P5_ENABLE_IPL           0x02
 #define        P5_INT_MASTER           0x01 // 1=m68k gets interrupts, 0=ppc gets interrupts.
 
@@ -177,12 +177,10 @@ static void clear_ppc_interrupt(void)
 
 static void check_ppc_int_lvl(void)
 {
-       uae_u8 ipl;
-       uae_u8 il;
        if (!(io_reg[CSIII_REG_INT] & P5_ENABLE_IPL)) {
-               ipl = (~io_reg[CSIII_REG_IPL_EMU]) & P5_PPC_IPL_MASK;
+               uae_u8 ipl = (~io_reg[CSIII_REG_IPL_EMU]) & P5_PPC_IPL_MASK;
                if (ipl < 7) {
-                       il = (~io_reg[CSIII_REG_INT_LVL]) & 0x7f;
+                       uae_u8 il = (~io_reg[CSIII_REG_INT_LVL]) & 0x7f;
                        if (il) {
                                for (int i = ipl; i < 7; i++) {
                                        if (il & (1 << i)) {
@@ -198,17 +196,18 @@ static void check_ppc_int_lvl(void)
 
 bool ppc_interrupt(int new_m68k_ipl)
 {
-       uae_u8 ppcipl;
        bool m68kint = (io_reg[CSIII_REG_INT] & P5_INT_MASTER) != 0;
        bool active = (io_reg[CSIII_REG_IPL_EMU] & P5_DISABLE_INT) == 0;
        bool iplemu = (io_reg[CSIII_REG_INT] & P5_ENABLE_IPL) == 0;
+       uae_u8 ppcipl = (~io_reg[CSIII_REG_IPL_EMU]) & P5_PPC_IPL_MASK;
 
        if (!active)
                return false;
 
        if (new_m68k_ipl < 0)
                new_m68k_ipl = 0;
-       ppcipl = (io_reg[CSIII_REG_IPL_EMU] ^ 7) & 7;
+
+       //bool xirq =  !(io_reg[CSIII_REG_IRQ] & P5_IRQ_PPC_2) && (io_reg[CSIII_REG_IRQ] & P5_IRQ_PPC_3);
 
        if (!m68kint && iplemu && active) {
                if (new_m68k_ipl > ppcipl) {
@@ -223,7 +222,6 @@ bool ppc_interrupt(int new_m68k_ipl)
        return m68kint;
 }
 
-
 static bool is_blizzard(void)
 {
        return currprefs.cpuboard_type == BOARD_BLIZZARD_1230_IV || currprefs.cpuboard_type == BOARD_BLIZZARD_1230_IV_SCSI ||
@@ -294,7 +292,7 @@ DECLARE_MEMORY_FUNCTIONS(blizzardf0);
 static addrbank blizzardf0_bank = {
        blizzardf0_lget, blizzardf0_wget, blizzardf0_bget,
        blizzardf0_lput, blizzardf0_wput, blizzardf0_bput,
-       blizzardf0_xlate, blizzardf0_check, NULL, _T("rom_f0"), _T("CPUBoard F00000"),
+       blizzardf0_xlate, blizzardf0_check, NULL, _T("rom_f0_ppc"), _T("CPUBoard F00000"),
        blizzardf0_lget, blizzardf0_wget, ABFLAG_ROM
 };
 
@@ -758,6 +756,7 @@ static void blizzard_copymaprom(void)
        protect_roms(false);
        memcpy(dst, src, 524288);
        protect_roms(true);
+       set_roms_modified();
 }
 static void cyberstorm_copymaprom(void)
 {
@@ -767,6 +766,7 @@ static void cyberstorm_copymaprom(void)
                protect_roms(false);
                memcpy(dst, src, 524288);
                protect_roms(true);
+               set_roms_modified();
        }
 }
 static void cyberstormmk2_copymaprom(void)
@@ -777,6 +777,7 @@ static void cyberstormmk2_copymaprom(void)
                protect_roms(false);
                memcpy(dst, src, 524288);
                protect_roms(true);
+               set_roms_modified();
        }
 }
 static void cyberstormmk1_copymaprom(void)
@@ -787,6 +788,7 @@ static void cyberstormmk1_copymaprom(void)
                protect_roms(false);
                memcpy(dst, src, 524288);
                protect_roms(true);
+               set_roms_modified();
        }
 }
 
@@ -799,6 +801,7 @@ void cpuboard_rethink(void)
                if (!(io_reg[CSIII_REG_IRQ] & (P5_IRQ_PPC_1 | P5_IRQ_PPC_2))) {
                        INTREQ(0x8000 | 0x0008);
                }
+               check_ppc_int_lvl();
                ppc_interrupt(intlev());
        }
 }
@@ -1069,7 +1072,6 @@ static void REGPARAM2 blizzardio_bput(uaecptr addr, uae_u32 v)
                                        if ((regval & P5_PPC_IPL_MASK) != (oldval & P5_PPC_IPL_MASK))
                                                write_log(_T("CS: PPC IPL %02x\n"), (~regval) & P5_PPC_IPL_MASK);
 #endif
-                                       check_ppc_int_lvl();
                                } else if (addr == CSIII_REG_INT) {
 #if CPUBOARD_IRQ_LOG > 0
                                        if ((regval & P5_INT_MASTER) != (oldval & P5_INT_MASTER))
@@ -1077,13 +1079,11 @@ static void REGPARAM2 blizzardio_bput(uaecptr addr, uae_u32 v)
                                        if ((regval & P5_ENABLE_IPL) != (oldval & P5_ENABLE_IPL))
                                                write_log(_T("CS: IPL state: %s\n"), (regval & P5_ENABLE_IPL) ? _T("disabled") : _T("enabled"));
 #endif
-                                       check_ppc_int_lvl();
                                } else if (addr == CSIII_REG_INT_LVL) {
 #if CPUBOARD_IRQ_LOG > 0
                                        if (regval != oldval)
                                                write_log(_T("CS: interrupt level: %02x\n"), regval);
 #endif
-                                       check_ppc_int_lvl();
                                } else if (addr == CSIII_REG_SHADOW) {
                                        if (is_csmk3() && ((oldval ^ regval) & 1)) {
                                                maprom_state = (regval & 1) ? 0 : 1;
@@ -1150,6 +1150,16 @@ static void REGPARAM2 blizzardio_lput(uaecptr addr, uae_u32 v)
        }
 }
 
+void cpuboard_hsync(void)
+{
+       // we should call check_ppc_int_lvl() immediately
+       // after PPC CPU's interrupt flag is cleared but this
+       // should be fast enough for now
+       if (is_csmk3() || is_blizzardppc()) {
+               check_ppc_int_lvl();
+       }
+}
+
 void cpuboard_vsync(void)
 {
        if (delayed_rom_protect <= 0)
@@ -1219,8 +1229,9 @@ void cpuboard_map(void)
        }
 }
 
-void cpuboard_reset(bool hardreset)
+void cpuboard_reset(void)
 {
+       bool hardreset = is_hardreset();
        if (is_blizzard() || is_blizzardppc())
                canbang = 0;
        configured = false;
@@ -1443,6 +1454,12 @@ void cpuboard_init(void)
 
 void cpuboard_clear(void)
 {
+       if (blizzardmaprom_bank.baseaddr)
+               memset(blizzardmaprom_bank.baseaddr, 0, 524288);
+       if (blizzardmaprom2_bank.baseaddr)
+               memset(blizzardmaprom2_bank.baseaddr, 0, 524288);
+       if (is_csmk3()) // SCSI RAM
+               memset(blizzardf0_bank.baseaddr + 0x40000, 0, 0x10000);
 }
 
 bool is_ppc_cpu(struct uae_prefs *p)

diff --git a/custom.cpp b/custom.cpp
index 3362c4ef00769df6e05b863b44e5b5cefcb13121..fe7d7497e13bfd04bc6e99094f4febb1eb505b08 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -6827,7 +6827,7 @@ static bool framewait (void)
                        now = read_processor_time ();
 
                        if (extraframewait && !currprefs.turbo_emulation)
-                               sleep_millis_main (extraframewait);
+                               cpu_sleep_millis(extraframewait);
 
                        adjust = (int)now - (int)curr_time;
                        int adjustx = adjust;
@@ -6917,7 +6917,7 @@ static bool framewait (void)
                                if ((int)vsyncwaittime  - (int)curr_time <= 0 || (int)vsyncwaittime  - (int)curr_time > 2 * vsynctimebase)
                                        break;
                                rtg_vsynccheck ();
-                               sleep_millis_main (1);
+                               cpu_sleep_millis(1);
                        }
                } else {
                        curr_time = read_processor_time ();
@@ -6957,7 +6957,7 @@ static bool framewait (void)
                        if (v >= -4)
                                break;
                        rtg_vsynccheck ();
-                       sleep_millis_main (2);
+                       cpu_sleep_millis(2);
                }
                curr_time = start = read_processor_time ();
                while (rpt_vsync (clockadjust) < 0)
@@ -7523,6 +7523,7 @@ static void hsync_handler_pre (bool onvsync)
 #endif
 #ifdef WITH_PPC
        uae_ppc_hsync_handler();
+       cpuboard_hsync();
 #endif
        DISK_hsync ();
        if (currprefs.produce_sound)
@@ -7739,7 +7740,7 @@ static void hsync_handler_post (bool onvsync)
                                frame_time_t rpt = read_processor_time ();
                                // sleep if more than 2ms "free" time
                                while (!vsync_isdone () && (int)vsyncmintime - (int)(rpt + vsynctimebase / 10) > 0 && (int)vsyncmintime - (int)rpt < vsynctimebase) {
-                                       sleep_millis_main (1);
+                                       cpu_sleep_millis(1);
                                        rpt = read_processor_time ();
                                        //write_log (_T("*"));
                                }

diff --git a/events.cpp b/events.cpp
index 5637a3dc021a9555b1b251d4fe8dff00c7bee235..6ea8b780815165e8c3a78c178998c8bd09c8e7d8 100644 (file)
--- a/events.cpp
+++ b/events.cpp
@@ -25,6 +25,7 @@ long cycles_to_next_event;
 long max_cycles_to_next_event;
 long cycles_to_hsync_event;
 unsigned long start_cycles;
+bool event_wait;
 
 frame_time_t vsyncmintime, vsyncmaxtime, vsyncwaittime;
 int vsynctimebase;
@@ -66,16 +67,16 @@ void do_cycles_slow (unsigned long cycles_to_add)
                                        if (v > vsynctimebase || v < -vsynctimebase) {
                                                v = 0;
                                        }
-                                       if (v < 0 && v2 < 0) {
+                                       if (v < 0 && v2 < 0 && event_wait) {
+
 #ifdef WITH_PPC
                                                if (ppc_state) {
                                                        if (is_syncline == 1) {
-                                                               uae_ppc_execute_quick(0);
+                                                               uae_ppc_execute_check();
                                                        } else {
-                                                               uae_ppc_execute_quick(1);
+                                                               uae_ppc_execute_quick();
                                                        }
                                                }
-
 #endif
                                                if (currprefs.cachesize)
                                                        pissoff = pissoff_value;
@@ -86,10 +87,11 @@ void do_cycles_slow (unsigned long cycles_to_add)
                                } else if (is_syncline < 0) {
                                        int rpt = read_processor_time ();
                                        int v = rpt - is_syncline_end;
-                                       if (v < 0) {
+                                       if (v < 0 && event_wait) {
+
 #ifdef WITH_PPC
                                                if (ppc_state) {
-                                                       uae_ppc_execute_quick(0);
+                                                       uae_ppc_execute_check();
                                                }
 #endif
                                                if (currprefs.cachesize)

diff --git a/expansion.cpp b/expansion.cpp
index 88e7cc7da812fd7d565eba5dd7098dc40831d024..59365a53d7cfdba89459b8fbec0c0d8f30eb2a91 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -33,6 +33,7 @@
 #include "debug.h"
 #include "gayle.h"
 #include "cpuboard.h"
+#include "uae/ppc.h"
 
 #define MAX_EXPANSION_BOARDS 11
 
@@ -184,9 +185,21 @@ uae_u32 expamem_z3_size;
 uae_u32 expamem_z2_size;
 static uae_u32 expamem_board_size;
 static uae_u32 expamem_board_pointer;
+static bool z3hack_override;
+
+void set_expamem_z3_hack_override(bool overridenoz3hack)
+{
+       z3hack_override = overridenoz3hack;
+}
 
 bool expamem_z3hack(struct uae_prefs *p)
 {
+       if (z3hack_override)
+               return false;
+#ifdef WITH_PPC
+       if (regs.halted && ppc_state)
+               return false;
+#endif
        return p->jit_direct_compatible_memory || cpuboard_blizzardram(p);
 }
 
@@ -346,8 +359,8 @@ static void call_card_init(int index)
 
                if (expamem_z3_sum < 0x10000000) {
                        expamem_z3_sum = currprefs.z3autoconfig_start;
-                       if (currprefs.mbresmem_high_size == 128 * 1024 * 1024)
-                               expamem_z3_sum += 16 * 1024 * 1024;
+                       if (currprefs.mbresmem_high_size >= 128 * 1024 * 1024 && expamem_z3_sum == 0x10000000)
+                               expamem_z3_sum += (currprefs.mbresmem_high_size - 128 * 1024 * 1024) + 16 * 1024 * 1024;
                        if (!expamem_z3hack(&currprefs))
                                expamem_z3_sum = 0x40000000;
                        if (expamem_z3_sum == 0x10000000) {
@@ -1358,17 +1371,19 @@ static void allocate_expamem (void)
 
        z3chipmem_bank.start = 0x10000000;
        z3fastmem_bank.start = currprefs.z3autoconfig_start;
-       if (currprefs.mbresmem_high_size == 128 * 1024 * 1024)
-               z3chipmem_bank.start += 16 * 1024 * 1024;
+       if (currprefs.mbresmem_high_size >= 128 * 1024 * 1024)
+               z3chipmem_bank.start += (currprefs.mbresmem_high_size - 128 * 1024 * 1024) + 16 * 1024 * 1024;
        if (!expamem_z3hack(&currprefs))
                z3fastmem_bank.start = 0x40000000;
-       if (currprefs.cpuboard_type == BOARD_WARPENGINE_A4000) {
-               z3fastmem_bank.start += 0x01000000;
-               z3fastmem_bank.start = expansion_startaddress(z3fastmem_bank.start, currprefs.z3fastmem_size);
+       if (z3fastmem_bank.start == 0x40000000) {
+               if (currprefs.cpuboard_type == BOARD_WARPENGINE_A4000) {
+                       z3fastmem_bank.start += 0x01000000;
+                       z3fastmem_bank.start = expansion_startaddress(z3fastmem_bank.start, currprefs.z3fastmem_size);
+               }
        }
        if (z3fastmem_bank.start == 0x10000000) {
-               if (currprefs.mbresmem_high_size == 128 * 1024 * 1024)
-                       z3fastmem_bank.start += 16 * 1024 * 1024;
+               if (currprefs.mbresmem_high_size >= 128 * 1024 * 1024)
+                       z3fastmem_bank.start += (currprefs.mbresmem_high_size - 128 * 1024 * 1024) + 16 * 1024 * 1024;
                z3fastmem_bank.start += currprefs.z3chipmem_size;
        }
        z3fastmem2_bank.start = z3fastmem_bank.start + currprefs.z3fastmem_size;

diff --git a/include/cpuboard.h b/include/cpuboard.h
index bdb87d7d8b28c59b7e36c7aad8415bf8aa3afbb6..5c52d166b1b1396fd2d8a12c1574b1c96ce01bd9 100644 (file)
--- a/include/cpuboard.h
+++ b/include/cpuboard.h
@@ -2,11 +2,12 @@
 extern addrbank *cpuboard_autoconfig_init(void);
 extern bool cpuboard_maprom(void);
 extern void cpuboard_map(void);
-extern void cpuboard_reset(bool);
+extern void cpuboard_reset(void);
 extern void cpuboard_cleanup(void);
 extern void cpuboard_init(void);
 extern void cpuboard_clear(void);
 extern void cpuboard_vsync(void);
+extern void cpuboard_hsync(void);
 extern void cpuboard_rethink(void);
 extern bool cpuboard_08000000(struct uae_prefs *p);
 extern bool cpuboard_blizzardram(struct uae_prefs *p);

diff --git a/include/events.h b/include/events.h
index b4014d00908ab098a184de6d230a27cfb4feacd7..b44e9e666d6d25789adc45b94926aa5ff2962870 100644 (file)
--- a/include/events.h
+++ b/include/events.h
@@ -22,6 +22,7 @@ extern void reset_frame_rate_hack (void);
 extern unsigned long int vsync_cycles;
 extern unsigned long start_cycles;
 extern int event2_count;
+extern bool event_wait;
 
 extern void compute_vsynctime (void);
 extern void init_eventtab (void);

diff --git a/include/memory.h b/include/memory.h
index 14c37e6f224e853564b058b3e9cc1b6fcd896820..a87c2b7676b4f8bc9201d451367ac1ee7d3c65ed 100644 (file)
--- a/include/memory.h
+++ b/include/memory.h
@@ -349,6 +349,7 @@ extern void expamem_reset (void);
 extern void expamem_next (addrbank *mapped, addrbank *next);
 extern void expamem_shutup (addrbank *mapped);
 extern bool expamem_z3hack(struct uae_prefs*);
+extern void set_expamem_z3_hack_override(bool);
 extern uaecptr expamem_z3_pointer, expamem_z2_pointer;
 extern uae_u32 expamem_z3_size, expamem_z2_size;
 
@@ -411,6 +412,7 @@ extern void map_overlay (int chip);
 extern void memory_hardreset (int);
 extern void memory_clear (void);
 extern void free_fastmemory (int);
+extern void set_roms_modified (void);
 
 #define longget(addr) (call_mem_get_func(get_mem_bank(addr).lget, addr))
 #define wordget(addr) (call_mem_get_func(get_mem_bank(addr).wget, addr))

diff --git a/include/newcpu.h b/include/newcpu.h
index 812c2e65baebb4f26867d71ca54a1d7879bbb997..d21efe9e76c101677656d6994d364e2563815138 100644 (file)
--- a/include/newcpu.h
+++ b/include/newcpu.h
@@ -552,6 +552,7 @@ extern void divbyzero_special (bool issigned, uae_s32 dst);
 extern void m68k_do_rte (void);
 extern void protect_roms (bool);
 extern void unprotect_maprom (void);
+extern bool is_hardreset(void);
 
 extern void mmu_op (uae_u32, uae_u32);
 extern void mmu_op30 (uaecptr, uae_u32, uae_u16, uaecptr);
@@ -578,6 +579,7 @@ extern void exception2_fake (uaecptr addr);
 extern void m68k_reset (void);
 extern void cpureset (void);
 extern void cpu_halt (int id);
+extern void cpu_sleep_millis(int ms);
 
 extern void fill_prefetch (void);
 extern void fill_prefetch_020 (void);

diff --git a/include/options.h b/include/options.h
index 89ce3df2af74d758eb487d154e289d80933d3739..c7de3effbbc9dccbe15071470b3b04b22f7e9cdc 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -408,6 +408,7 @@ struct uae_prefs {
        bool uaeserial;
        int catweasel;
        int cpu_idle;
+       int ppc_cpu_idle;
        bool cpu_cycle_exact;
        int cpu_clock_multiplier;
        int cpu_frequency;
@@ -505,6 +506,7 @@ struct uae_prefs {
        int fpu_model;
        int fpu_revision;
        int ppc_mode;
+       TCHAR ppc_model[32];
        bool cpu_compatible;
        bool int_no_unimplemented;
        bool fpu_no_unimplemented;

diff --git a/include/uae/ppc.h b/include/uae/ppc.h
index bbca1cd8b42b3c7f876338dbaabbb71b1236b5b5..51020983b04a6d5f85126878c9896be127b8e30e 100644 (file)
--- a/include/uae/ppc.h
+++ b/include/uae/ppc.h
@@ -40,7 +40,8 @@ void uae_ppc_hsync_handler(void);
 void uae_ppc_wakeup(void);
 void ppc_map_banks(uae_u32, uae_u32, const TCHAR*, void*, bool);
 
-void uae_ppc_execute_quick(int linetype);
+void uae_ppc_execute_quick(void);
+void uae_ppc_execute_check(void);
 void uae_ppc_spinlock_reset(void);
 void uae_ppc_spinlock_get(void);
 void uae_ppc_spinlock_release(void);

diff --git a/inputdevice.cpp b/inputdevice.cpp
index 43fbbce87fa423dd91138e4402967e2335ae7248..1e03c941bece0c06653b8441ad76d0b4c6da3ec1 100644 (file)
--- a/inputdevice.cpp
+++ b/inputdevice.cpp
@@ -2689,6 +2689,17 @@ void inputdevice_release_all_keys (void)
        }
 }
 
+static bool inputdevice_handle_inputcode_immediate(int code, int state)
+{
+       switch(code)
+       {
+               case AKS_ENTERDEBUGGER:
+                       activate_debugger ();
+                       return true;
+       }
+       return false;
+}
+
 
 void inputdevice_add_inputcode (int code, int state)
 {
@@ -2698,8 +2709,10 @@ void inputdevice_add_inputcode (int code, int state)
        }
        for (int i = 0; i < MAX_PENDING_EVENTS; i++) {
                if (inputcode_pending[i] == 0) {
-                       inputcode_pending[i] = code;
-                       inputcode_pending_state[i] = state;
+                       if (!inputdevice_handle_inputcode_immediate(code, state)) {
+                               inputcode_pending[i] = code;
+                               inputcode_pending_state[i] = state;
+                       }
                        return;
                }
        }

diff --git a/main.cpp b/main.cpp
index 489197243d57a01d60e20ce21dfd0077bd8c5a39..6ef37f82bb01e1cf470b3d89e07c72e8fae38c52 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -309,8 +309,8 @@ void fixup_cpu (struct uae_prefs *p)
        if (p->cpu_cycle_exact)
                p->cpu_compatible = true;
 
-       if (p->cpuboard_type && !p->comptrustbyte) {
-               error_log(_T("JIT direct is not compatible with emulated accelerator boards."));
+       if (cpuboard_blizzardram(p) && !p->comptrustbyte) {
+               error_log(_T("JIT direct is not compatible with emulated Blizzard accelerator boards."));
                p->comptrustbyte = 1;
                p->comptrustlong = 1;
                p->comptrustlong = 1;
@@ -644,7 +644,7 @@ void fixup_prefs (struct uae_prefs *p)
 #endif
        if (p->maprom && !p->address_space_24)
                p->maprom = 0x0f000000;
-       if (((p->maprom & 0xff000000) && p->address_space_24) || (p->maprom && p->mbresmem_high_size == 0x08000000)) {
+       if (((p->maprom & 0xff000000) && p->address_space_24) || (p->maprom && p->mbresmem_high_size >= 0x08000000)) {
                p->maprom = 0x00e00000;
        }
        if (p->tod_hack && p->cs_ciaatod == 0)
@@ -887,7 +887,7 @@ void reset_all_systems (void)
        init_eventtab ();
 
 #ifdef WITH_PPC
-       uae_ppc_reset(false);
+       uae_ppc_reset(is_hardreset());
 #endif
 #ifdef PICASSO96
        picasso_reset ();

diff --git a/memory.cpp b/memory.cpp
index f2ec4ed3e5012d303f8f0a2dd25a705054770e43..7f2a7d8c726299aae34d8c46df2193acca271b52 100644 (file)
--- a/memory.cpp
+++ b/memory.cpp
@@ -45,6 +45,7 @@ static bool rom_write_enabled;
 int special_mem;
 #endif
 static int mem_hardreset;
+static bool roms_modified;
 
 #define FLASHEMU 0
 
@@ -1304,9 +1305,10 @@ static int read_kickstart (struct zfile *f, uae_u8 *mem, int size, int dochecksu
                if (!decode_rom (mem, size, cr, i))
                        return 0;
        }
-       if (currprefs.cs_a1000ram) {
+       if (currprefs.cs_a1000ram && i < ROM_SIZE_256) {
                int off = 0;
-               a1000_bootrom = xcalloc (uae_u8, ROM_SIZE_256);
+               if (!a1000_bootrom)
+                       a1000_bootrom = xcalloc (uae_u8, ROM_SIZE_256);
                while (off + i < ROM_SIZE_256) {
                        memcpy (a1000_bootrom + off, kickmem_bank.baseaddr, i);
                        off += i;
@@ -2163,7 +2165,7 @@ void memory_reset (void)
        currprefs.cs_ide = changed_prefs.cs_ide;
        currprefs.cs_fatgaryrev = changed_prefs.cs_fatgaryrev;
        currprefs.cs_ramseyrev = changed_prefs.cs_ramseyrev;
-       cpuboard_reset(mem_hardreset > 2);
+       cpuboard_reset();
 
        gayleorfatgary = (currprefs.chipset_mask & CSMASK_AGA) || currprefs.cs_pcmcia || currprefs.cs_ide > 0 || currprefs.cs_mbdmac;
 
@@ -2171,10 +2173,11 @@ void memory_reset (void)
        allocate_memory ();
        chipmem_setindirect ();
 
-       if (mem_hardreset > 1
+       if (mem_hardreset > 1 || ((roms_modified || a1000_bootrom) && is_hardreset())
                || _tcscmp (currprefs.romfile, changed_prefs.romfile) != 0
                || _tcscmp (currprefs.romextfile, changed_prefs.romextfile) != 0)
        {
+               roms_modified = false;
                protect_roms (false);
                write_log (_T("ROM loader.. (%s)\n"), currprefs.romfile);
                kickstart_rom = 1;
@@ -2454,7 +2457,7 @@ void memory_init (void)
        memset (kickmem_bank.baseaddr, 0, ROM_SIZE_512);
        _tcscpy (currprefs.romfile, _T("<none>"));
        currprefs.romextfile[0] = 0;
-       cpuboard_reset(0);
+       cpuboard_reset();
 
 #ifdef ACTION_REPLAY
        action_replay_unload (0);
@@ -2502,6 +2505,11 @@ void memory_cleanup (void)
 #endif
 }
 
+void set_roms_modified(void)
+{
+       roms_modified = true;
+}
+
 void memory_hardreset (int mode)
 {
        if (mode + 1 > mem_hardreset)

diff --git a/newcpu.cpp b/newcpu.cpp
index cfe24f557acaeb71e1ac9e4cdbd41a0d2cffabfa..3839fbcab3c4fd1b73d470e49ab8766189814488 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -1405,6 +1405,7 @@ void check_prefs_changed_cpu(void)
                return;
 
        currprefs.cpu_idle = changed_prefs.cpu_idle;
+       currprefs.ppc_cpu_idle = changed_prefs.ppc_cpu_idle;
        currprefs.reset_delay = changed_prefs.reset_delay;
 
        if (check_prefs_changed_cpu2()) {
@@ -3151,36 +3152,110 @@ static void do_trace (void)
        }
 }
 
+void cpu_sleep_millis(int ms)
+{
+#ifdef WITH_PPC
+       int state = ppc_state;
+       if (state)
+               uae_ppc_spinlock_release();
+#endif
+       sleep_millis_main(ms);
+#ifdef WITH_PPC
+       if (state)
+               uae_ppc_spinlock_get();
+#endif
+}
+
+#define PPC_HALTLOOP_SCANLINES 25
+//  ppc_cpu_idle
+// 0 = busy
+// 1-9 = wait, levels
+// 10 = max wait
 
 static bool haltloop(void)
 {
-       while (regs.halted) {
-               if (regs.halted >= 0) {
+       if (regs.halted < 0) {
+
+               int vsynctimeline = vsynctimebase / (maxvpos_display + 1);
+               int rpt_end = 0;
+               int ovpos = vpos;
+
+               while (regs.halted) {
+                       int lines;
+
+                       if (currprefs.ppc_cpu_idle) {
+
+                               int maxlines = 100 - (currprefs.ppc_cpu_idle - 1) * 10;
+                               int i;
+
+                               int rpt_scanline = read_processor_time();
+
+                               event_wait = false;
+                               for (i = 0; i < ev_max; i++) {
+                                       if (i == ev_hsync)
+                                               continue;
+                                       if (i == ev_audio)
+                                               continue;
+                                       if (!eventtab[i].active)
+                                               continue;
+                                       if (eventtab[i].evtime - currcycle < maxlines * maxhpos * CYCLE_UNIT)
+                                               break;
+                               }
+                               if (currprefs.ppc_cpu_idle >= 10 || (i == ev_max && vpos > 0 && vpos < maxvpos - maxlines)) {
+                                       cpu_sleep_millis(1);
+                               }
+
+                               lines = (read_processor_time() - rpt_scanline) / vsynctimeline + 1;
+
+                       } else {
+
+                               event_wait = true;
+                               lines = 0;
+
+                       }
+
+                       while (lines-- >= 0) {
+                               ovpos = vpos;
+                               while (ovpos == vpos) {
+                                       x_do_cycles(4 * CYCLE_UNIT);
+                                       if (regs.spcflags) {
+                                               if (regs.spcflags & SPCFLAG_COPPER)
+                                                       do_copper();
+                                               if (regs.spcflags & (SPCFLAG_BRK | SPCFLAG_MODE_CHANGE))
+                                                       return true;
+                                       }
+                               }
+                       }
+
+#ifdef WITH_PPC
+                       if (regs.halted < 0)
+                               uae_ppc_emulate();
+#endif
+
+               }
+
+       } else  {
+
+               while (regs.halted) {
                        static int prevvpos;
                        if (vpos == 0 && prevvpos) {
                                prevvpos = 0;
-                               sleep_millis_main(8);
+                               cpu_sleep_millis(8);
                        }
                        if (vpos)
                                prevvpos = 1;
                        x_do_cycles(8 * CYCLE_UNIT);
-               } else {
-                       x_do_cycles(32 * CYCLE_UNIT);
-               }
 
-               if (regs.spcflags & SPCFLAG_COPPER)
-                       do_copper();
-
-#ifdef WITH_PPC
-               if (regs.halted < 0)
-                       uae_ppc_emulate();
-#endif
+                       if (regs.spcflags & SPCFLAG_COPPER)
+                               do_copper();
 
-               if (regs.spcflags) {
-                       if ((regs.spcflags & (SPCFLAG_BRK | SPCFLAG_MODE_CHANGE)))
-                               return true;
+                       if (regs.spcflags) {
+                               if ((regs.spcflags & (SPCFLAG_BRK | SPCFLAG_MODE_CHANGE)))
+                                       return true;
+                       }
                }
        }
+
        return false;
 }
 
@@ -3310,6 +3385,7 @@ static int do_specialties (int cycles)
                if (ppc_state)  {
                        if (uae_ppc_poll_check_halt())
                                return true;
+                       uae_ppc_execute_check();
                }
 #endif
        }
@@ -3360,8 +3436,9 @@ static int do_specialties (int cycles)
                                unset_special (SPCFLAG_INT | SPCFLAG_DOINT);
 #ifdef WITH_PPC
                                bool m68kint = true;
-                               if (ppc_state)
+                               if (ppc_state) {
                                        m68kint = ppc_interrupt(intr);
+                               }
                                if (m68kint) {
 #endif
                                        if (intr > 0 && intr > regs.intmask)
@@ -3378,8 +3455,10 @@ static int do_specialties (int cycles)
                }
 
 #ifdef WITH_PPC
-               if (ppc_state)
+               if (ppc_state) {
+                       uae_ppc_execute_check();
                        uae_ppc_poll_check_halt();
+               }
 #endif
 
                if (!uae_int_requested && !uaenet_int_requested && currprefs.cpu_idle && currprefs.m68k_speed != 0 && (regs.spcflags & SPCFLAG_STOP)
@@ -3405,7 +3484,7 @@ static int do_specialties (int cycles)
 #endif
                                                if (sleepcnt < 0) {
                                                        sleepcnt = IDLETIME / 2;
-                                                       sleep_millis_main (1);
+                                                       cpu_sleep_millis(1);
                                                }
                                        }
                                }
@@ -4450,6 +4529,14 @@ static void exception2_handle (uaecptr addr, uaecptr fault)
        Exception (2);
 }
 
+static bool cpu_hardreset;
+
+bool is_hardreset(void)
+{
+       return cpu_hardreset;
+}
+
+
 void m68k_go (int may_quit)
 {
        int hardboot = 1;
@@ -4482,11 +4569,12 @@ void m68k_go (int may_quit)
                        inprec_startup ();
 
                if (quit_program > 0) {
-                       int hardreset = (quit_program == UAE_RESET_HARD ? 1 : 0) | hardboot;
+                       int restored = 0;
                        bool kbreset = quit_program == UAE_RESET_KEYBOARD;
+                       cpu_hardreset = ((quit_program == UAE_RESET_HARD ? 1 : 0) | hardboot) != 0;
+
                        if (quit_program == UAE_QUIT)
                                break;
-                       int restored = 0;
 
                        hsync_counter = 0;
                        vsync_counter = 0;
@@ -4502,12 +4590,13 @@ void m68k_go (int may_quit)
                                savestate_rewind ();
 #endif
                        set_cycles (start_cycles);
-                       custom_reset (hardreset != 0, kbreset);
-                       m68k_reset2 (hardreset != 0);
-                       if (hardreset) {
+                       custom_reset (cpu_hardreset != 0, kbreset);
+                       m68k_reset2 (cpu_hardreset != 0);
+                       if (cpu_hardreset) {
                                memory_clear ();
                                write_log (_T("hardreset, memory cleared\n"));
                        }
+                       cpu_hardreset = false;
 #ifdef SAVESTATE
                        /* We may have been restoring state, but we're done now.  */
                        if (isrestore ()) {
@@ -4596,6 +4685,8 @@ void m68k_go (int may_quit)
                startup = 0;
                if (regs.halted) {
                        cpu_halt (regs.halted);
+                       if (regs.halted < 0)
+                               haltloop();
                        continue;
                }
 
@@ -4623,6 +4714,7 @@ void m68k_go (int may_quit)
 #if 0
                }
 #endif
+               event_wait = true;
                unset_special(SPCFLAG_MODE_CHANGE);
                run_func();
        }

diff --git a/od-win32/mman.cpp b/od-win32/mman.cpp
index a3678b1f342418da4e123824267f9b42d3211270..561ad2459f04d4bf260d78603771a854aa9365b1 100644 (file)
--- a/od-win32/mman.cpp
+++ b/od-win32/mman.cpp
@@ -194,15 +194,18 @@ bool preinit_shm (void)
                }
        }
        if (!natmem_offset_allocated) {
+               DWORD vaflags = MEM_RESERVE | MEM_WRITE_WATCH;
+               if (!os_vista)
+                       vaflags |= MEM_TOP_DOWN;
                for (;;) {
-                       natmem_offset_allocated = (uae_u8*)VirtualAlloc (NULL, natmem_size, MEM_RESERVE | MEM_WRITE_WATCH | MEM_TOP_DOWN, PAGE_READWRITE);
+                       natmem_offset_allocated = (uae_u8*)VirtualAlloc (NULL, natmem_size, vaflags, PAGE_READWRITE);
                        if (natmem_offset_allocated)
                                break;
                        natmem_size -= 128 * 1024 * 1024;
                        if (!natmem_size) {
                                write_log (_T("Can't allocate 257M of virtual address space!?\n"));
                                natmem_size = 17 * 1024 * 1024;
-                               natmem_offset_allocated = (uae_u8*)VirtualAlloc (NULL, natmem_size, MEM_RESERVE | MEM_WRITE_WATCH | MEM_TOP_DOWN, PAGE_READWRITE);
+                               natmem_offset_allocated = (uae_u8*)VirtualAlloc (NULL, natmem_size, vaflags, PAGE_READWRITE);
                                if (!natmem_size) {
                                        write_log (_T("Can't allocate 17M of virtual address space!? Something is seriously wrong\n"));
                                        return false;
@@ -307,7 +310,7 @@ static int doinit_shm (void)
                z3size = 0;
                othersize = 0;
                size = 0x1000000;
-               startbarrier = changed_prefs.mbresmem_high_size == 128 * 1024 * 1024 ? 16 * 1024 * 1024 : 0;
+               startbarrier = changed_prefs.mbresmem_high_size >= 128 * 1024 * 1024 ? (changed_prefs.mbresmem_high_size - 128 * 1024 * 1024) + 16 * 1024 * 1024 : 0;
                z3rtgmem_size = gfxboard_is_z3 (changed_prefs.rtgmem_type) ? changed_prefs.rtgmem_size : 0;
                if (changed_prefs.cpu_model >= 68020)
                        size = 0x10000000;
@@ -340,6 +343,7 @@ static int doinit_shm (void)
                }
        }
 
+       set_expamem_z3_hack_override(false);
        z3offset = 0;
        if ((changed_prefs.z3autoconfig_start == 0x10000000 || changed_prefs.z3autoconfig_start == 0x40000000) && !changed_prefs.force_0x10000000_z3 && !cpuboard_blizzardram(&changed_prefs)) {
                if (1 && natmem_size > 0x40000000 && natmem_size - 0x40000000 >= (totalsize - 0x10000000 - ((changed_prefs.z3chipmem_size + align) & ~align)) && changed_prefs.z3chipmem_size <= 512 * 1024 * 1024) {
@@ -347,6 +351,9 @@ static int doinit_shm (void)
                        z3offset += 0x40000000 - 0x10000000 - ((changed_prefs.z3chipmem_size + align) & ~align);
                        if (currprefs.cpuboard_type == BOARD_WARPENGINE_A4000)
                                z3offset += 0x01000000;
+                       set_expamem_z3_hack_override(true);
+                       startbarrier = 0;
+                       write_log(_T("Z3 autoconfig option automatically disabled\n"));
                } else {
                        changed_prefs.z3autoconfig_start = currprefs.z3autoconfig_start = 0x10000000;
                }
@@ -361,7 +368,7 @@ static int doinit_shm (void)
                p96base_offset = getz2rtgaddr (changed_prefs.rtgmem_size);
        }
        if (p96base_offset) {
-               if (expamem_z3hack(&changed_prefs)) {
+               if (changed_prefs.jit_direct_compatible_memory) {
                        p96mem_offset = natmem_offset + p96base_offset;
                } else {
                        // calculate Z3 alignment (argh, I thought only Z2 needed this..)
@@ -573,6 +580,11 @@ void *shmat (addrbank *ab, int shmid, void *shmaddr, int shmflg)
                        shmaddr=natmem_offset + 0xf00000;
                        got = TRUE;
                        readonly = TRUE;
+               } else if(!_tcscmp (shmids[shmid].name, _T("rom_f0_ppc"))) {
+                       // this is flash and also contains IO
+                       shmaddr=natmem_offset + 0xf00000;
+                       got = TRUE;
+                       readonly = FALSE;
                } else if (!_tcscmp(shmids[shmid].name, _T("rtarea"))) {
                        shmaddr = natmem_offset + rtarea_base;
                        got = TRUE;

diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h
index a2790f7eacf5f328cedaeb766e73151de405cc09..7c9e93616c805905ce5025a722e00fae724a7254 100644 (file)
--- a/od-win32/resources/resource.h
+++ b/od-win32/resources/resource.h
@@ -535,6 +535,7 @@
 #define IDC_8BIT                        1230
 #define IDC_CPU_PPC                     1230
 #define IDC_16BIT                       1231
+#define IDC_PPC_CPUIDLE                 1231
 #define IDC_11KHZ                       1232
 #define IDC_22KHZ                       1233
 #define IDC_44KHZ                       1234

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 0ba3a8b3df0741a537939f9746e8be8d5c0697ca..042260098b47333898e47976035659aa4ec19223 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -217,35 +217,35 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     GROUPBOX        "CPU",IDC_STATIC,1,1,129,184,BS_LEFT
-    CONTROL         "68000",IDC_CPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,15,63,10
-    CONTROL         "68010",IDC_CPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,29,63,10
-    CONTROL         "68020",IDC_CPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,42,63,10
-    CONTROL         "68030",IDC_CPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,56,63,10
-    CONTROL         "68040",IDC_CPU4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,70,63,10
-    CONTROL         "68060",IDC_CPU5,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,84,63,10
-    CONTROL         "24-bit addressing",IDC_COMPATIBLE24,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,101,119,12
+    CONTROL         "68000",IDC_CPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,19,63,10
+    CONTROL         "68010",IDC_CPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,33,63,10
+    CONTROL         "68020",IDC_CPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,46,63,10
+    CONTROL         "68030",IDC_CPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,60,63,10
+    CONTROL         "68040",IDC_CPU4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,74,63,10
+    CONTROL         "68060",IDC_CPU5,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,88,63,10
+    CONTROL         "24-bit addressing",IDC_COMPATIBLE24,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,108,119,12
     CONTROL         "More compatible [] 68000: emulate prefetch. 68020+: emulate prefetch partially. More compatible but slower.",IDC_COMPATIBLE,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,115,118,11
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,121,118,11
     CONTROL         "JIT [] Enable just-in-time CPU emulator. Significantly increases the speed of the CPU emulation. Requires 68020 or higher CPU.",IDC_JITENABLE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,128,120,11
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,135,120,11
     CONTROL         "MMU [] 68030, 68040 and 68060 MMU emulation. Not compatible with JIT.",IDC_MMUENABLE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,142,120,11
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,148,120,11
     CONTROL         "Unimplemented CPU emu [] Emulate 68060 unimplemented integer instructions",IDC_CPU_UNIMPLEMENTED,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,156,118,10
-    GROUPBOX        "CPU Emulation Speed",IDC_STATIC,136,3,258,111
-    CONTROL         "Fastest possible",IDC_CS_HOST,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,143,24,195,10
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,161,118,10
+    GROUPBOX        "CPU Emulation Speed",IDC_STATIC,136,3,258,95
+    CONTROL         "Fastest possible",IDC_CS_HOST,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,143,19,195,10
     CONTROL         "Approximate A500/A1200 or cycle-exact",IDC_CS_68000,
-                    "Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,143,38,195,10
-    CONTROL         "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,142,62,192,20
-    RTEXT           "CPU Speed",IDC_STATIC,141,90,55,9,SS_CENTERIMAGE
-    EDITTEXT        IDC_CPUTEXT,204,89,30,12,ES_CENTER | ES_READONLY
-    RTEXT           "CPU Idle",IDC_STATIC,239,90,62,9
-    CONTROL         "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,308,85,69,21
-    GROUPBOX        "Cycle-exact CPU Emulation Speed",IDC_STATIC,136,121,258,64
-    RTEXT           "CPU Frequency",IDC_STATIC,139,145,67,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_CPU_FREQUENCY,215,144,89,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_CPU_FREQUENCY2,312,143,70,15
-    GROUPBOX        "FPU",IDC_STATIC,1,188,129,99,BS_LEFT
+                    "Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,143,33,195,10
+    CONTROL         "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,142,50,192,20
+    RTEXT           "CPU Speed",IDC_STATIC,141,77,55,9,SS_CENTERIMAGE
+    EDITTEXT        IDC_CPUTEXT,204,76,30,12,ES_CENTER | ES_READONLY
+    RTEXT           "CPU Idle",IDC_STATIC,239,77,62,9
+    CONTROL         "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,308,72,69,21
+    GROUPBOX        "Cycle-exact CPU Emulation Speed",IDC_STATIC,136,100,258,42
+    RTEXT           "CPU Frequency",IDC_STATIC,139,121,67,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_CPU_FREQUENCY,215,120,89,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_CPU_FREQUENCY2,312,119,70,15
+    GROUPBOX        "FPU",IDC_STATIC,1,188,129,101,BS_LEFT
     CONTROL         "None",IDC_FPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,202,87,10
     CONTROL         "68881",IDC_FPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,216,87,10
     CONTROL         "68882",IDC_FPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,229,87,10
@@ -254,18 +254,21 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,259,117,10
     CONTROL         "Unimplemented FPU emu [] Emulate FPU unimplemented instructions",IDC_FPU_UNIMPLEMENTED,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,272,116,10
-    GROUPBOX        "Advanced JIT Settings",IDC_STATIC,136,188,258,99
-    RTEXT           "Cache size:",IDC_STATIC,143,207,66,10,SS_CENTERIMAGE
-    CONTROL         "Slider1",IDC_CACHE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,212,201,115,20
-    EDITTEXT        IDC_CACHETEXT,331,206,30,12,ES_CENTER | ES_READONLY
-    CONTROL         "Hard flush",IDC_HARDFLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,234,84,11
-    CONTROL         "Constant jump",IDC_CONSTJUMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,248,84,11
-    CONTROL         "FPU support",IDC_JITFPU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,262,84,11
-    CONTROL         "No flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,243,234,68,11
-    CONTROL         "Direct",IDC_TRUST0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,315,234,72,10
-    CONTROL         "Indirect",IDC_TRUST1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,315,248,72,10
-    CONTROL         "PPC [] Automatically configure CyberStorm PPC or Blizzard PPC setup.",IDC_CPU_PPC,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,169,118,10
+    GROUPBOX        "Advanced JIT Settings",IDC_STATIC,136,209,258,80
+    RTEXT           "Cache size:",IDC_STATIC,143,225,66,10,SS_CENTERIMAGE
+    CONTROL         "Slider1",IDC_CACHE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,212,219,115,20
+    EDITTEXT        IDC_CACHETEXT,331,224,30,12,ES_CENTER | ES_READONLY
+    CONTROL         "Hard flush",IDC_HARDFLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,244,84,11
+    CONTROL         "Constant jump",IDC_CONSTJUMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,258,84,11
+    CONTROL         "FPU support",IDC_JITFPU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,272,84,11
+    CONTROL         "No flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,313,244,68,11
+    CONTROL         "Direct",IDC_TRUST0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,313,261,72,10
+    CONTROL         "Indirect",IDC_TRUST1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,313,275,72,10
+    CONTROL         "PPC CPU emulation (Blizzard PPC / CyberStorm PPC) [] Automatically configure CyberStorm PPC or Blizzard PPC setup.",IDC_CPU_PPC,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,145,161,236,10
+    GROUPBOX        "PPC CPU options",IDC_STATIC,136,144,258,62
+    RTEXT           "Stopped M68K CPU idle mode",IDC_STATIC,180,183,121,9
+    CONTROL         "",IDC_PPC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,308,177,69,21
 END
 
 IDD_FLOPPY DIALOGEX 0, 0, 396, 261

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index d17faa89acef6a0468f018d2c530938f2ec917e2..1c82d713fb91116144e752c6f35dead5d5231ee3 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -6107,7 +6107,7 @@ HMODULE WIN32_LoadLibrary_2 (const TCHAR *name, int expand)
        if (!newname)
                return NULL;
        for (round = 0; round < 6; round++) {
-               TCHAR s[MAX_DPATH];
+               TCHAR s[MAX_DPATH], dir[MAX_DPATH], dir2[MAX_DPATH];
                _tcscpy (newname, name);
 #ifdef CPU_64_BIT
                switch(round)
@@ -6143,12 +6143,22 @@ HMODULE WIN32_LoadLibrary_2 (const TCHAR *name, int expand)
 #endif
                get_plugin_path (s, sizeof s / sizeof (TCHAR), NULL);
                _tcscat (s, newname);
+               GetDllDirectory(sizeof(dir2) / sizeof TCHAR, dir2);
+               getpathpart(dir, sizeof(dir) / sizeof TCHAR, s);
+               stripslashes(dir);
+               if (dir[0])
+                       SetDllDirectory(dir);
                m = LoadLibrary (s);
                LLError (m ,s);
-               if (m)
+               if (m) {
+                       if (dir2[0])
+                               SetDllDirectory(dir2);
                        goto end;
+               }
                m = LoadLibrary (newname);
                LLError (m, newname);
+               if (dir2[0])
+                       SetDllDirectory(dir2);
                if (m)
                        goto end;
 #ifndef CPU_64_BIT

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 7a5d2d68fd04ee4c13692aa5a942eb2e10f319eb..b8c69bb0ff9fe424508a1852e69f9508d3b98a82 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,12 +20,12 @@
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("16")
+#define WINUAEBETA _T("17")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2014, 9, 13)
+#define WINUAEDATE MAKEBD(2014, 9, 21)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index badcc36340cec17b101df1cbc97ac8e48d11072f..de5b596970b62a8c2e210d51acc2c194ddb10d26 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -7438,8 +7438,8 @@ static void setmax32bitram (HWND hDlg)
                ((rtgz3size + sizealign) & ~sizealign);
        if (cfgfile_board_enabled(&currprefs.a4091rom))
                size += 2 * 16 * 1024 * 1024;
-       if (changed_prefs.mbresmem_high_size == 128 * 1024 * 1024 && (size || workprefs.z3chipmem_size))
-               size += 16 * 1024 * 1024;
+       if (changed_prefs.mbresmem_high_size >= 128 * 1024 * 1024 && (size || workprefs.z3chipmem_size))
+               size += (changed_prefs.mbresmem_high_size - 128 * 1024 * 1024) + 16 * 1024 * 1024;
        if (natmem_size > 0x40000000)
                z3size = natmem_size - 0x40000000;
        else
@@ -9147,6 +9147,7 @@ static void enable_for_cpudlg (HWND hDlg)
        //ew (hDlg, IDC_CS_68000, !workprefs.cpu_cycle_exact);
        //ew (hDlg, IDC_CS_ADJUSTABLE, !workprefs.cpu_cycle_exact);
        ew (hDlg, IDC_CPUIDLE, workprefs.m68k_speed != 0 ? TRUE : FALSE);
+       ew (hDlg, IDC_PPC_CPUIDLE, workprefs.ppc_mode != 0);
 #if !defined(CPUEMU_0) || defined(CPUEMU_68000_ONLY)
        ew (hDlg, IDC_CPU1, FALSE);
        ew (hDlg, IDC_CPU2, FALSE);
@@ -9214,6 +9215,7 @@ static void values_to_cpudlg (HWND hDlg)
        CheckDlgButton (hDlg, IDC_FPU_UNIMPLEMENTED, !workprefs.fpu_no_unimplemented || workprefs.cachesize);
        CheckDlgButton (hDlg, IDC_CPU_UNIMPLEMENTED, !workprefs.int_no_unimplemented || workprefs.cachesize);
        SendDlgItemMessage (hDlg, IDC_CPUIDLE, TBM_SETPOS, TRUE, workprefs.cpu_idle == 0 ? 0 : 12 - workprefs.cpu_idle / 15);
+       SendDlgItemMessage (hDlg, IDC_PPC_CPUIDLE, TBM_SETPOS, TRUE, workprefs.ppc_cpu_idle);
        cpu = (workprefs.cpu_model - 68000) / 10;
        if (cpu >= 5)
                cpu--;
@@ -9368,6 +9370,7 @@ static void values_from_cpudlg (HWND hDlg)
        workprefs.cpu_idle = SendMessage (GetDlgItem (hDlg, IDC_CPUIDLE), TBM_GETPOS, 0, 0);
        if (workprefs.cpu_idle > 0)
                workprefs.cpu_idle = (12 - workprefs.cpu_idle) * 15;
+       workprefs.ppc_cpu_idle = SendMessage (GetDlgItem (hDlg, IDC_PPC_CPUIDLE), TBM_GETPOS, 0, 0);
 
        if (pages[KICKSTART_ID])
                SendMessage (pages[KICKSTART_ID], WM_USER, 0, 0);
@@ -9410,6 +9413,8 @@ static INT_PTR CALLBACK CPUDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
                SendDlgItemMessage (hDlg, IDC_CACHE, TBM_SETPAGESIZE, 0, 1);
                SendDlgItemMessage (hDlg, IDC_CPUIDLE, TBM_SETRANGE, TRUE, MAKELONG (0, 10));
                SendDlgItemMessage (hDlg, IDC_CPUIDLE, TBM_SETPAGESIZE, 0, 1);
+               SendDlgItemMessage (hDlg, IDC_PPC_CPUIDLE, TBM_SETRANGE, TRUE, MAKELONG (0, 10));
+               SendDlgItemMessage (hDlg, IDC_PPC_CPUIDLE, TBM_SETPAGESIZE, 0, 1);
 
                SendDlgItemMessage (hDlg, IDC_CPU_FREQUENCY, CB_RESETCONTENT, 0, 0);
                SendDlgItemMessage (hDlg, IDC_CPU_FREQUENCY, CB_ADDSTRING, 0, (LPARAM)_T("1x"));

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index be805a84d804dddb18fa60815d7f04885014d6aa..b412611eff33352ae4cfa3f74212cf2879609fd0 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -18,6 +18,29 @@ Things that may happen in 2015:
 
 - restore only single input target to default.
 
+Beta 17:
+
+- Hard reset now forces reload of KS ROM if maprom is active, previously map rom mapped image
+  was still in use after hard reset.
+- Fixed some more Z3 autoconfig bugs introduced in recent betas autoconfig updates.
+- Only add VirtualAlloc() MEM_TOP_DOWN flag when OS is XP. For some unknown reason with MEM_TOP_DOWN my system
+  suddenly started giving less address space than without it..
+- A1000 with full KS ROM configured (instead of A1000 boot strap ROM) didn't boot since b9.
+- Reset didn't clear QEMU PPC JIT translation buffer, fixes mysterious hangs after reset.
+- Added main thread sleep option slider to GUI, reduces CPU usage when M68K is stopped and only PPC is active.
+- PPC CPU model can be manually configured using ppc_model=<name> config entry. Can be any QEMU supported
+  PPC CPU model name string. (Model strings are in qemu source file target-ppc/cpu-models.c)
+- Automatically disable m68k JIT autoconfig hack if only PPC CPU is active when autoconfig starts after reset.
+- Fixed WarpOS (possible PowerUP too) semi-random program hang caused by lost PPC interrupt(s).
+- Allow m68k JIT direct with accelerator board if board is not Blizzard model (no Blizzard memory aliases)
+  CyberStorm PPC + m68k JIT direct at least seems to work, no guarantees.
+
+Important:
+
+- QEMU PPC libraries are now loaded from <winuae path>\plugins\qemu\. Old location is not supported
+  anymore. Move all qemu dependency libraries and qemu-uae.dll to new path.
+
+
 Beta 16:
 
 - GUI (and log) showed wrong size for very large drives (>1T). Visual problem only.
@@ -29,6 +52,8 @@ Beta 16:
 - PPC CPU HID1 set to more correct value, detected CPU clock is not same as bus clock anymore.
 - QEMU TCG (JIT) buffer was too small, real world PPC programs run now much faster.
 
+NOTE: Reset when PPC CPU is active still does not work 100% correctly.
+
 Beta 15:
 
 - "ROM disabled" A2091/A590 ROM option was not visible (b14)
@@ -49,7 +74,7 @@ Beta 15:
   enable chip ID read mode.
 
 - PPC IO access completely rewritten, most IO areas are now directly accessible and only special regions
-  (custom chipset and CIA require locking. Very slow IO message passing system is completely gone.
+  (custom chipset and CIA) require locking. Very slow IO message passing system is completely gone.
 - QEMU PPC core support. Read separate notes!
 
 Beta 14:

diff --git a/ppc/ppc.cpp b/ppc/ppc.cpp
index 6421f96aec288d2995591482068ef87e9e25bba7..b0c76a0f8b60d79b493faaab20e6763bc0a424c6 100644 (file)
--- a/ppc/ppc.cpp
+++ b/ppc/ppc.cpp
@@ -14,11 +14,12 @@
 #include "uae/ppc.h"
 
 /* The qemu-uae major version must match this */
-#define QEMU_UAE_VERSION_MAJOR 1
+#define QEMU_UAE_VERSION_MAJOR 2
 
 /* The qemu-uae minor version must be at least this */
-#define QEMU_UAE_VERSION_MINOR 2
+#define QEMU_UAE_VERSION_MINOR 0
 
+#define SPINLOCK_DEBUG 0
 #define PPC_ACCESS_LOG 0
 
 #define PPC_DEBUG_ADDR_FROM 0x000000
@@ -32,9 +33,20 @@
 
 #define TRACE(format, ...) write_log(_T("PPC: ") format, ## __VA_ARGS__)
 
+#ifdef WINUAE
+#define QEMU_LIBRARY_PATH _T("qemu\\qemu-uae.dll")
+#else
+#define QEMU_LIBRARY_PATH _T("qemu-uae.dll")
+#endif
+
+#if SPINLOCK_DEBUG
+static volatile int spinlock_cnt;
+#endif
+
+static volatile bool ppc_spinlock_waiting;
 #ifdef _WIN32
 #define CRITICAL_SECTION_SPIN_COUNT 5000
-static CRITICAL_SECTION ppc_cs;
+static CRITICAL_SECTION ppc_cs1, ppc_cs2;
 static bool ppc_cs_initialized;
 #else
 #include <glib.h>
@@ -44,15 +56,29 @@ static GMutex mutex;
 void uae_ppc_spinlock_get(void)
 {
 #ifdef _WIN32
-       EnterCriticalSection(&ppc_cs);
+       EnterCriticalSection(&ppc_cs2);
+       ppc_spinlock_waiting = true;
+       EnterCriticalSection(&ppc_cs1);
+       ppc_spinlock_waiting = false;
+       LeaveCriticalSection(&ppc_cs2);
 #else
        g_mutex_lock(&mutex);
 #endif
+#if SPINLOCK_DEBUG
+       if (spinlock_cnt != 0)
+               write_log(_T("uae_ppc_spinlock_get %d!\n"), spinlock_cnt);
+       spinlock_cnt++;
+#endif
 }
 void uae_ppc_spinlock_release(void)
 {
+#if SPINLOCK_DEBUG
+       if (spinlock_cnt != 1)
+               write_log(_T("uae_ppc_spinlock_release %d!\n"), spinlock_cnt);
+       spinlock_cnt--;
+#endif
 #ifdef _WIN32
-       LeaveCriticalSection(&ppc_cs);
+       LeaveCriticalSection(&ppc_cs1);
 #else
        g_mutex_unlock(&mutex);
 #endif
@@ -60,11 +86,20 @@ void uae_ppc_spinlock_release(void)
 
 static void uae_ppc_spinlock_create(void)
 {
+#if SPINLOCK_DEBUG
+       write_log(_T("uae_ppc_spinlock_create\n"));
+#endif
 #ifdef _WIN32
-       if (ppc_cs_initialized)
-               DeleteCriticalSection(&ppc_cs);
-       InitializeCriticalSectionAndSpinCount(&ppc_cs, CRITICAL_SECTION_SPIN_COUNT);
+       if (ppc_cs_initialized) {
+               DeleteCriticalSection(&ppc_cs1);
+               DeleteCriticalSection(&ppc_cs2);
+       }
+       InitializeCriticalSectionAndSpinCount(&ppc_cs1, CRITICAL_SECTION_SPIN_COUNT);
+       InitializeCriticalSectionAndSpinCount(&ppc_cs2, CRITICAL_SECTION_SPIN_COUNT);
 #else
+#endif
+#if SPINLOCK_DEBUG
+       spinlock_cnt = 0;
 #endif
        ppc_cs_initialized = true;
 }
@@ -197,7 +232,7 @@ static bool load_qemu_implementation()
        write_log(_T("PPC: Loading QEmu implementation\n"));
        memset(&impl, 0, sizeof(impl));
 
-       UAE_DLHANDLE handle = uae_dlopen(_T("qemu-uae.dll"));
+       UAE_DLHANDLE handle = uae_dlopen(QEMU_LIBRARY_PATH);
        if (!handle) {
                gui_message(_T("PPC: Error loading qemu-uae library\n"));
                return false;
@@ -366,7 +401,7 @@ static void set_and_wait_for_state(int state, int unlock)
 
 void ppc_map_banks(uae_u32 start, uae_u32 size, const TCHAR *name, void *addr, bool remove)
 {
-       if (ppc_state == PPC_STATE_INACTIVE)
+       if (ppc_state == PPC_STATE_INACTIVE || !impl.map_memory)
                return;
        PPCMemoryRegion r;
        r.start = start;
@@ -383,24 +418,24 @@ static void cpu_init(void)
        const TCHAR *model;
        uint32_t hid1;
 
-       /* Set default CPU model based on accelerator board */
+       if (currprefs.ppc_model[0]) {
+               /* Override PPC CPU model. See qemu/target-ppc/cpu-models.c for
+                * a list of valid CPU model identifiers */
+               model = currprefs.ppc_model;
+       } else {
+               /* Set default CPU model based on accelerator board */
+               if (currprefs.cpuboard_type == BOARD_BLIZZARDPPC) {
+                       model = _T("603ev");
+               } else {
+                       model = _T("604e");
+               }
+       }
        if (currprefs.cpuboard_type == BOARD_BLIZZARDPPC) {
-               model = _T("603ev");
                hid1 = 0xc0000000; // 4x
        } else {
-               model = _T("604e");
                hid1 = 0xa0000000; // 4x
        }
 
-        /* Override PPC CPU model. See qemu/target-ppc/cpu-models.c for
-         * a list of valid CPU model identifiers */
-#if 0
-       // FIXME: if ppc_model is overridden in currprefs, point to option
-       if (currprefs.ppc_model[0]) {
-               model = currprefs.ppc_model
-       }
-#endif
-
        if (impl.init) {
                char *models = ua(model);
                impl.init(models, hid1);
@@ -463,20 +498,21 @@ static void *ppc_thread(void *v)
        return NULL;
 }
 
-void uae_ppc_execute_quick(int linetype)
+void uae_ppc_execute_check(void)
 {
-       if (linetype == 0) {
+       if (ppc_spinlock_waiting) {
                uae_ppc_spinlock_release();
-               read_processor_time(); // tiny delay..
-               read_processor_time();
-               uae_ppc_spinlock_get();
-       } else {
-               uae_ppc_spinlock_release();
-               sleep_millis(1);
                uae_ppc_spinlock_get();
        }
 }
 
+void uae_ppc_execute_quick()
+{
+       uae_ppc_spinlock_release();
+       sleep_millis_main(1);
+       uae_ppc_spinlock_get();
+}
+
 void uae_ppc_emulate(void)
 {
        if (using_pearpc()) {
@@ -516,7 +552,7 @@ bool UAECALL uae_ppc_io_mem_write(uint32_t addr, uint32_t data, int size)
 
        while (ppc_thread_running && ppc_cpu_lock_state < 0 && ppc_state);
 
-#if PPC_ACCESS_LOG > 0
+#if PPC_ACCESS_LOG > 0 && PPC_ACCESS_LOG < 2
        if (!valid_address(addr, size)) {
                if (addr >= PPC_DEBUG_ADDR_FROM && addr < PPC_DEBUG_ADDR_TO)
                        write_log(_T("PPC io write %08x = %08x %d\n"), addr, data, size);
@@ -524,6 +560,13 @@ bool UAECALL uae_ppc_io_mem_write(uint32_t addr, uint32_t data, int size)
 #endif
 
        locked = spinlock_pre(addr);
+       if (addr >= 0xdff000 && addr < 0xe00000) {
+               // shortcuts for common registers
+               if (addr == 0xdff09c) { // INTREQ
+                       INTREQ_0(data);
+                       size = 0;
+               }
+       }
        switch (size)
        {
        case 4:
@@ -536,14 +579,10 @@ bool UAECALL uae_ppc_io_mem_write(uint32_t addr, uint32_t data, int size)
                put_byte(addr, data);
                break;
        }
-       if (addr == 0xdff09c || addr == 0xdff09a) {
-               int lev = intlev();
-               ppc_interrupt(lev);
-       }
        spinlock_post(locked);
 
 #if PPC_ACCESS_LOG > 2
-       write_log(_T("PPC mem write %08x = %08x %d\n"), addr, data, size);
+       write_log(_T("PPC write %08x = %08x %d\n"), addr, data, size);
 #endif
 
        return true;
@@ -584,14 +623,14 @@ bool UAECALL uae_ppc_io_mem_read(uint32_t addr, uint32_t *data, int size)
        *data = v;
        spinlock_post(locked);
 
-#if PPC_ACCESS_LOG > 0
+#if PPC_ACCESS_LOG > 0 && PPC_ACCESS_LOG < 2
        if (!valid_address(addr, size)) {
                if (addr >= PPC_DEBUG_ADDR_FROM && addr < PPC_DEBUG_ADDR_TO && addr != 0xdff006)
                        write_log(_T("PPC io read %08x=%08x %d\n"), addr, v, size);
        }
 #endif
 #if PPC_ACCESS_LOG > 2
-       write_log(_T("PPC mem read %08x=%08x %d\n"), addr, v, size);
+       write_log(_T("PPC read %08x=%08x %d\n"), addr, v, size);
 #endif
        return true;
 }
@@ -666,7 +705,7 @@ void uae_ppc_cpu_reboot(void)
        if (!ppc_thread_running) {
                write_log(_T("Starting PPC thread.\n"));
                ppc_thread_running = true;
-               uae_start_thread(_T("ppc"), ppc_thread, NULL, NULL);
+               uae_start_thread(NULL, ppc_thread, NULL, NULL);
        } else if (using_qemu()) {
                write_log(_T("PPC: Thread already running, resetting\n"));
                uae_ppc_cpu_reset();
@@ -676,6 +715,8 @@ void uae_ppc_cpu_reboot(void)
 
 void uae_ppc_reset(bool hardreset)
 {
+       if (!currprefs.ppc_mode)
+               return;
        TRACE(_T("uae_ppc_reset hardreset=%d\n"), hardreset);
        if (using_qemu()) {
            set_and_wait_for_state(PPC_CPU_STATE_PAUSED, 1);