From 69c9856f9a8ec669dde84e1ec06710085743dfe6 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Wed, 21 Oct 2015 20:33:00 +0300 Subject: [PATCH] 3200b17 --- expansion.cpp | 6 ++++++ od-win32/resources/winuae.rc | 10 +++++----- od-win32/win32.h | 4 ++-- od-win32/win32gui.cpp | 11 +++++++---- od-win32/winuaechangelog.txt | 15 +++++++++++++++ 5 files changed, 35 insertions(+), 11 deletions(-) diff --git a/expansion.cpp b/expansion.cpp index 35202c3e..f61da9c2 100644 --- a/expansion.cpp +++ b/expansion.cpp @@ -517,6 +517,12 @@ static void boardmessage(addrbank *mapped, bool success) type & rom_card ? _T("ROM") : (type & add_memory ? _T("RAM") : _T("IO ")), mapped->name, success ? _T("") : _T(" SHUT UP")); +#if 0 + for (int i = 0; i < 16; i++) { + write_log(_T("%s%02X"), i > 0 ? _T(".") : _T(""), expamem_read(i * 4)); + } + write_log(_T("\n")); +#endif } void expamem_shutup(addrbank *mapped) diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 856e9d3c..7ff65d57 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -660,11 +660,11 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN GROUPBOX "Chipset",IDC_STATIC,1,0,212,136 CONTROL "OCS [] Original chipset. A1000 and most A500s.",IDC_OCS, - "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,15,88,10 + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,15,88,10 CONTROL "ECS Agnus [] Enhanced chipset (ECS Agnus chip only). CDTV and later A500 and A2000 hardware revisions.",IDC_ECS_AGNUS, - "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,31,88,10 + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,31,88,10 CONTROL "Full ECS [] Full ECS chipset (ECS Agnus and ECS Denise chips). A500+, A600 and A3000.",IDC_ECS, - "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,47,88,10 + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,47,88,10 CONTROL "AGA [] Advanced Graphics Architecture chipset. A1200, A4000 and CD32.",IDC_AGA, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,114,15,86,10 CONTROL "ECS Denise [] Enhanced chipset (ECS Denise chip only). Normally paired with ECS Agnus.",IDC_ECS_DENISE, @@ -672,7 +672,7 @@ BEGIN CONTROL "NTSC [] North American and Japanese display standard, 60Hz refresh rate. Other countries use PAL (50Hz. display refresh rate)",IDC_NTSC, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,47,86,10 CONTROL "Cycle-exact (DMA/Memory accesses)",IDC_CYCLEEXACTMEMORY, - "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,14,69,194,10 + "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,12,81,194,10 RTEXT "Chipset Extra:",IDC_STATIC,72,108,71,15,SS_CENTERIMAGE COMBOBOX IDC_CS_EXT,148,109,49,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Options",IDC_STATIC,221,0,173,137 @@ -697,7 +697,7 @@ BEGIN COMBOBOX IDC_GENLOCKMODE,237,77,103,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_GENLOCKMIX,346,77,38,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Cycle-exact (Full) [] The most compatible A500/A1200 emulation mode.",IDC_CYCLEEXACT, - "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,82,194,10 + "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,12,68,194,10 END IDD_CHIPSET2 DIALOGEX 0, 0, 396, 305 diff --git a/od-win32/win32.h b/od-win32/win32.h index 52b22ed8..59e6fb1d 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("16") +#define WINUAEBETA _T("17") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2015, 10, 14) +#define WINUAEDATE MAKEBD(2015, 10, 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 b92ae450..23bcb316 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -9484,6 +9484,7 @@ static INT_PTR CALLBACK ExpansionDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP static INT_PTR CALLBACK MemoryDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { + TCHAR tmp[MAX_DPATH]; static int recursive = 0; int v; @@ -9503,9 +9504,11 @@ static INT_PTR CALLBACK MemoryDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARA SendDlgItemMessage (hDlg, IDC_MBMEM2, TBM_SETRANGE, TRUE, MAKELONG (MIN_MB_MEM, MAX_MBH_MEM)); CheckDlgButton(hDlg, IDC_FASTMEMAUTOCONFIG, workprefs.fastmem_autoconfig); SendDlgItemMessage (hDlg, IDC_Z3MAPPING, CB_RESETCONTENT, 0, 0); - SendDlgItemMessage (hDlg, IDC_Z3MAPPING, CB_ADDSTRING, 0, (LPARAM)_T("Automatic (*)")); - SendDlgItemMessage(hDlg, IDC_Z3MAPPING, CB_ADDSTRING, 0, (LPARAM)_T("UAE")); - SendDlgItemMessage(hDlg, IDC_Z3MAPPING, CB_ADDSTRING, 0, (LPARAM)_T("Real")); + WIN32GUI_LoadUIString (IDS_AUTOMATIC, tmp, sizeof tmp / sizeof (TCHAR)); + _tcscat(tmp, _T(" (*)")); + SendDlgItemMessage (hDlg, IDC_Z3MAPPING, CB_ADDSTRING, 0, (LPARAM)tmp); + SendDlgItemMessage(hDlg, IDC_Z3MAPPING, CB_ADDSTRING, 0, (LPARAM)_T("UAE (0x10000000)")); + SendDlgItemMessage(hDlg, IDC_Z3MAPPING, CB_ADDSTRING, 0, (LPARAM)_T("Real (0x40000000)")); SendDlgItemMessage (hDlg, IDC_Z3MAPPING, CB_SETCURSEL, workprefs.z3_mapping_mode, 0); recursive--; @@ -19213,7 +19216,7 @@ void gui_led (int led, int on, int brightness) } else if (led == LED_SND && gui_data.drive_disabled[3]) { pos = 0; ptr = drive_text + pos * LED_STRING_WIDTH; - if (gui_data.sndbuf_status < 3 && !pause_emulation) { + if (gui_data.sndbuf_status < 3 && !pause_emulation && !sound_paused()) { _stprintf (ptr, _T("SND: %+.0f%%"), (double)((gui_data.sndbuf) / 10.0)); } else { _tcscpy (ptr, _T("SND: -")); diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 5f63453c..8d9112c9 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,19 @@ +Beta 17: + +- Trace mode in 68000 cycle-exact was 4 cycles too long. +- 68000 cycle-exact mode STOP needs at least 8 cycles before it can wake up. +- Memory-only cycle exact crash when entering GUI. +- Memory-only cycle exact shortcut config entry cycle_exact=memory (Old false and true values have not changed) +- Only use picassoiv_rom_file config entry if it contains valid path. (Workaround for some config files that + contain picassoiv_rom_file=:NOROM for some reason) +- Z3 Picasso IV was disabled if there was not enough address space even when JIT was disabled (b16). +- JIT on/off change was not delayed until it was safe to do, like other CPU option changes. uae-configuration + (or similar) on the fly config changes were unreliable in this situation. +- FAT drive mounted as a directory harddrive: file's modification time was not always correct. (2.6.0, wrong + date field name) +- Warp mode fps limit added, config file only: warp_limit=fps + Beta 16: - Added Mediator 1200SX autoconfig data. -- 2.47.3