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 2022-08-25 18:51:27 +02:00
parent 7dd8f4dae3
commit da2c0b44ad
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
oscar64/NativeCodeGenerator.cpp
View File

@ -10688,7 +10688,7 @@ bool NativeCodeBasicBlock::FindSameBlocks(NativeCodeProcedure* nproc)
{
for (int i = 0; i < nproc->mBlocks.Size(); i++)
{
if (nproc->mBlocks[i]->IsSame(this))
if (nproc->mBlocks[i] != this && nproc->mBlocks[i]->IsSame(this))
{
nproc->mBlocks[i]->mSameBlock = this;
changed = true;
@ -10731,7 +10731,7 @@ bool NativeCodeBasicBlock::MergeSameBlocks(NativeCodeProcedure* nproc)
changed = true;
}
return true;
return changed;
}
bool NativeCodeBasicBlock::MergeBasicBlocks(void)
@ -12362,7 +12362,7 @@ bool NativeCodeBasicBlock::SimplifyLoopEnd(NativeCodeProcedure* proc)
if (mTrueJump && !mFalseJump && mTrueJump->mLoopHead)
{
if (mTrueJump->mIns.Size() == 1 && mTrueJump->mFalseJump)
if (mTrueJump->mIns.Size() == 1 && mTrueJump->mFalseJump && mTrueJump->mTrueJump != mTrueJump)
{
mIns.Push(mTrueJump->mIns[0]);
mBranch = mTrueJump->mBranch;
@ -27364,7 +27364,12 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
Optimize();
assert(mEntryBlock->mIns.Size() == 0);
if (mEntryBlock->mIns.Size() > 0)
{
NativeCodeBasicBlock* eblock = AllocateBlock();
eblock->mTrueJump = mEntryBlock;
mEntryBlock = eblock;
}
// Remove temporary RTS

2
oscar64/oscar64.cpp
View File

@ -74,7 +74,7 @@ int main2(int argc, const char** argv)
#else
strcpy(strProductName, "oscar64");
strcpy(strProductVersion, "1.8.154");
strcpy(strProductVersion, "1.9.155");
#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,8,154,0
PRODUCTVERSION 1,8,154,0
FILEVERSION 1,9,155,0
PRODUCTVERSION 1,9,155,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -43,12 +43,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "oscar64"
VALUE "FileDescription", "oscar64 compiler"
VALUE "FileVersion", "1.8.154.0"
VALUE "FileVersion", "1.9.155.0"
VALUE "InternalName", "oscar64.exe"
VALUE "LegalCopyright", "Copyright (C) 2021"
VALUE "OriginalFilename", "oscar64.exe"
VALUE "ProductName", "oscar64"
VALUE "ProductVersion", "1.8.154.0"
VALUE "ProductVersion", "1.9.155.0"
END
END
BLOCK "VarFileInfo"

6
oscar64setup/oscar64setup.vdproj
View File

@ -4257,15 +4257,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oscar64"
"ProductCode" = "8:{2B60A66D-2355-44A1-A18F-6D4FFB905B87}"
"PackageCode" = "8:{83F5E3A7-10BF-4D0E-AE7A-D51EBDB9A37E}"
"ProductCode" = "8:{87022324-8ABF-4A22-8C5D-3125AA498926}"
"PackageCode" = "8:{AAF69F45-4ADE-4083-899D-F91680C978F5}"
"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.8.154"
"ProductVersion" = "8:1.9.155"
"Manufacturer" = "8:oscar64"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"