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

Bump version number

This commit is contained in:
drmortalwombat 2024-09-24 11:36:36 +02:00
parent b1440a9b3f
commit 4c7dafed25
4 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
oscar64/InterCode.cpp
View File

@ -17417,17 +17417,20 @@ bool InterCodeBasicBlock::CheckSingleBlockLimitedLoop(InterCodeBasicBlock*& pbl
while (pi >= 0 && pblock->mInstructions[pi]->mDst.mTemp != ains->mDst.mTemp)
pi--;
int i = 0;
while (i < nins - 3 && mInstructions[i]->mDst.mTemp != ains->mDst.mTemp)
i++;
if (i == nins - 3)
if (pi >= 0 && pblock->mInstructions[pi]->mCode == IC_CONSTANT)
{
nloop = cins->mSrc[0].mIntConst;
if (cins->mOperator == IA_CMPLEU)
nloop++;
nloop = (nloop + ains->mSrc[0].mIntConst - 1) / ains->mSrc[0].mIntConst;
int i = 0;
while (i < nins - 3 && mInstructions[i]->mDst.mTemp != ains->mDst.mTemp)
i++;
if (i == nins - 3)
{
nloop = cins->mSrc[0].mIntConst - pblock->mInstructions[pi]->mConst.mIntConst;
if (cins->mOperator == IA_CMPLEU)
nloop++;
nloop = (nloop + ains->mSrc[0].mIntConst - 1) / ains->mSrc[0].mIntConst;
return true;
return true;
}
}
}
else if (bins->mSrc[0].mTemp == cins->mDst.mTemp &&
@ -17443,17 +17446,20 @@ bool InterCodeBasicBlock::CheckSingleBlockLimitedLoop(InterCodeBasicBlock*& pbl
while (pi >= 0 && pblock->mInstructions[pi]->mDst.mTemp != ains->mDst.mTemp)
pi--;
int i = 0;
while (i < nins - 3 && mInstructions[i]->mDst.mTemp != ains->mDst.mTemp)
i++;
if (i == nins - 3)
if (pi >= 0 && pblock->mInstructions[pi]->mCode == IC_CONSTANT)
{
nloop = cins->mSrc[0].mRange.mMaxValue;
if (cins->mOperator == IA_CMPLEU)
nloop++;
nloop = (nloop + ains->mSrc[0].mIntConst - 1) / ains->mSrc[0].mIntConst;
int i = 0;
while (i < nins - 3 && mInstructions[i]->mDst.mTemp != ains->mDst.mTemp)
i++;
if (i == nins - 3)
{
nloop = cins->mSrc[0].mRange.mMaxValue - pblock->mInstructions[pi]->mConst.mIntConst;
if (cins->mOperator == IA_CMPLEU)
nloop++;
nloop = (nloop + ains->mSrc[0].mIntConst - 1) / ains->mSrc[0].mIntConst;
return true;
return true;
}
}
}
}
@ -22485,7 +22491,7 @@ void InterCodeProcedure::Close(void)
{
GrowingTypeArray tstack(IT_NONE);
CheckFunc = !strcmp(mIdent->mString, "testD");
CheckFunc = !strcmp(mIdent->mString, "main");
CheckCase = false;
mEntryBlock = mBlocks[0];

2
oscar64/oscar64.cpp
View File

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

8
oscar64/oscar64.rc
View File

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

6
oscar64setup/oscar64setup.vdproj
View File

@ -6284,15 +6284,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oscar64"
"ProductCode" = "8:{5C4705CD-2381-48D0-A63B-FE92E0653E47}"
"PackageCode" = "8:{1C731FDC-60D2-4AF5-9249-B2F11CAED853}"
"ProductCode" = "8:{FF988B8B-91E4-4D25-80EB-324160BC3146}"
"PackageCode" = "8:{F8604441-6C5B-4EBA-91A3-157C75F673A8}"
"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.30.251"
"ProductVersion" = "8:1.31.252"
"Manufacturer" = "8:oscar64"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"