From 417574b4bb431e90dd1ea7205404e029784ce8b7 Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Tue, 12 Apr 2022 22:08:40 +0200
Subject: [PATCH] Fix volatile copy

---
 include/c64/easyflash.h          | 6 +++---
 oscar64/NativeCodeGenerator.cpp  | 6 +++---
 oscar64/oscar64.cpp              | 2 +-
 oscar64/oscar64.rc               | 8 ++++----
 oscar64setup/oscar64setup.vdproj | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/c64/easyflash.h b/include/c64/easyflash.h
index 5055f73..35e4349 100644
--- a/include/c64/easyflash.h
+++ b/include/c64/easyflash.h
@@ -5,9 +5,9 @@
 
 struct EasyFlash
 {
-	byte	bank;
-	byte	pad1;
-	byte	control;
+	volatile byte	bank;
+	byte			pad1;
+	volatile byte	control;
 };
 
 #define EFCTRL_GAME		0x01
diff --git a/oscar64/NativeCodeGenerator.cpp b/oscar64/NativeCodeGenerator.cpp
index 5092372..6e78a13 100644
--- a/oscar64/NativeCodeGenerator.cpp
+++ b/oscar64/NativeCodeGenerator.cpp
@@ -4302,7 +4302,7 @@ void NativeCodeBasicBlock::LoadStoreIndirectValue(InterCodeProcedure* proc, cons
 		if (rmode == ASMIM_INDIRECT_Y)
 		{
 			mIns.Push(NativeCodeInstruction(ASMIT_LDY, ASMIM_IMMEDIATE, rindex + i));
-			mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_INDIRECT_Y, rareg));
+			mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_INDIRECT_Y, rareg, nullptr, rflags));
 		}
 		else if (rmode == ASMIM_ZERO_PAGE)
 			mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_ZERO_PAGE, rareg + i));
@@ -4312,7 +4312,7 @@ void NativeCodeBasicBlock::LoadStoreIndirectValue(InterCodeProcedure* proc, cons
 		if (wmode == ASMIM_INDIRECT_Y)
 		{
 			mIns.Push(NativeCodeInstruction(ASMIT_LDY, ASMIM_IMMEDIATE, windex + i));
-			mIns.Push(NativeCodeInstruction(ASMIT_STA, ASMIM_INDIRECT_Y, wareg));
+			mIns.Push(NativeCodeInstruction(ASMIT_STA, ASMIM_INDIRECT_Y, wareg, nullptr, wflags));
 		}
 		else if (wmode == ASMIM_ZERO_PAGE)
 			mIns.Push(NativeCodeInstruction(ASMIT_STA, ASMIM_ZERO_PAGE, wareg + i));
@@ -16905,7 +16905,7 @@ bool NativeCodeBasicBlock::PeepHoleOptimizer(NativeCodeProcedure* proc, int pass
 			}
 #endif
 			for (int i = 0; i < mIns.Size(); i++)
-			{
+		{
 #if 1
 #if 1
 				if (mIns[i].mType == ASMIT_AND && mIns[i].mMode == ASMIM_IMMEDIATE && mIns[i].mAddress == 0)
diff --git a/oscar64/oscar64.cpp b/oscar64/oscar64.cpp
index 2fb37fe..37a13e6 100644
--- a/oscar64/oscar64.cpp
+++ b/oscar64/oscar64.cpp
@@ -73,7 +73,7 @@ int main2(int argc, const char** argv)
 
 #else
 		strcpy(strProductName, "oscar64");
-		strcpy(strProductVersion, "1.5.114");
+		strcpy(strProductVersion, "1.5.115");
 
 #ifdef __APPLE__
 		uint32_t length = sizeof(basePath);
diff --git a/oscar64/oscar64.rc b/oscar64/oscar64.rc
index 4827665..3bbfdcb 100644
--- a/oscar64/oscar64.rc
+++ b/oscar64/oscar64.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,114,0
- PRODUCTVERSION 1,5,114,0
+ FILEVERSION 1,5,115,0
+ PRODUCTVERSION 1,5,115,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,12 +43,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "oscar64"
             VALUE "FileDescription", "oscar64 compiler"
-            VALUE "FileVersion", "1.5.114.0"
+            VALUE "FileVersion", "1.5.115.0"
             VALUE "InternalName", "oscar64.exe"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "oscar64.exe"
             VALUE "ProductName", "oscar64"
-            VALUE "ProductVersion", "1.5.114.0"
+            VALUE "ProductVersion", "1.5.115.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/oscar64setup/oscar64setup.vdproj b/oscar64setup/oscar64setup.vdproj
index 5162a58..1a4e51e 100644
--- a/oscar64setup/oscar64setup.vdproj
+++ b/oscar64setup/oscar64setup.vdproj
@@ -4023,15 +4023,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:oscar64"
-        "ProductCode" = "8:{182268D5-66D9-4A3E-9614-6BC300F32702}"
-        "PackageCode" = "8:{1E034087-52DF-4DF3-98C7-A7409E6A5349}"
+        "ProductCode" = "8:{FA319FAF-1EB3-4F52-9FEA-2BC0B4CB5CAC}"
+        "PackageCode" = "8:{ACF87401-D180-424C-B9D4-E855CBF66BB1}"
         "UpgradeCode" = "8:{9AB61EFF-ACAC-4079-9950-8D96615CD4EF}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.5.114"
+        "ProductVersion" = "8:1.5.115"
         "Manufacturer" = "8:oscar64"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"