3300b14

diff --git a/.gitignore b/.gitignore
index f1e47b8c9b869b41470caa18ca742f46dc65a049..a5939064c4f95762c5f217a551a0084a0dc2ac58 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,5 @@ aros.rom.cpp
 *.iobj
 *.ipdb
 *.opendb
+packages
+packages.config

diff --git a/expansion.cpp b/expansion.cpp
index bd5eba10cb355bcfd3c90426523aabb3213d1bda..0595aae6c741fc8b509e32c9eded35636691915d 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -1409,6 +1409,7 @@ static void fastmem_autoconfig(int boardnum, int zorro, uae_u8 type, uae_u32 ser
                        flags |= force_z3 | (allocated > 0x800000 ? ext_size : subsize);
                }
                mid = uae_id;
+               serial = 1;
        }
 
        ac[0x00 / 4] = type;
@@ -1447,7 +1448,6 @@ static addrbank *expamem_init_fastcard_2(int boardnum)
 {
        uae_u8 type = add_memory | zorroII;
        int allocated = boardnum ? fastmem2_bank.allocated : fastmem_bank.allocated;
-       uae_u32 serial = 1;
 
        if (allocated == 0)
                return &expamem_null;
@@ -1481,8 +1481,7 @@ static addrbank *expamem_init_fastcard_2(int boardnum)
                }
        }
 
-       fastmem_autoconfig(boardnum, BOARD_AUTOCONFIG_Z2, type, serial, allocated);
-       fastmem_autoconfig(boardnum, -1, type, serial, allocated);
+       fastmem_autoconfig(boardnum, BOARD_AUTOCONFIG_Z2, type, 1, allocated);
 
        return NULL;
 }
