From f190066e89ac14700cb173a66e6c78fb92a1b35f Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 28 May 2023 21:20:01 +0300 Subject: [PATCH] 5000b15 --- debug.cpp | 27 ++++++++++++++-------- include/cputest.h | 3 +-- od-win32/cputester/cputester.vcxproj | 2 ++ od-win32/win32.h | 4 ++-- od-win32/win32gui.cpp | 7 +++--- od-win32/winuae_msvc15/winuae_msvc.vcxproj | 10 ++++---- od-win32/winuaechangelog.txt | 7 ++++++ 7 files changed, 40 insertions(+), 20 deletions(-) diff --git a/debug.cpp b/debug.cpp index 00aebc0f..6ce2fe15 100644 --- a/debug.cpp +++ b/debug.cpp @@ -901,10 +901,11 @@ static int readsize (int val, TCHAR **c) return 0; } -static int checkvaltype (TCHAR **cp, uae_u32 *val, int *size, TCHAR def) +static int checkvaltype(TCHAR **cp, uae_u32 *val, int *size, TCHAR def) { TCHAR form[256], *p; bool gotop = false; + bool copyrest = false; double out; form[0] = 0; @@ -913,7 +914,7 @@ static int checkvaltype (TCHAR **cp, uae_u32 *val, int *size, TCHAR def) p = form; for (;;) { uae_u32 v; - if (!checkvaltype2 (cp, &v, def)) { + if (!checkvaltype2(cp, &v, def)) { if (isoperator(cp) || gotop || **cp == '\"' || **cp == '\'') { goto docalc; } @@ -924,16 +925,20 @@ static int checkvaltype (TCHAR **cp, uae_u32 *val, int *size, TCHAR def) _stprintf(p, _T("%u"), v); p += _tcslen (p); *p = 0; - if (peekchar (cp) == '.') { - readchar (cp); - if (size) - *size = readsize (v, cp); + if (peekchar(cp) == '.') { + readchar(cp); + if (size) { + *size = readsize(v, cp); + } } + TCHAR *cpb = *cp; ignore_ws(cp); - if (!isoperator (cp)) + if (!isoperator(cp)) { + *cp = cpb; break; + } gotop = true; - *p++= readchar (cp); + *p++= readchar(cp); *p = 0; } if (!gotop) { @@ -951,7 +956,11 @@ static int checkvaltype (TCHAR **cp, uae_u32 *val, int *size, TCHAR def) } docalc: while (more_params2(cp)) { - *p++ = readchar(cp); + TCHAR c = readchar(cp); + if (c == ' ') { + break; + } + *p++ = c; } *p = 0; TCHAR tmp[MAX_DPATH]; diff --git a/include/cputest.h b/include/cputest.h index a640d236..9e324039 100644 --- a/include/cputest.h +++ b/include/cputest.h @@ -38,7 +38,6 @@ extern int movem_index1[256]; extern int movem_index2[256]; extern int movem_next[256]; -void ipl_fetch(void); void do_cycles_test(int); int intlev(void); @@ -63,7 +62,7 @@ void m68k_do_bsr_ce(uaecptr, uae_s32); void m68k_do_bsr_ce(uaecptr oldpc, uae_s32 offset); void m68k_do_jsr_ce(uaecptr oldpc, uaecptr dest); -void m68k_setstopped(void); +void m68k_setstopped(int); void check_t0_trace(void); bool cpureset(void); diff --git a/od-win32/cputester/cputester.vcxproj b/od-win32/cputester/cputester.vcxproj index 9c1255e0..b04c919e 100644 --- a/od-win32/cputester/cputester.vcxproj +++ b/od-win32/cputester/cputester.vcxproj @@ -99,6 +99,8 @@ _MBCS;%(PreprocessorDefinitions);CPUEMU_90;CPUEMU_91;CPUEMU_92;CPUEMU_93;CPUEMU_94;CPUEMU_95;CPU_TESTER FastCall CompileAsCpp + stdcpp14 + Default Console diff --git a/od-win32/win32.h b/od-win32/win32.h index d2151d76..2dce4830 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -25,13 +25,13 @@ #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2023, 5, 26) +#define WINUAEDATE MAKEBD(2023, 5, 28) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") #ifndef WINUAEEXTRA -#define WINUAEEXTRA _T("RC6") +#define WINUAEEXTRA _T("") #endif #ifndef WINUAEREV #define WINUAEREV _T("") diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index eb7b1fe6..c732b315 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -6433,7 +6433,7 @@ static INT_PTR CALLBACK ErrorLogProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM SetDlgItemText (hDlg, IDC_ERRORLOGMESSAGE, err); xSendDlgItemMessage (hDlg, IDC_ERRORLOGMESSAGE, EM_GETCHARFORMAT, 0, (LPARAM) & CharFormat); CharFormat.dwMask |= CFM_SIZE | CFM_FACE; - CharFormat.yHeight = getscaledfontsize(8 * 20); /* height in twips, where a twip is 1/20th of a point - for a pt.size of 18 */ + CharFormat.yHeight = -getscaledfontsize(8 * 20); /* height in twips, where a twip is 1/20th of a point - for a pt.size of 18 */ _tcscpy (CharFormat.szFaceName, _T("Segoe UI")); xSendDlgItemMessage (hDlg, IDC_ERRORLOGMESSAGE, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) & CharFormat); return TRUE; @@ -7888,7 +7888,7 @@ static void init_aboutdlg (HWND hDlg) xSendDlgItemMessage (hDlg, IDC_RICHEDIT1, EM_GETCHARFORMAT, 0, (LPARAM) & CharFormat); CharFormat.dwMask |= CFM_BOLD | CFM_SIZE | CFM_FACE; CharFormat.dwEffects = CFE_BOLD; - CharFormat.yHeight = getscaledfontsize(24 * 20); /* height in twips, where a twip is 1/20th of a point */ + CharFormat.yHeight = -getscaledfontsize(30 * 20); /* height in twips, where a twip is 1/20th of a point */ _tcscpy (CharFormat.szFaceName, _T("Segoe UI")); xSendDlgItemMessage (hDlg, IDC_RICHEDIT1, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) & CharFormat); @@ -7897,7 +7897,8 @@ static void init_aboutdlg (HWND hDlg) SetDlgItemText (hDlg, IDC_RICHEDIT2, VersionStr ); xSendDlgItemMessage (hDlg, IDC_RICHEDIT2, EM_GETCHARFORMAT, 0, (LPARAM) & CharFormat); CharFormat.dwMask |= CFM_SIZE | CFM_FACE; - CharFormat.yHeight = getscaledfontsize(12 * 20); + CharFormat.dwEffects = CFE_BOLD; + CharFormat.yHeight = -getscaledfontsize(16 * 20); _tcscpy (CharFormat.szFaceName, _T("Segoe UI")); xSendDlgItemMessage (hDlg, IDC_RICHEDIT2, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) & CharFormat); xSendDlgItemMessage (hDlg, IDC_RICHEDIT2, EM_SETBKGNDCOLOR, 0, GetSysColor (COLOR_3DFACE)); diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj index a91d48f3..578c3b79 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj @@ -359,9 +359,9 @@ 4996;%(DisableSpecificWarnings) %(ForcedIncludeFiles) true - stdcpplatest + stdcpp20 /Zc:strictStrings- %(AdditionalOptions) - Default + stdc17 false @@ -1063,8 +1063,9 @@ 4996;%(DisableSpecificWarnings) %(ForcedIncludeFiles) true - stdcpplatest + stdcpp20 /Zc:strictStrings- %(AdditionalOptions) + stdc17 NDEBUG;%(PreprocessorDefinitions) @@ -1144,8 +1145,9 @@ 4996;%(DisableSpecificWarnings) %(ForcedIncludeFiles) true - stdcpplatest + stdcpp20 /Zc:strictStrings- %(AdditionalOptions) + stdc17 NDEBUG;%(PreprocessorDefinitions) diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 83169de6..cd3142a1 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,11 @@ +Beta 15: (RC7) + +- 4.10.0 introduced low to high/high to low IPL delay is optional and off by default, it seems to only happen when Paula IPL lines have extra load (like expansion devices or logic analyzer probes..). Config file only: ipl_delay=true +- Fixed About panel title font size. +- Debugger command mid command calculation support fixed (for example "d $1234+10 1" works again) +- RC tag removed. + Beta 14: (RC6) - "Remove interlace artifacts" + accurate modes: some blitter cycles were also rerun during "scandoubled" line. -- 2.47.3