From aebd2213ca50dbd86479d0ac7eab0e3b0c24df5d Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Wed, 8 Apr 2020 21:08:10 +0300
Subject: [PATCH] ancient enum type update.

---
 disasm.cpp                                    |  2 +-
 include/readcpu.h                             |  6 +-
 include/sysdeps.h                             | 14 ----
 od-win32/build68k_msvc/build68k_msvc.vcxproj  |  3 +-
 od-win32/cputester/cputester.vcxproj          |  8 ++-
 .../cputester_m68k/cputester_m68k.vcxproj     |  3 +-
 .../winuae_msvc15/winuae_msvc.vcxproj.filters | 64 +++++++++----------
 readcpu.cpp                                   |  4 +-
 8 files changed, 47 insertions(+), 57 deletions(-)

diff --git a/disasm.cpp b/disasm.cpp
index d7038ee0..2d3db919 100644
--- a/disasm.cpp
+++ b/disasm.cpp
@@ -43,7 +43,7 @@ const TCHAR *fpsizes[] = {
 	_T("B"),
 	_T("P")
 };
-static const int fpsizeconv[] = {
+static const wordsizes fpsizeconv[] = {
 	sz_long,
 	sz_single,
 	sz_extended,
diff --git a/include/readcpu.h b/include/readcpu.h
index a814ed52..da779870 100644
--- a/include/readcpu.h
+++ b/include/readcpu.h
@@ -100,11 +100,11 @@ extern struct instr {
     unsigned int mnemo:8;
     unsigned int cc:4;
     unsigned int plev:2;
-    unsigned int size:2;
+    wordsizes size;
 	unsigned int unsized:1;
-    unsigned int smode:5;
+    amodes smode;
     unsigned int stype:3;
-    unsigned int dmode:5;
+    amodes dmode;
     unsigned int suse:1;
     unsigned int duse:1;
     unsigned int ccuse:1;
diff --git a/include/sysdeps.h b/include/sysdeps.h
index 756f2637..59970088 100644
--- a/include/sysdeps.h
+++ b/include/sysdeps.h
@@ -237,23 +237,9 @@ extern void unicode_init (void);
 extern void to_lower (TCHAR *s, int len);
 extern void to_upper (TCHAR *s, int len);
 
-/* We can only rely on GNU C getting enums right. Mickeysoft VSC++ is known
- * to have problems, and it's likely that other compilers choke too. */
-#ifdef __GNUC__
 #define ENUMDECL typedef enum
 #define ENUMNAME(name) name
 
-/* While we're here, make abort more useful.  */
-#define abort() \
-  do { \
-    write_log ("Internal error; file %s, line %d\n", __FILE__, __LINE__); \
-    (abort) (); \
-} while (0)
-#else
-#define ENUMDECL enum
-#define ENUMNAME(name) ; typedef int name
-#endif
-
 /*
  * Porters to weird systems, look! This is the preferred way to get
  * filesys.c (and other stuff) running on your system. Define the
diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj b/od-win32/build68k_msvc/build68k_msvc.vcxproj
index 30920d4a..c3311b1b 100644
--- a/od-win32/build68k_msvc/build68k_msvc.vcxproj
+++ b/od-win32/build68k_msvc/build68k_msvc.vcxproj
@@ -148,7 +148,6 @@
     <PostBuildEvent>
       <Message>creating cpudefs.cpp</Message>
       <Command>build68k.exe &gt;..\..\cpudefs.cpp &lt;..\..\table68k
-del build68k.exe
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -238,7 +237,7 @@ del build68k.exe
     <PostBuildEvent>
       <Message>creating cpudefs.cpp</Message>
       <Command>build68k.exe &gt;..\..\cpudefs.cpp &lt;..\..\table68k
-del build68k.exe
+
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
diff --git a/od-win32/cputester/cputester.vcxproj b/od-win32/cputester/cputester.vcxproj
index 0506cdb8..21815426 100644
--- a/od-win32/cputester/cputester.vcxproj
+++ b/od-win32/cputester/cputester.vcxproj
@@ -71,10 +71,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
-    <IncludePath>$(IncludePath)</IncludePath>
+    <IncludePath>c:\dev\include;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(IncludePath)</IncludePath>
+    <IncludePath>c:\dev\include;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
     <IncludePath>$(IncludePath)</IncludePath>
@@ -100,6 +102,7 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
@@ -116,6 +119,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
diff --git a/od-win32/cputester_m68k/cputester_m68k.vcxproj b/od-win32/cputester_m68k/cputester_m68k.vcxproj
index 59c9fb8a..a38ac0bf 100644
--- a/od-win32/cputester_m68k/cputester_m68k.vcxproj
+++ b/od-win32/cputester_m68k/cputester_m68k.vcxproj
@@ -47,11 +47,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Disabled</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
index 50bce391..2fc17bc1 100644
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
@@ -5,10 +5,6 @@
       <UniqueIdentifier>{86cfeeb5-a9b0-4c06-bd94-69c258884a66}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
-    <Filter Include="win32\Resource Files">
-      <UniqueIdentifier>{5c4c971a-37b6-4c1e-82f1-d225ebb12808}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
     <Filter Include="common">
       <UniqueIdentifier>{c0e78831-47fa-48a0-a34e-8c3c4410c34b}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
@@ -77,6 +73,10 @@
     <Filter Include="nasm">
       <UniqueIdentifier>{9d6d0e7b-76b0-4b28-a9ef-0b69a02528c7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="win32\Shaders\Resource Files">
+      <UniqueIdentifier>{5c4c971a-37b6-4c1e-82f1-d225ebb12808}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\ahidsound_dsonly.cpp">
@@ -941,87 +941,87 @@
       <Filter>x86</Filter>
     </ClCompile>
     <ClCompile Include="..\..\disasm.cpp">
-      <Filter>win32</Filter>
+      <Filter>common</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\resources\35floppy.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\amigainfo.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\avioutput.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\chip.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\configfile.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\cpu.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\diskimage.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\Drive.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\expansion.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\file.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\folder.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\h_arrow.cur">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\icon3.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\joystick.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\lcd.bmp">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\misc.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\move_dow.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\move_up.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\paths.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\port.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\quickstart.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\root.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\screen.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\sound.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\winuae.ico">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\xarcade-winuae.bmp">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </None>
     <None Include="..\resources\drive_click.wav" />
     <None Include="..\resources\drive_snatch.wav" />
@@ -1031,7 +1031,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\resources\winuae.rc">
-      <Filter>win32\Resource Files</Filter>
+      <Filter>win32\Shaders\Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/readcpu.cpp b/readcpu.cpp
index bb668c85..ddceee21 100644
--- a/readcpu.cpp
+++ b/readcpu.cpp
@@ -173,7 +173,7 @@ static amodes mode_from_str (const TCHAR *str)
 	if (_tcsncmp (str, _T("PC8r"), 4) == 0) return PC8r;
 	if (_tcsncmp (str, _T("Immd"), 4) == 0) return imm;
 	abort ();
-	return 0;
+	return Dreg;
 }
 
 STATIC_INLINE amodes mode_from_mr (int mode, int reg)
@@ -199,7 +199,7 @@ STATIC_INLINE amodes mode_from_mr (int mode, int reg)
 		}
 	}
 	abort ();
-	return 0;
+	return Dreg;
 }
 
 static void build_insn (int insn)
-- 
2.47.3