diff --git a/oscar64/InterCode.cpp b/oscar64/InterCode.cpp index 56d7a41..d2a169b 100644 --- a/oscar64/InterCode.cpp +++ b/oscar64/InterCode.cpp @@ -7806,6 +7806,8 @@ static bool SameSingleAssignment(const GrowingInstructionPtrArray& tunified, con { return false; } + else if (!tunified[ins->mSrc[i].mTemp]) + return false; else if (tunified[ins->mSrc[i].mTemp] != tunified[cins->mSrc[i].mTemp]) return false; } diff --git a/oscar64/oscar64.cpp b/oscar64/oscar64.cpp index 825eb2b..ac960d9 100644 --- a/oscar64/oscar64.cpp +++ b/oscar64/oscar64.cpp @@ -74,7 +74,7 @@ int main2(int argc, const char** argv) #else strcpy(strProductName, "oscar64"); - strcpy(strProductVersion, "1.23.211"); + strcpy(strProductVersion, "1.23.212"); #ifdef __APPLE__ uint32_t length = sizeof(basePath); diff --git a/oscar64/oscar64.rc b/oscar64/oscar64.rc index 65dc55b..12d7cd4 100644 --- a/oscar64/oscar64.rc +++ b/oscar64/oscar64.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,23,211,0 - PRODUCTVERSION 1,23,211,0 + FILEVERSION 1,23,212,0 + PRODUCTVERSION 1,23,212,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,12 +43,12 @@ BEGIN BEGIN VALUE "CompanyName", "oscar64" VALUE "FileDescription", "oscar64 compiler" - VALUE "FileVersion", "1.23.211.0" + VALUE "FileVersion", "1.23.212.0" VALUE "InternalName", "oscar64.exe" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "oscar64.exe" VALUE "ProductName", "oscar64" - VALUE "ProductVersion", "1.23.211.0" + VALUE "ProductVersion", "1.23.212.0" END END BLOCK "VarFileInfo" diff --git a/oscar64setup/oscar64setup.vdproj b/oscar64setup/oscar64setup.vdproj index df337d0..7f9ef82 100644 --- a/oscar64setup/oscar64setup.vdproj +++ b/oscar64setup/oscar64setup.vdproj @@ -5504,15 +5504,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:oscar64" - "ProductCode" = "8:{E5A90B4B-CA2A-43EC-9597-90010989AF33}" - "PackageCode" = "8:{C6265FB3-0498-45EF-827C-27788C57AFAF}" + "ProductCode" = "8:{56AFEF31-4A48-403F-A6CA-601769444F71}" + "PackageCode" = "8:{3797CD46-BC0B-40C2-93E5-B8226ACD9F91}" "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.23.211" + "ProductVersion" = "8:1.23.212" "Manufacturer" = "8:oscar64" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:"