2900b18

diff --git a/expansion.cpp b/expansion.cpp
index 59365a53d7cfdba89459b8fbec0c0d8f30eb2a91..4d04bfee8cdd8a3e3f537b4ce1b711a6c5a449a4 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -424,12 +424,12 @@ static void boardmessage(addrbank *mapped, bool success)
                sizemod = 'M';
                size /= 1024;
        }
-       write_log (_T("Card %d: Z%d 0x%08x %4d%c %s %s %s.\n"),
+       write_log (_T("Card %d: Z%d 0x%08x %4d%c %s %s%s\n"),
                ecard + 1, (type & 0xc0) == zorroII ? 2 : 3,
                expamem_board_pointer, size, sizemod,
                type & rom_card ? _T("ROM") : (type & add_memory ? _T("RAM") : _T("IO ")),
                mapped->name,
-               success ? _T("ok") : _T("shut up"));
+               success ? _T("") : _T(" SHUT UP"));
 }
 
 void expamem_shutup(addrbank *mapped)

diff --git a/od-win32/sysconfig.h b/od-win32/sysconfig.h
index f0207df08d9c24cb0c20cde3bae59e56fd42c3a6..925d2303bbfc86450f8e4298f1f5a61ba7dd25ed 100644 (file)
--- a/od-win32/sysconfig.h
+++ b/od-win32/sysconfig.h
@@ -90,7 +90,6 @@
 #define WITH_UAENET_PCAP
 #define WITH_PPC
 #define WITH_QEMU_CPU
-#define WITH_PEARPC_CPU
 
 #else
 

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 1c82d713fb91116144e752c6f35dead5d5231ee3..9420f25b759d19012a0bf6f262b8a3ca531cdca3 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -3119,6 +3119,11 @@ void target_fixup_options (struct uae_prefs *p)
                p->win32_rtgmatchdepth = false;
                if (gfxboard_need_byteswap (p->rtgmem_type))
                        p->color_mode = 5;
+               if (p->ppc_model && !p->gfx_api) {
+                       error_log (_T("Graphics board and PPC: Direct3D enabled."));
+                       p->gfx_api = 1;
+               }
+
        }
 }
 

diff --git a/od-win32/win32.h b/od-win32/win32.h
index b8c69bb0ff9fe424508a1852e69f9508d3b98a82..9fe2d480ac0d76f75bc52e3aaea407147fdf09e7 100644 (file)
--- 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("17")
+#define WINUAEBETA _T("18")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2014, 9, 21)
+#define WINUAEDATE MAKEBD(2014, 9, 28)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuae_msvc11/winuae_msvc.vcxproj b/od-win32/winuae_msvc11/winuae_msvc.vcxproj
index 5c7b206fa434a95791777b52d8f0e178b7c8fe3b..088bbb358e8cc2fc7eaa9b9a9bdb500a225e9df2 100644 (file)
--- a/od-win32/winuae_msvc11/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc11/winuae_msvc.vcxproj
@@ -256,7 +256,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -476,7 +476,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -541,20 +541,20 @@
       <TypeLibraryName>.\Release/winuae_msvc.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
-      <Optimization>Full</Optimization>
+      <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
+      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+      <OmitFramePointers>false</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
@@ -566,7 +566,7 @@
       <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CallingConvention>StdCall</CallingConvention>
+      <CallingConvention>FastCall</CallingConvention>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
@@ -577,7 +577,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>NotSet</ShowProgress>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -694,7 +694,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -814,15 +814,6 @@
     <ClCompile Include="..\..\luascript.cpp" />
     <ClCompile Include="..\..\ncr9x_scsi.cpp" />
     <ClCompile Include="..\..\newcpu_common.cpp" />
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_alu.cpp" />
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_cpu.cpp" />
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_dec.cpp" />
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_exc.cpp" />
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_fpu.cpp" />
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_mmu.cpp" />
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_opc.cpp" />
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_vec.cpp" />
-    <ClCompile Include="..\..\ppc\pearpc\uaeglue.cpp" />
     <ClCompile Include="..\..\ppc\ppc.cpp" />
     <ClCompile Include="..\..\ppc\ppcd.cpp" />
     <ClCompile Include="..\..\qemuvga\cirrus_vga.cpp" />

