mirror of
https://github.com/LIV2/WinUAE.git
synced 2025-12-06 00:12:52 +00:00
4900b18
This commit is contained in:
Toni Wilen
parent
cd9c6f30f3
commit
d8b94bfc1f
2
.gitignore
vendored
2
.gitignore
vendored
@ -69,3 +69,5 @@ packages.config
|
||||
*.db-wal
|
||||
*.o
|
||||
**/.vs
|
||||
*.7z
|
||||
*.zip
|
||||
|
||||
10
custom.cpp
10
custom.cpp
@ -48,7 +48,7 @@
|
||||
#include "rommgr.h"
|
||||
#include "specialmonitors.h"
|
||||
|
||||
#define CYCLE_CONFLICT_LOGGING 1
|
||||
#define CYCLE_CONFLICT_LOGGING 0
|
||||
|
||||
#define SPEEDUP 1
|
||||
|
||||
@ -6912,14 +6912,8 @@ static void decide_line(int endhpos)
|
||||
}
|
||||
|
||||
hpos++;
|
||||
|
||||
//decide_line_decision_fetches(hpos);
|
||||
//decide_sprite_fetch(hpos);
|
||||
|
||||
}
|
||||
|
||||
decide_sprite_fetch(endhpos);
|
||||
|
||||
last_decide_line_hpos = endhpos;
|
||||
}
|
||||
|
||||
@ -8946,7 +8940,7 @@ static void hsync_handler_pre(bool onvsync)
|
||||
}
|
||||
}
|
||||
|
||||
STATIC_INLINE bool is_last_line (void)
|
||||
STATIC_INLINE bool is_last_line(void)
|
||||
{
|
||||
return vpos + 1 == maxvpos + lof_store;
|
||||
}
|
||||
|
||||
@ -1401,8 +1401,8 @@ END
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 4,5,0,0
|
||||
PRODUCTVERSION 4,5,0,0
|
||||
FILEVERSION 4,9,0,0
|
||||
PRODUCTVERSION 4,9,0,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@ -1418,12 +1418,12 @@ BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "FileDescription", "WinUAE"
|
||||
VALUE "FileVersion", "4.5.0.0"
|
||||
VALUE "FileVersion", "4.9.0.0"
|
||||
VALUE "InternalName", "WinUAE"
|
||||
VALUE "LegalCopyright", "© 1996-2021 under the GNU Public License (GPL)"
|
||||
VALUE "OriginalFilename", "WinUAE.exe"
|
||||
VALUE "ProductName", "WinUAE"
|
||||
VALUE "ProductVersion", "4.5.0.0"
|
||||
VALUE "ProductVersion", "4.9.0.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
@ -20,12 +20,12 @@
|
||||
#define LANG_DLL_FULL_VERSION_MATCH 1
|
||||
|
||||
#if WINUAEPUBLICBETA
|
||||
#define WINUAEBETA _T("Beta 17")
|
||||
#define WINUAEBETA _T("Beta 18")
|
||||
#else
|
||||
#define WINUAEBETA _T("")
|
||||
#endif
|
||||
|
||||
#define WINUAEDATE MAKEBD(2021, 2, 20)
|
||||
#define WINUAEDATE MAKEBD(2021, 4, 24)
|
||||
|
||||
//#define WINUAEEXTRA _T("AmiKit Preview")
|
||||
//#define WINUAEEXTRA _T("Amiga Forever Edition")
|
||||
|
||||
@ -4170,7 +4170,7 @@ retry:
|
||||
mon->currentmode.native_width, mon->currentmode.native_height, mon->currentmode.current_depth);
|
||||
} else {
|
||||
allocsoftbuffer(mon->monitor_id, _T("draw"), &avidinfo->drawbuffer, mon->currentmode.flags,
|
||||
1600, 1280, mon->currentmode.current_depth);
|
||||
1920, 1280, mon->currentmode.current_depth);
|
||||
}
|
||||
if (currprefs.monitoremu || currprefs.cs_cd32fmv || (currprefs.genlock && currprefs.genlock_image) || currprefs.cs_color_burst || currprefs.gfx_grayscale) {
|
||||
allocsoftbuffer(mon->monitor_id, _T("monemu"), &avidinfo->tempbuffer, mon->currentmode.flags,
|
||||
|
||||
@ -1292,9 +1292,9 @@ static void boxart_init(void)
|
||||
}
|
||||
|
||||
static const TCHAR *boxartnames[MAX_BOX_ART_TYPES] = {
|
||||
_T("Boxart"),
|
||||
_T("Title"),
|
||||
_T("SShot"),
|
||||
_T("Boxart"),
|
||||
_T("Misc"),
|
||||
_T("Data"),
|
||||
};
|
||||
|
||||
@ -234,7 +234,7 @@
|
||||
<OmitFramePointers>true</OmitFramePointers>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
<AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;:%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;FX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||
@ -401,7 +401,7 @@
|
||||
<OmitFramePointers>false</OmitFramePointers>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
<AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;FX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@ -714,7 +714,7 @@
|
||||
<OmitFramePointers>true</OmitFramePointers>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;FX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||
|
||||
@ -1928,7 +1928,7 @@ struct zfile *read_rom (struct romdata *prd)
|
||||
}
|
||||
xfree(tmp);
|
||||
}
|
||||
} else if (rd->id == 182 || rd->id == 183) {
|
||||
} else if (rd->id == 182) {
|
||||
// ALG Space Pirates
|
||||
uae_u8 *tmp = xmalloc(uae_u8, size);
|
||||
if (tmp) {
|
||||
|
||||
@ -2879,7 +2879,7 @@ floatx80 floatx80_rem(floatx80 a, floatx80 b, float_status *status)
|
||||
|
||||
}
|
||||
#else // 09-01-2017: Modified version for Previous
|
||||
floatx80 floatx80_rem(floatx80 a, floatx80 b, uint64_t* q, flag* s, float_status* status)
|
||||
floatx80 floatx80_rem(floatx80 a, floatx80 b, uint64_t *q, flag *s, float_status *status)
|
||||
{
|
||||
flag aSign, bSign, zSign;
|
||||
int32_t aExp, bExp, expDiff;
|
||||
@ -2906,7 +2906,7 @@ floatx80 floatx80_rem(floatx80 a, floatx80 b, uint64_t* q, flag* s, float_status
|
||||
if (bExp == 0x7FFF) {
|
||||
if ((uint64_t)(bSig << 1)) return propagateFloatx80NaN(a, b, status);
|
||||
*s = (aSign != bSign);
|
||||
return normalizeRoundAndPackFloatx80(status->floatx80_rounding_precision, aSign, aExp, aSig0, 0, status);;
|
||||
return normalizeRoundAndPackFloatx80(status->floatx80_rounding_precision, aSign, aExp, aSig0, 0, status);
|
||||
}
|
||||
if (bExp == 0) {
|
||||
if (bSig == 0) {
|
||||
@ -2987,7 +2987,7 @@ floatx80 floatx80_rem(floatx80 a, floatx80 b, uint64_t* q, flag* s, float_status
|
||||
| value `a' with respect to the corresponding value `b'.
|
||||
*----------------------------------------------------------------------------*/
|
||||
|
||||
floatx80 floatx80_mod(floatx80 a, floatx80 b, uint64_t* q, flag* s, float_status* status)
|
||||
floatx80 floatx80_mod(floatx80 a, floatx80 b, uint64_t *q, flag *s, float_status *status)
|
||||
{
|
||||
flag aSign, bSign, zSign;
|
||||
int32_t aExp, bExp, expDiff;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user