From 364322931ecb6994abd9b21ce665bdcd63f5365f Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 7 Dec 2019 15:37:13 +0200 Subject: [PATCH] 4300b7 --- memory.cpp | 6 +++--- newcpu_common.cpp | 2 +- od-win32/srcrelease.cmd | 6 +++--- od-win32/win32.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/memory.cpp b/memory.cpp index 18d0c757..1d1ddb24 100644 --- a/memory.cpp +++ b/memory.cpp @@ -971,7 +971,7 @@ static void REGPARAM2 kickmem_lput (uaecptr addr, uae_u32 b) } else a1000_handle_kickstart (0); } else if (currprefs.illegal_mem) { - write_log (_T("Illegal kickmem lput at %08x\n"), addr); + write_log (_T("Illegal kickmem lput at %08x PC= %08x\n"), addr, M68K_GETPC); } } @@ -991,7 +991,7 @@ static void REGPARAM2 kickmem_wput (uaecptr addr, uae_u32 b) } else a1000_handle_kickstart (0); } else if (currprefs.illegal_mem) { - write_log (_T("Illegal kickmem wput at %08x\n"), addr); + write_log (_T("Illegal kickmem wput at %08x PC= %08x\n"), addr, M68K_GETPC); } } @@ -1008,7 +1008,7 @@ static void REGPARAM2 kickmem_bput (uaecptr addr, uae_u32 b) } else a1000_handle_kickstart (0); } else if (currprefs.illegal_mem) { - write_log (_T("Illegal kickmem bput at %08x\n"), addr); + write_log (_T("Illegal kickmem bput at %08x PC= %08x\n"), addr, M68K_GETPC); } } diff --git a/newcpu_common.cpp b/newcpu_common.cpp index 56f18f36..5fae5479 100644 --- a/newcpu_common.cpp +++ b/newcpu_common.cpp @@ -1075,7 +1075,7 @@ static void divsl_overflow(uae_u16 extra, uae_s64 a, uae_s32 divider) if (extra & 0x0400) { // this is still missing condition where Z is set // without none of input parameters being zero. - uae_u32 ahigh = a >> 32; + uae_s32 ahigh = a >> 32; if (ahigh == 0) { SET_ZFLG(1); SET_NFLG(0); diff --git a/od-win32/srcrelease.cmd b/od-win32/srcrelease.cmd index 29cf2db3..e526c2e8 100644 --- a/od-win32/srcrelease.cmd +++ b/od-win32/srcrelease.cmd @@ -8,13 +8,13 @@ del ..\winuaesrc.7z 7z a -r ..\winuaesrc *.c *.cpp *.h *.sln *.vcxproj* *.ico *.rc *.bmp *.cur *.manifest *.png *.txt -copy ..\winuaesrc.7z e:\amiga\winuaepackets\winuaesrc%1.7z -copy ..\winuaesrc.7z e:\amiga /y +copy ..\winuaesrc.7z d:\amiga\winuaepackets\winuaesrc%1.7z +copy ..\winuaesrc.7z d:\amiga /y cd od-win32 7z a winuaedebug%1 winuae_msvc15\fullrelease\winuae.pdb winuae_msvc15\x64\fullrelease\winuae.pdb -move winuaedebug%1.7z e:\amiga\winuaepackets\debug\ +move winuaedebug%1.7z d:\amiga\winuaepackets\debug\ copy winuae_msvc15\fullrelease\winuae.pdb d:\amiga\dump\winuae.pdb copy winuae_msvc15\x64\fullrelease\winuae.pdb d:\amiga\dump\winuae64.pdb copy d:\amiga\winuae.exe d:\amiga\dump diff --git a/od-win32/win32.h b/od-win32/win32.h index 477e088c..b5b00238 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("6") +#define WINUAEBETA _T("7") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2019, 12, 2) +#define WINUAEDATE MAKEBD(2019, 12, 7) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") -- 2.47.3