frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix infinite loop eating the entry block

This commit is contained in:
drmortalwombat 2023-09-27 18:53:35 +02:00
parent e6b865130a
commit c98ff08f56
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
oscar64/NativeCodeGenerator.cpp
View File

@ -12762,7 +12762,7 @@ bool NativeCodeBasicBlock::FindSameBlocks(NativeCodeProcedure* nproc)
{ {
mVisited = true; mVisited = true;
if (!mSameBlock) if (!mSameBlock && this != mProc->mEntryBlock)
{ {
for (int i = 0; i < nproc->mBlocks.Size(); i++) for (int i = 0; i < nproc->mBlocks.Size(); i++)
{ {
@ -40512,6 +40512,9 @@ void NativeCodeBasicBlock::CheckBlocks(bool sequence)
if (!mVisited) if (!mVisited)
{ {
mVisited = true; mVisited = true;
assert(this != mProc->mEntryBlock || mNumEntries < 2);
CheckLive(); CheckLive();
if (sequence) if (sequence)
@ -41823,6 +41826,7 @@ void NativeCodeProcedure::Optimize(void)
RebuildEntry(); RebuildEntry();
assert(mEntryBlock->mNumEntries < 2);
#if 1 #if 1
if (step > 3) if (step > 3)
{ {
@ -41834,6 +41838,8 @@ void NativeCodeProcedure::Optimize(void)
} }
} }
#endif #endif
RebuildEntry();
assert(mEntryBlock->mNumEntries < 2);
if (step == 4) if (step == 4)
{ {
@ -41848,6 +41854,7 @@ void NativeCodeProcedure::Optimize(void)
} }
RebuildEntry(); RebuildEntry();
assert(mEntryBlock->mNumEntries < 2);
#if 1 #if 1
if (step > 3) if (step > 3)

2
oscar64/oscar64.cpp
View File

@ -74,7 +74,7 @@ int main2(int argc, const char** argv)
#else #else
strcpy(strProductName, "oscar64"); strcpy(strProductName, "oscar64");
strcpy(strProductVersion, "1.26.219"); strcpy(strProductVersion, "1.26.220");
#ifdef __APPLE__ #ifdef __APPLE__
uint32_t length = sizeof(basePath); uint32_t length = sizeof(basePath);

8
oscar64/oscar64.rc
View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,219,0 FILEVERSION 1,26,220,0
PRODUCTVERSION 1,26,219,0 PRODUCTVERSION 1,26,220,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -43,12 +43,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "oscar64" VALUE "CompanyName", "oscar64"
VALUE "FileDescription", "oscar64 compiler" VALUE "FileDescription", "oscar64 compiler"
VALUE "FileVersion", "1.26.219.0" VALUE "FileVersion", "1.26.220.0"
VALUE "InternalName", "oscar64.exe" VALUE "InternalName", "oscar64.exe"
VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "LegalCopyright", "Copyright (C) 2021"
VALUE "OriginalFilename", "oscar64.exe" VALUE "OriginalFilename", "oscar64.exe"
VALUE "ProductName", "oscar64" VALUE "ProductName", "oscar64"
VALUE "ProductVersion", "1.26.219.0" VALUE "ProductVersion", "1.26.220.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

6
oscar64setup/oscar64setup.vdproj
View File

@ -5686,15 +5686,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oscar64" "ProductName" = "8:oscar64"
"ProductCode" = "8:{CBCAE13D-B17A-44B2-8FC3-38EE53B02C31}" "ProductCode" = "8:{532AC6ED-3D25-48DC-91FD-DBE96AF0026F}"
"PackageCode" = "8:{75E5F5B4-AE17-4214-ADB6-18D9177E8E1B}" "PackageCode" = "8:{9C57F5C1-1D7C-4915-8DD9-DFE81E950DCA}"
"UpgradeCode" = "8:{9AB61EFF-ACAC-4079-9950-8D96615CD4EF}" "UpgradeCode" = "8:{9AB61EFF-ACAC-4079-9950-8D96615CD4EF}"
"AspNetVersion" = "8:2.0.50727.0" "AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE" "InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.26.219" "ProductVersion" = "8:1.26.220"
"Manufacturer" = "8:oscar64" "Manufacturer" = "8:oscar64"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:" "ARPHELPLINK" = "8:"