diff --git a/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters
index 93714133905f14d8c8b2304913556ee7322711d3..cc787cc16e84eea9368d89903256daa3c4a63a14 100644 (file)
--- a/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters
+++ b/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters
@@ -56,9 +56,6 @@
     <Filter Include="ppc">
       <UniqueIdentifier>{a238ed36-3d5f-4fd0-afd7-a34029119da7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ppc\pearpc">
-      <UniqueIdentifier>{f8cdc857-41a2-400a-a2e1-9a9eb3ac9d04}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\ahidsound_dsonly.cpp">
@@ -709,33 +706,6 @@
     <ClCompile Include="..\..\logging.cpp">
       <Filter>common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ppc\pearpc\uaeglue.cpp">
-      <Filter>ppc\pearpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_alu.cpp">
-      <Filter>ppc\pearpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_cpu.cpp">
-      <Filter>ppc\pearpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_dec.cpp">
-      <Filter>ppc\pearpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_exc.cpp">
-      <Filter>ppc\pearpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_fpu.cpp">
-      <Filter>ppc\pearpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_mmu.cpp">
-      <Filter>ppc\pearpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_opc.cpp">
-      <Filter>ppc\pearpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ppc\pearpc\cpu\cpu_generic\ppc_vec.cpp">
-      <Filter>ppc\pearpc</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\resources\35floppy.ico">

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index b412611eff33352ae4cfa3f74212cf2879609fd0..c21e8d35cdc6fab342b3b02c2f565e5f3eb422aa 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -18,6 +18,17 @@ Things that may happen in 2015:
 
 - restore only single input target to default.
 
+Beta 18:
+
+- "Pause emulation when xyz" option remained forever stuck in pause mode if PPC CPU was active.
+- PearPC PPC emulation removed.
+- Freezer cartridge ROMs had disappeared from GUI.
+- Freezer cartridges didn't work.
+- Force Direct3D mode if hardware RTG board + PPC enabled. DirectDraw has glitches. (Will also have
+  glitches in non-PPC mode but there is no need to change it yet)
+- CSPPC/BPPC interrupt controller IO address accesses were not thread safe, caused random lost or stuck
+  interrupts.
+
 Beta 17:
 
 - Hard reset now forces reload of KS ROM if maprom is active, previously map rom mapped image
@@ -40,7 +51,6 @@ Important:
 - QEMU PPC libraries are now loaded from <winuae path>\plugins\qemu\. Old location is not supported
   anymore. Move all qemu dependency libraries and qemu-uae.dll to new path.
 
-
 Beta 16:
 
 - GUI (and log) showed wrong size for very large drives (>1T). Visual problem only.

diff --git a/zfile_archive.cpp b/zfile_archive.cpp
index 0b4a7fa27b0a2e2fb7e84b92f22ce73ddf6152f3..dcd00d8e3396288712e27ba3e26aee3e3b384744 100644 (file)
--- a/zfile_archive.cpp
+++ b/zfile_archive.cpp
@@ -707,7 +707,7 @@ static int canrar (void)
        return israr < 0 ? 0 : 1;
 }
 
-static int CALLBACK RARCallbackProc (UINT msg,LONG UserData,LONG P1,LONG P2)
+static int CALLBACK RARCallbackProc (UINT msg, LONG UserData, LONG P1, LONG P2)
 {
        if (msg == UCM_PROCESSDATA) {
                zfile_fwrite ((uae_u8*)P1, 1, P2, rarunpackzf);
@@ -1538,8 +1538,8 @@ static struct zfile *archive_access_adf (struct znode *zn)
        struct zfile *z = NULL;
        int root, ffs;
        struct adfhandle *adf = (struct adfhandle*)zn->volume->handle;
-       int size, bs;
-       int i;
+       uae_s64 size;
+       int i, bs;
        uae_u8 *dst;
 
        size = zn->size;
@@ -1556,7 +1556,7 @@ static struct zfile *archive_access_adf (struct znode *zn)
                for (;;) {
                        adf_read_block (adf, root);
                        for (i = bs / 4 - 51; i >= 6; i--) {
-                               int bsize = ffs ? bs : bs - 24;
+                               uae_s64 bsize = ffs ? bs : bs - 24;
                                int block = gl (adf, i * 4);
                                if (size < bsize)
                                        bsize = size;
@@ -1578,7 +1578,7 @@ static struct zfile *archive_access_adf (struct znode *zn)
 
                struct sfsblock *sfsblocks;
                int sfsblockcnt, sfsmaxblockcnt, i;
-               int bsize;
+               uae_s64 bsize;
                int block = zn->offset;
                int dblock;
                int btree, version, sfs2;
@@ -1752,7 +1752,8 @@ static struct zfile *archive_access_rdb (struct znode *zn)
        struct zfile *zf;
        uae_u8 buf[512] = { 0 };
        int surf, spb, spt, lowcyl, highcyl;
-       int size, block, blocksize;
+       int block, blocksize;
+       uae_s64 size;
        uae_u8 *p;
 
        if (zn->offset) {
@@ -2015,12 +2016,12 @@ static struct zfile *archive_access_fat (struct znode *zn)
 {
        uae_u8 buf[512] = { 0 };
        int fatbits = 12;
-       int size = zn->size;
+       uae_s64 size = zn->size;
        struct zfile *sz, *dz;
        int rootdir, reserved, sectorspercluster;
        int numfats, sectorsperfat, rootentries;
-       int dataregion;
-       int offset, cluster;
+       int dataregion, cluster;
+       uae_s64 offset;
 
        sz = zn->volume->archive;
 
@@ -2044,7 +2045,7 @@ static struct zfile *archive_access_fat (struct znode *zn)
        offset = 0;
        cluster = zn->offset;
        while (size && cluster >= 2) {
-               int left = size > sectorspercluster * 512 ? sectorspercluster * 512 : size;
+               uae_s64 left = size > sectorspercluster * 512 ? sectorspercluster * 512 : size;
                int sector = dataregion + (cluster - 2) * sectorspercluster;
                zfile_fseek (sz, sector * 512, SEEK_SET);
                zfile_fread (dz->data + offset, 1, left, sz);