@@ -3171,10 +3170,10 @@ const struct expansionromtype expansionroms[] = {
                _T("trumpcardpro"), _T("Grand Slam"), _T("IVS"),
                trumpcardpro_init, NULL, trumpcardpro_add_scsi_unit, ROMTYPE_IVSTPRO, 0, 0, BOARD_AUTOCONFIG_Z2, false,
                NULL, 0,
-               false, EXPANSIONTYPE_SCSI,
+               true, EXPANSIONTYPE_SCSI,
                2112, 4, 0, false, NULL,
-               false, NULL,
-               {  0xd1, 2, 0x00, 0x00, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 },
+               true, NULL,
+               {  0xd1, 0x34, 0x00, 0x00, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 },
        },
        {
                _T("kommos"), _T("A500/A2000 SCSI"), _T("Jürgen Kommos"),

diff --git a/newcpu_common.cpp b/newcpu_common.cpp
index 77efdd0ac87945ac50a27e7a006ce2d19c9f0f9c..7c71e2c98d7d4585ca355df9898490f3ca75cc6e 100644 (file)
--- a/newcpu_common.cpp
+++ b/newcpu_common.cpp
@@ -773,6 +773,7 @@ void divbyzero_special (bool issigned, uae_s32 dst)
 
 #ifndef CPUEMU_68000_ONLY
 
+#if !defined (uae_s64)
 STATIC_INLINE int div_unsigned (uae_u32 src_hi, uae_u32 src_lo, uae_u32 div, uae_u32 *quot, uae_u32 *rem)
 {
        uae_u32 q = 0, cbit = 0;
@@ -796,6 +797,7 @@ STATIC_INLINE int div_unsigned (uae_u32 src_hi, uae_u32 src_lo, uae_u32 div, uae
        *rem = src_hi;
        return 0;
 }
+#endif
 
 bool m68k_divl (uae_u32 opcode, uae_u32 src, uae_u16 extra)
 {
@@ -926,6 +928,7 @@ bool m68k_divl (uae_u32 opcode, uae_u32 src, uae_u16 extra)
        return true;
 }
 
+#if !defined (uae_s64)
 STATIC_INLINE void mul_unsigned (uae_u32 src1, uae_u32 src2, uae_u32 *dst_hi, uae_u32 *dst_lo)
 {
        uae_u32 r0 = (src1 & 0xffff) * (src2 & 0xffff);
@@ -943,6 +946,7 @@ STATIC_INLINE void mul_unsigned (uae_u32 src1, uae_u32 src2, uae_u32 *dst_hi, ua
        *dst_lo = lo;
        *dst_hi = r3;
 }
+#endif
 
 bool m68k_mull (uae_u32 opcode, uae_u32 src, uae_u16 extra)
 {
@@ -960,9 +964,9 @@ bool m68k_mull (uae_u32 opcode, uae_u32 src, uae_u16 extra)
                SET_CFLG (0);
                SET_ZFLG (a == 0);
                SET_NFLG (a < 0);
-               if (extra & 0x400)
+               if (extra & 0x400) {
                        m68k_dreg (regs, extra & 7) = (uae_u32)(a >> 32);
-               else if ((a & UVAL64 (0xffffffff80000000)) != 0
+               } else if ((a & UVAL64 (0xffffffff80000000)) != 0
                        && (a & UVAL64 (0xffffffff80000000)) != UVAL64 (0xffffffff80000000))
                {
                        SET_VFLG (1);
@@ -977,9 +981,9 @@ bool m68k_mull (uae_u32 opcode, uae_u32 src, uae_u16 extra)
                SET_CFLG (0);
                SET_ZFLG (a == 0);
                SET_NFLG (((uae_s64)a) < 0);
-               if (extra & 0x400)
+               if (extra & 0x400) {
                        m68k_dreg (regs, extra & 7) = (uae_u32)(a >> 32);
-               else if ((a & UVAL64 (0xffffffff00000000)) != 0) {
+               } else if ((a & UVAL64 (0xffffffff00000000)) != 0) {
                        SET_VFLG (1);
                }
                m68k_dreg (regs, (extra >> 12) & 7) = (uae_u32)a;

diff --git a/od-win32/srcrelease.cmd b/od-win32/srcrelease.cmd
index 81a8428bc7291a04378a5e956b3f566e377d7a8c..d1be0f96b252c9a995a83d0b288b568d123da3be 100644 (file)
--- a/od-win32/srcrelease.cmd
+++ b/od-win32/srcrelease.cmd
@@ -130,6 +130,7 @@ rm -rf release
 rm -rf fullrelease
 rm -rf test
 rm -rf x64
+rm -rf packages
 cd ..
 
 cd winuae_msvc15
@@ -138,6 +139,7 @@ rm -rf release
 rm -rf fullrelease
 rm -rf test
 rm -rf x64
+rm -rf packages
 cd ..
 
 cd singlefilehelper

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 8203cff9b7a8b046f9fa8efd8c3efea29a983a04..c1f2dca5d1acbb01a2f85599426fb26a2d3e3bac 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("13")
+#define WINUAEBETA _T("14")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2016, 5, 14)
+#define WINUAEDATE MAKEBD(2016, 5, 18)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuae_msvc14/winuae_msvc.vcxproj b/od-win32/winuae_msvc14/winuae_msvc.vcxproj
index eda8a91d65312bf8744e264ec9f900f1c49eebde..dae2f7cb9289ff6f8dee46f6d53fdd91518c9ffd 100644 (file)
--- a/od-win32/winuae_msvc14/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc14/winuae_msvc.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="packages\VisualCppTools.14.0.24116-Pre\build\native\VisualCppTools.props" Condition="Exists('packages\VisualCppTools.14.0.24116-Pre\build\native\VisualCppTools.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -1044,6 +1045,7 @@
     <None Include="..\resources\move_up.ico" />
     <None Include="..\resources\paths.ico" />
     <None Include="..\resources\port.ico" />
+    <None Include="packages.config" />
     <None Include="port.ico" />
     <None Include="..\resources\quickstart.ico" />
     <None Include="..\resources\root.ico" />
@@ -1117,6 +1119,11 @@
     <ClInclude Include="..\resources\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\VisualCppTools.14.0.24116-Pre\build\native\VisualCppTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\VisualCppTools.14.0.24116-Pre\build\native\VisualCppTools.props'))" />
+  </Target>
 </Project>
\ No newline at end of file

diff --git a/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters
index ace976c259c9a65bf994496386db15784453595c..8dd175695af6206d0227b0ac5a09844a32caefd1 100644 (file)
--- a/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters
+++ b/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters
@@ -920,6 +920,7 @@
     <None Include="..\resources\drive_spin.wav" />
     <None Include="..\resources\drive_spinnd.wav" />
     <None Include="..\resources\drive_startup.wav" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\resources\winuae.rc">

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 060e30877f7c0f06fe7be7200a2937ba0d4cb32a..142c1fe071511280320ef2e2273b0797dd53ca17 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,28 @@
 
+Beta 14:
+
+- AGA subpixel scrolling: if line's parameters didn't change compared to previous field's line, line was
+  not marked as "changed" and was not alwsays redrawn correctly. (Roketz scoreboard corruption)
+- CD32: always generate subchannel interrupts and transfer subchannel frames when reading CD sectors if
+  subchannel DMA channel is enabled. (Previously was only done when playing CD audio)
+  Real hardware also transfer subchannel frames when CD is idle. This is not yet emulated.
+- Added "Paste" input event (END+INSERT default mapping), injects host clipboard text content using emulated
+  keyboard key codes. Only available when clipboard sharing is not active and only supports ROM default US
+  keyboard layout. For example can be used to paste strings directly to boot CLI, hardware debuggers or
+  non-AmigaOS operating systems.
+- Mouse/joystick autoswitching broke some betas ago.
+- Pause/GUI + black frame insertion: don't show black frame.
+- IVS Trumpcard Pro/GrandSlam SCSI emulation implemented.
+- AROS ROM updated.
+- Few weeks ago released new MSVC optimizer enabled (May not have it enabled in final version because it
+  is not yet fully production ready). Report if you notice any performance improvements.
+
+IVS Trumpcard Pro/GrandSlam SCSI:
+- Autoboot, seems to support custom filesystems.
+- 5380 based.
+- Fake DMA. Long reads, word wide writes.
+- "Trumpcard Professional Driver 4.9 - devs/IVS_SCSIpro.driver IVSSCSI 4.9 (20 Sep 1991)"
+
 Beta 13:
 
 - HALT10 was incorrectly triggered in some configurations (b12)
@@ -9,7 +33,7 @@ Beta 13:
   There is still something unknown. I did some more tests and some blitter cycle sequences do not conflict
   with buggy copper cycle and correctly wait one extra cycle.
 - Added IVS Trumpcard Pro/GrandSlam SCSI v4.9 ROM image. Emulation not yet implemented.
-  "Trumpcard Professional Driver 4.9 - devs/IVS_SCSIpro.driver IVSSCSI 4.9 (20 Sep 1991)"'
+  "Trumpcard Professional Driver 4.9 - devs/IVS_SCSIpro.driver IVSSCSI 4.9 (20 Sep 1991)"
 
 Variable Refresh rate updates. I finally bought G-Sync monitor, Acer Predator X34. Every emulator
 (any emulator!) user should get G-Sync or FreeSync hardware because variable sync has all the advantages of