From: Toni Wilen Date: Sat, 13 Sep 2014 17:31:21 +0000 (+0300) Subject: 2900b16 X-Git-Tag: 3000~36 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=3e88892aadfc65919c7e34b7f99225e1cacadb91;p=francis%2Fwinuae.git 2900b16 --- diff --git a/cpuboard.cpp b/cpuboard.cpp index f27397b8..e4296301 100644 --- a/cpuboard.cpp +++ b/cpuboard.cpp @@ -1617,7 +1617,7 @@ addrbank *cpuboard_autoconfig_init(void) case BOARD_WARPENGINE_A4000: return &expamem_null; case BOARD_TEKMAGIC: - roms[0] = 105; + roms[0] = 104; break; case BOARD_CSMK1: roms[0] = currprefs.cpu_model == 68040 ? 95 : 101; diff --git a/od-win32/win32.h b/od-win32/win32.h index 185df90e..7a5d2d68 100644 --- 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("15") +#define WINUAEBETA _T("16") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2014, 9, 10) +#define WINUAEDATE MAKEBD(2014, 9, 13) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 5c363449..be805a84 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -18,6 +18,40 @@ Things that may happen in 2015: - restore only single input target to default. +Beta 16: + +- GUI (and log) showed wrong size for very large drives (>1T). Visual problem only. +- Fixed F12/pause hang when PPC was active. +- Fixed uaegfx RTG in Z2 mode memory mapping (b14) +- 68040 MMU MOVE16 fault size was wrong. (Cache line, not long) +- 68060 MMU read-modify-write fault had inverted read/write status. +- QEMU PPC vs UAE side memory banks are now dynamically mapped. +- 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. + +Beta 15: + +- "ROM disabled" A2091/A590 ROM option was not visible (b14) +- Blizzard board ROM code was ignored (b14) +- Log window was opened when PPC CPU started (b14) +- Dragging adf file over window mode bottom bar HD led didn't mount it as a harddrive. +- Mounting adf as a harddrive uses adf's real volume name instead of host-side file name. +- Added support for sub memory banks, can divide normal 64k UAE memory bank in to smaller sub memory + banks. Mainly needed to properly map PPC CyberStorm MK3/PPC SCSI IO and SCRIPTS RAM for QEMU PPC. +- SCSI CD emulation via NCR SCSI (53C94/FAS216 or NCR53C710+) chip didn't flash CD led. +- Added hack that prevents Picasso IV switching temporarily to RTG mode immediately after reset. + (Picasso IV does not use simple signal passthrough like other cards) +- Switch to/from hardware RTG mode only after mode has been stable at least 0.5 seconds. +- Show CD insert/eject messages in new status bar message area. (Should it show real volume name instead + of file name?) +- Quickstart CD eject button was always disabled. +- Status bar NVRAM led also shows accelerator board flash write accesses. Includes also writes that only + 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. +- QEMU PPC core support. Read separate notes! + Beta 14: QEMU PPC is still work in progress (by Frode and me), QEMU-side is not yet included. It run for the first time diff --git a/ppc/ppc.cpp b/ppc/ppc.cpp index b6290456..6421f96a 100644 --- a/ppc/ppc.cpp +++ b/ppc/ppc.cpp @@ -354,15 +354,13 @@ static void set_and_wait_for_state(int state, int unlock) { if (using_qemu()) { impl.set_state(state); + if (unlock) + uae_ppc_spinlock_release(); while (!impl.check_state(state)) { - if (unlock) { - uae_ppc_spinlock_release(); - } sleep_millis(1); - if (unlock) { - uae_ppc_spinlock_get(); - } } + if (unlock) + uae_ppc_spinlock_get(); } } diff --git a/rommgr.cpp b/rommgr.cpp index 96649b81..8be14897 100644 --- a/rommgr.cpp +++ b/rommgr.cpp @@ -308,10 +308,10 @@ static struct romdata roms[] = { 0xbb0d2f6a, 0x56c441fa,0x37d19339,0x3081b2e8,0xceae823b,0xc7e97e49, NULL, _T("oktagon2008.rom") }, { _T("Warp Engine A4000 ROM"), 0, 0, 0, 0, _T("WARPENGINE\0WARPENGINEA4000\0"), 32768, 93, 0, 0, ROMTYPE_CPUBOARD, 0, 0, NULL, 0x4deb574a, 0x6e6c95ff,0xe8448391,0xd36c5b68,0xc9065cb0,0x702a7d27 }, - { _T("TekMagic 2040/2060 ROM"), 1, 0, 1, 0, _T("TEKMAGIC\0TEKMAGIC2040\0TEKMAGIC2060\0"), 65536, 105, 0, 0, ROMTYPE_CPUBOARD, 0, 0, NULL, + { _T("TekMagic 2040/2060 ROM"), 1, 0, 1, 0, _T("TEKMAGIC\0TEKMAGIC2040\0TEKMAGIC2060\0"), 65536, 104, 0, 0, ROMTYPE_CPUBOARD, 0, 0, NULL, 0x9e9781d5, 0xf65b60d1,0x4300c50f,0x2ed17cf4,0x4dcfdef9,0x16697bc9, NULL, _T("tekmagic2060.rom") }, - ALTROMPN(105, 1, 1, 32768, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x888da4cf, 0x6ae85f3a, 0x65331ba4, 0xaaba67ae, 0x34763d70, 0x2bde0495) - ALTROMPN(105, 1, 2, 32768, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0xaf1f47db, 0x28d5bed0, 0xbc517d46, 0x500e8159, 0x723e0b64, 0x4733c26a) + ALTROMPN(104, 1, 1, 32768, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x888da4cf, 0x6ae85f3a, 0x65331ba4, 0xaaba67ae, 0x34763d70, 0x2bde0495) + ALTROMPN(104, 1, 2, 32768, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0xaf1f47db, 0x28d5bed0, 0xbc517d46, 0x500e8159, 0x723e0b64, 0x4733c26a) { _T("CyberStorm MK I 68040"), 0, 0, 0, 0, _T("CSMKI\0"), 32768, 95, 0, 0, ROMTYPE_CPUBOARD, 0, 0, NULL, 0, 0, 0, 0, 0, 0, NULL, _T("cyberstormmk1_040.rom") },