From faf9329b8f0f93ff7b79fc83f528b70fc977edd9 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Mon, 8 Jun 2020 21:02:44 +0300 Subject: [PATCH] 4400b6 --- od-win32/cputester/cputester.vcxproj.filters | 6 +++--- od-win32/resources/resource.h | 3 +++ od-win32/resources/winuae.rc | 9 ++++++--- od-win32/win32.h | 4 ++-- od-win32/winuae_msvc15/winuae_msvc.vcxproj | 4 ++-- .../winuae_msvc15/winuae_msvc.vcxproj.filters | 12 ++++++------ od-win32/winuaechangelog.txt | 15 ++++++++++++--- 7 files changed, 34 insertions(+), 19 deletions(-) diff --git a/od-win32/cputester/cputester.vcxproj.filters b/od-win32/cputester/cputester.vcxproj.filters index 8b585ed4..dab0ebd6 100644 --- a/od-win32/cputester/cputester.vcxproj.filters +++ b/od-win32/cputester/cputester.vcxproj.filters @@ -17,9 +17,6 @@ Source Files - - Source Files - Source Files @@ -74,5 +71,8 @@ Source Files + + Source Files + \ No newline at end of file diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index 61f18420..6db74eda 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -274,6 +274,8 @@ #define IDS_GENERIC 273 #define IDS_AUTODETECT 274 #define IDS_OFF 275 +#define IDS_DELETECONFIGDIRCONFIRMATION 276 +#define IDS_DELETECONFIGDIRNOTEMPTY 277 #define IDS_NUMSG_NEEDEXT2 300 #define IDS_NUMSG_NOROMKEY 301 #define IDS_NUMSG_KSROMCRCERROR 302 @@ -1351,6 +1353,7 @@ #define ID_ST_CDEJECTALL 40047 #define ID_CDDRIVES_CD 40048 #define ID_ST_CD0 40049 +#define IDC_STATIC -1 // Next default values for new objects // diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index b9a4f41d..9103de71 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1568,7 +1568,6 @@ BEGIN IDD_CPU, DIALOG BEGIN - BOTTOMMARGIN, 316 END IDD_FLOPPY, DIALOG @@ -1911,7 +1910,7 @@ BEGIN IDS_MUSTSELECTCONFIGFORDELETE "You must select a configuration or enter a name before selecting Delete...\n" IDS_DELETECONFIGCONFIRMATION - "Are you sure you want to Delete configuration '%s'?\n" + "Are you sure you want to Delete configuration\n%s?\n" IDS_DELETECONFIGTITLE "Confirm Delete" IDS_MUSTSELECTPATH "You must select a path!" IDS_SETTINGSERROR "Settings error" @@ -2128,6 +2127,10 @@ BEGIN IDS_GENERIC "Generic" IDS_AUTODETECT "Autodetect" IDS_OFF "off" + IDS_DELETECONFIGDIRCONFIRMATION + "Delete empty configuration directory\n%s\n" + IDS_DELETECONFIGDIRNOTEMPTY + "Only empty configuration directory can be deleted." END STRINGTABLE @@ -2152,7 +2155,7 @@ END STRINGTABLE BEGIN - IDS_MISCLISTITEMS4 "Windows shutdown/logoff notification\nWarn when attempting to close window\nPower led dims when audio filter is disabled\nAutomatically capture mouse when window is activated\n" + IDS_MISCLISTITEMS4 "Windows shutdown/logoff notification\nWarn when attempting to close window\nPower led dims when audio filter is disabled\nAutomatically capture mouse when window is activated\nDebug memory space\n" IDS_SHUTDOWN_NOTIFICATION "Emulation session active" IDS_QUIT_WARNING "Are you sure you want to quit WinUAE?" IDS_UNMAPPED_ADDRESS "Floating\nAll zeros\nAll ones\n" diff --git a/od-win32/win32.h b/od-win32/win32.h index d366e99e..c3da331c 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("5") +#define WINUAEBETA _T("6") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2020, 5, 31) +#define WINUAEDATE MAKEBD(2020, 6, 8) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj index 0287f1d8..fc91805c 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj @@ -886,6 +886,7 @@ + @@ -1044,10 +1045,10 @@ + - @@ -1069,7 +1070,6 @@ - diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters index 2fc17bc1..7401415a 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters @@ -190,9 +190,6 @@ win32 - - win32 - win32 @@ -253,9 +250,6 @@ common - - common - common @@ -943,6 +937,12 @@ common + + win32 + + + common + diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index bc5a44e6..c34c3bf9 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,5 +1,14 @@ +Beta 6: + +- Small 68030 prefetch mode tweak. +- Enable cycle accurate Paula DMA request emulation if more compatible is ticked. Previously either cycle-exact option was required. +- GUI reset button didn't do full hard reset, for example rom images were not reloaded. +- GUI configuration Delete button can be now used to delete empty configuration directory. +- b5 "Debugger fa and s commands skipped chip ram." fix was incomplete, caused some debugger search commands to hang in infinite loop. +- Fixed *.uae icon, it was most likely accidentally changed long time ago to winuae.exe icon without no one noticing. + Beta 5: Some more or less edge-case cpu tester detected fixes: @@ -13,7 +22,7 @@ Some more or less edge-case cpu tester detected fixes: - 68060 RTE odd return address: SR is not updated, CCR part is cleared. Z is set if new SR would have been zero, N is set if new SR would have had bit 15 set. - 68040/68060 seems to halt if trace (probably any exception) is being processed but exception vector is odd. 68000-68030 will generate address error without halting. -- UAE: 68020+ MOVE to CCR triggered T0 trace but it only should be done if MOVE to SR (which does pipeline refill which triggeres T0 trace) +- UAE: 68020+ MOVE to CCR triggered T0 trace but it only should be done if MOVE to SR (which does pipeline refill which triggers T0 trace) - UAE: 68020+ and trace exception with odd trace exception vector (which will generate address error): SR trace bits were not cleared when address error started. - UAE: 68040+ BSR/JSR address error stacked address field was incorrect. - UAE: 68020+ MOVE to SR, EOR SR, OR SR enabled trace: following trace exception stack frame PC field in stack was wrong. @@ -53,7 +62,7 @@ CPU tester FPU trigonometric and logarithmic instructions verified. Last 16 or s - FSINH and FCOSH didn't set INEX bit if result was infinity. - FREM and FMOD didn't round using current rounding mode. - FREM and FMOD will only return correct results with some input parameter values. FREM and FMOD is based on some other CPU behavior, most likely x87, and it isn't fully compatible with Motorola implementation. For some reason this was not updated. Will be fixed later. -- FSCALE didn't round the final result correctlyin all code paths. +- FSCALE didn't round the final result correctly in all code paths. Most likely no real world program was affected. Host FPU mode will also return even more different results. @@ -129,7 +138,7 @@ FPU emulation updates: - If 68040+ and instruction is unimplemented: generate exception 11 if instruction's EA can never be valid (for example PC relative or immediate destination) but generate unimplemented instruction exception 55 if EA can be generally valid but not necessarily valid for current instruction. Previously 11 was always generated if EA was invalid. - 68040+ generates normal exception 11 (frame 0, like 6888x) if FPU instruction is non-existing (unknown opmode field). Previously frame 2 was always generated, only instructions that are implemented in 6888x but unimplemented in 68040+ generate frame 2. - 6888x has undocumented opmodes that map to existing, documented, opmodes (for example $05 -> $04 = FSQRT). Only unused opmodes 0x40 to 0x7f generate F-line. This is now emulated, main reason was to not require special conditions in cputester. "Some extension field encodings are unspecified, are redundant with valid instructions implemented by the FPCP, and do not cause an F-line exception if executed. However, these encodings are reserved for future definition by Motorola, and thus should not be generated by assemblers or compilers.". Future is in the past now and 68040+ generate F-line exception as expected. -- 68888x packed data type is not 100% correct, sometimes last digit of 64-bit mantissa is 1 higher or lower. Probably rounding related. +- 6888x packed data type is not 100% correct, sometimes last digit of 64-bit mantissa is 1 higher or lower. Probably rounding related. - All FPUs FMOVE(M) to/from control registers and register field is zero: FPIAR is selected. This was previously partially emulated. - FMOVEM with dynamic register list used incorrect mask, registers D4 to D7 become D0 to D3. - 6888x and FMOVEM with MODE field=predecrement: register list order is inverted, even if actual EA is not predecrement. 68040+ only use inverted register order if EA is predecrement. 68060 ignores MODE field completely and only uses EA to select between predec/postinc. -- 2.47.3