From bcc20d398641ab66aebb914c319d9a9c68b0fb40 Mon Sep 17 00:00:00 2001 From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com> Date: Tue, 13 Feb 2024 16:53:44 +0100 Subject: [PATCH] Switch to x64 compiler binary --- .gitignore | 2 + oscar64/Array.h | 33 ++-- oscar64/CompilationUnits.cpp | 2 +- oscar64/Compiler.cpp | 8 +- oscar64/DiskImage.cpp | 10 +- oscar64/DiskImage.h | 2 +- oscar64/Ident.cpp | 4 +- oscar64/InterCode.cpp | 30 +++- oscar64/InterCode.h | 1 + oscar64/Linker.cpp | 8 +- oscar64/MachineTypes.h | 3 + oscar64/Parser.cpp | 4 +- oscar64/Preprocessor.cpp | 8 +- oscar64/Scanner.cpp | 8 +- oscar64/Scanner.h | 2 +- oscar64/oscar64.cpp | 8 +- oscar64/oscar64.rc | 8 +- oscar64/oscar64.vcxproj | 11 ++ oscar64setup/oscar64setup.vdproj | 272 +------------------------------ 19 files changed, 109 insertions(+), 315 deletions(-) diff --git a/.gitignore b/.gitignore index 463dfbb..ec8f081 100644 --- a/.gitignore +++ b/.gitignore @@ -351,3 +351,5 @@ make/oscar64 *.dbj *.json *.mapd +*.idb +oscar64/Releasex64/oscar64.vcxproj.FileListAbsolute.txt diff --git a/oscar64/Array.h b/oscar64/Array.h index 7bca0a3..9c2153b 100644 --- a/oscar64/Array.h +++ b/oscar64/Array.h @@ -153,8 +153,8 @@ template class GrowingArray { protected: - int size, range; - T* array; + int size, range; + T * array; T empty; void Grow(int to, bool clear) @@ -166,10 +166,15 @@ protected: if (to > range) { - if (to > range * 2) + int trange = range * sizeof(T) < 65536 ? range * 2 : range + (range >> 2); + + if (trange < 4) + trange = 4; + + if (to > trange) range = to; else - range = range * 2; + range = trange; a2 = new T[range]; if (to > size) @@ -191,8 +196,8 @@ public: : empty(empty_) { size = 0; - range = 4; - array = new T[range]; + range = 0; + array = nullptr; } GrowingArray(const GrowingArray& a) @@ -226,14 +231,22 @@ public: delete[] array; } - T& operator[](int n) + void shrink(void) + { + size = 0; + range = 0; + delete[] array; + array = nullptr; + } + + __forceinline T& operator[](int n) { assert(n >= 0); if (n >= size) Grow(n + 1, false); return array[n]; } - const T & operator[](int n) const + __forceinline const T & operator[](int n) const { assert(n >= 0); if (n >= size) return empty; @@ -251,7 +264,7 @@ public: if (n < size) array[n] = empty; } - + void Push(T t) { (*this)[size] = t; @@ -322,7 +335,7 @@ public: bool IsEmpty(void) const { return size == 0; } - int Size(void) const { return size; } + __forceinline int Size(void) const { return size; } T Last() const { diff --git a/oscar64/CompilationUnits.cpp b/oscar64/CompilationUnits.cpp index a8cf2e2..3dce915 100644 --- a/oscar64/CompilationUnits.cpp +++ b/oscar64/CompilationUnits.cpp @@ -49,7 +49,7 @@ bool CompilationUnits::AddUnit(Location& location, const char* name, const char* else { strcpy_s(filename, from); - int i = strlen(filename); + ptrdiff_t i = strlen(filename); while (i > 0 && (filename[i - 1] != '/' && filename[i - 1] != '\\')) i--; while (name[0] == '.' && name[1] == '.' && name[2] == '/') diff --git a/oscar64/Compiler.cpp b/oscar64/Compiler.cpp index d41c88a..3b79ee7 100644 --- a/oscar64/Compiler.cpp +++ b/oscar64/Compiler.cpp @@ -1143,7 +1143,7 @@ bool Compiler::BuildLZO(const char* targetPath) char prgPath[200]; strcpy_s(prgPath, targetPath); - int i = strlen(prgPath); + ptrdiff_t i = strlen(prgPath); while (i > 0 && prgPath[i - 1] != '.') i--; if (i > 0) @@ -1157,7 +1157,7 @@ bool Compiler::BuildLZO(const char* targetPath) fopen_s(&file, prgPath, "wb"); if (file) { - int done = fwrite(data, 1, n, file); + ptrdiff_t done = fwrite(data, 1, n, file); fclose(file); delete[] data; return done == n; @@ -1181,7 +1181,7 @@ bool Compiler::WriteOutputFile(const char* targetPath, DiskImage * d64) char basePath[200]; strcpy_s(basePath, targetPath); - int i = strlen(basePath); + ptrdiff_t i = strlen(basePath); while (i > 0 && basePath[i - 1] != '/' && basePath[i - 1] != '\\' && basePath[i - 1] != ':') i--; if (i > 0) @@ -1254,7 +1254,7 @@ bool Compiler::WriteOutputFile(const char* targetPath, DiskImage * d64) if (d64) { - int i = strlen(prgPath); + ptrdiff_t i = strlen(prgPath); while (i > 0 && prgPath[i - 1] != '.') i--; if (i > 0) diff --git a/oscar64/DiskImage.cpp b/oscar64/DiskImage.cpp index 5b5be37..0bbe7f4 100644 --- a/oscar64/DiskImage.cpp +++ b/oscar64/DiskImage.cpp @@ -53,7 +53,7 @@ DiskImage::DiskImage(const char* fname) for (int i = 0x90; i < 0xab; i++) bam[i] = 0xa0; - int i = strlen(fname); + ptrdiff_t i = strlen(fname); while (i > 0 && fname[i - 1] != '/' && fname[i - 1] != '\\') i--; @@ -235,7 +235,7 @@ bool DiskImage::WriteFile(const char* fname, bool compressed) if (file) { char dname[200]; - int i = strlen(fname); + ptrdiff_t i = strlen(fname); while (i > 0 && fname[i - 1] != '/' && fname[i - 1] != '\\') i--; @@ -251,7 +251,7 @@ bool DiskImage::WriteFile(const char* fname, bool compressed) if (OpenFile(dname)) { uint8 * buffer = new uint8[65536], * cbuffer = new uint8[65536]; - int size = fread(buffer, 1, 65536, file); + ptrdiff_t size = fread(buffer, 1, 65536, file); int csize = 0; if (compressed) @@ -323,10 +323,10 @@ bool DiskImage::WriteFile(const char* fname, bool compressed) return false; } -int DiskImage::WriteBytes(const uint8* data, int size) +int DiskImage::WriteBytes(const uint8* data, ptrdiff_t size) { uint8* dp = mSectors[mTrack][mSector]; - for (int i = 0; i < size; i++) + for (ptrdiff_t i = 0; i < size; i++) { if (mBytes >= 256) { diff --git a/oscar64/DiskImage.h b/oscar64/DiskImage.h index 25683a8..6541630 100644 --- a/oscar64/DiskImage.h +++ b/oscar64/DiskImage.h @@ -13,7 +13,7 @@ public: bool OpenFile(const char* fname); void CloseFile(void); - int WriteBytes(const uint8* data, int size); + int WriteBytes(const uint8* data, ptrdiff_t size); bool WriteFile(const char* fname, bool compressed); protected: diff --git a/oscar64/Ident.cpp b/oscar64/Ident.cpp index e0c0305..5fd117d 100644 --- a/oscar64/Ident.cpp +++ b/oscar64/Ident.cpp @@ -22,7 +22,7 @@ unsigned int IHash(const char* str) Ident::Ident(const char* str, unsigned int hash) { - int ssize = strlen(str); + ptrdiff_t ssize = strlen(str); mString = new char[ssize + 1]; strcpy_s(mString, ssize + 1, str); @@ -82,7 +82,7 @@ IdentDict::~IdentDict(void) void IdentDict::Insert(const Ident* ident, const char* str) { - int s = strlen(str); + ptrdiff_t s = strlen(str); char* nstr = new char[s + 1]; strcpy_s(nstr, s + 1, str); InsertCopy(ident, nstr); diff --git a/oscar64/InterCode.cpp b/oscar64/InterCode.cpp index ff6972c..3e85194 100644 --- a/oscar64/InterCode.cpp +++ b/oscar64/InterCode.cpp @@ -968,16 +968,28 @@ static int64 ConstantFolding(InterOperator oper, InterType type, int64 val1, int return val1 * val2; break; case IA_DIVU: - return (uint64)val1 / (uint64)val2; + if (val2) + return (uint64)val1 / (uint64)val2; + else + return 0; break; case IA_DIVS: - return val1 / val2; + if (val2) + return val1 / val2; + else + return 0; break; case IA_MODU: - return (uint64)val1 % (uint64)val2; + if (val2) + return (uint64)val1 % (uint64)val2; + else + return 0; break; case IA_MODS: - return val1 % val2; + if (val2) + return val1 % val2; + else + return 0; break; case IA_OR: return val1 | val2; @@ -2155,6 +2167,12 @@ void TempForwardingTable::Reset(void) mAssoc[i] = Assoc(i, i, i); } +void TempForwardingTable::Shrink(void) +{ + mAssoc.shrink(); +} + + int TempForwardingTable::operator[](int n) { return mAssoc[n].mAssoc; @@ -9170,6 +9188,8 @@ void InterCodeBasicBlock::PerformTempForwarding(const TempForwardingTable& forwa if (mTrueJump) mTrueJump->PerformTempForwarding(mMergeForwardingTable, reverse, checkloops); if (mFalseJump) mFalseJump->PerformTempForwarding(mMergeForwardingTable, reverse, checkloops); + + mMergeForwardingTable.Shrink(); } } @@ -19902,7 +19922,7 @@ void InterCodeProcedure::Close(void) { GrowingTypeArray tstack(IT_NONE); - CheckFunc = !strcmp(mIdent->mString, "_initFish"); + CheckFunc = !strcmp(mIdent->mString, "main"); CheckCase = false; mEntryBlock = mBlocks[0]; diff --git a/oscar64/InterCode.h b/oscar64/InterCode.h index 2aa1c2a..22da76b 100644 --- a/oscar64/InterCode.h +++ b/oscar64/InterCode.h @@ -236,6 +236,7 @@ public: void SetSize(int size); void Reset(void); + void Shrink(void); int operator[](int n); diff --git a/oscar64/Linker.cpp b/oscar64/Linker.cpp index ed0e33b..b6e4767 100644 --- a/oscar64/Linker.cpp +++ b/oscar64/Linker.cpp @@ -1170,7 +1170,7 @@ bool Linker::WriteBinFile(const char* filename) fopen_s(&file, filename, "wb"); if (file) { - int done = fwrite(mMemory + mProgramStart, 1, mProgramEnd - mProgramStart, file); + ptrdiff_t done = fwrite(mMemory + mProgramStart, 1, mProgramEnd - mProgramStart, file); fclose(file); return done == mProgramEnd - mProgramStart; } @@ -1209,7 +1209,7 @@ bool Linker::WriteNesFile(const char* filename, TargetMachine machine) break; } - int done = fwrite(header, 1, 16, file); + ptrdiff_t done = fwrite(header, 1, 16, file); switch (machine) { @@ -1291,7 +1291,7 @@ bool Linker::WriteXexFile(const char* filename) fputc((mProgramEnd - 1) & 0xff, file); fputc((mProgramEnd - 1) >> 8, file); - int done = fwrite(mMemory + mProgramStart, 1, mProgramEnd - mProgramStart, file); + ptrdiff_t done = fwrite(mMemory + mProgramStart, 1, mProgramEnd - mProgramStart, file); fputc(0xe0, file); fputc(0x02, file); @@ -1316,7 +1316,7 @@ bool Linker::WritePrgFile(const char* filename, const char* pathname) mMemory[mProgramStart - 2] = mProgramStart & 0xff; mMemory[mProgramStart - 1] = mProgramStart >> 8; - int done = fwrite(mMemory + mProgramStart - 2, 1, mProgramEnd - mProgramStart + 2, file); + ptrdiff_t done = fwrite(mMemory + mProgramStart - 2, 1, mProgramEnd - mProgramStart + 2, file); fclose(file); if (done == mProgramEnd - mProgramStart + 2) { diff --git a/oscar64/MachineTypes.h b/oscar64/MachineTypes.h index 3f2788d..8671f61 100644 --- a/oscar64/MachineTypes.h +++ b/oscar64/MachineTypes.h @@ -4,6 +4,9 @@ #include #include #include +#include + +using std::ptrdiff_t; typedef unsigned char uint8; typedef unsigned short uint16; diff --git a/oscar64/Parser.cpp b/oscar64/Parser.cpp index 001a16a..3879718 100644 --- a/oscar64/Parser.cpp +++ b/oscar64/Parser.cpp @@ -1735,12 +1735,12 @@ Expression* Parser::ParseInitExpression(Declaration* dtype) else if (mScanner->mToken == TK_STRING && dtype->mType == DT_TYPE_ARRAY && dtype->mBase->mType == DT_TYPE_INTEGER && dtype->mBase->mSize == 1) { uint8* d = ParseStringLiteral(dtype->mSize); - int ds = strlen((char *)d); + ptrdiff_t ds = strlen((char *)d); if (!(dtype->mFlags & DTF_DEFINED)) { dtype->mFlags |= DTF_DEFINED; - dtype->mSize = ds + 1; + dtype->mSize = int(ds + 1); } dec = new Declaration(mScanner->mLocation, DT_CONST_DATA); diff --git a/oscar64/Preprocessor.cpp b/oscar64/Preprocessor.cpp index a2b04b8..3dce275 100644 --- a/oscar64/Preprocessor.cpp +++ b/oscar64/Preprocessor.cpp @@ -627,7 +627,7 @@ bool SourceFile::Open(const char* name, const char* path, SourceFileMode mode) return false; strcpy_s(fname, path); - int n = strlen(fname); + ptrdiff_t n = strlen(fname); if (n > 0 && fname[n - 1] != '/') { @@ -706,7 +706,7 @@ bool SourceFile::DropSource(void) bool Preprocessor::NextLine(void) { - int s = 0; + ptrdiff_t s = 0; while (mSource->ReadLine(mLine + s)) { mLocation.mLine++; @@ -744,7 +744,7 @@ bool Preprocessor::EmbedData(const char* reason, const char* name, bool local, i { char lpath[220]; strcpy_s(lpath, mSource->mFileName); - int i = strlen(lpath); + ptrdiff_t i = strlen(lpath); while (i > 0 && lpath[i - 1] != '/') i--; lpath[i] = 0; @@ -806,7 +806,7 @@ bool Preprocessor::OpenSource(const char * reason, const char* name, bool local) { char lpath[220]; strcpy_s(lpath, mSource->mFileName); - int i = strlen(lpath); + ptrdiff_t i = strlen(lpath); while (i > 0 && lpath[i - 1] != '/') i--; lpath[i] = 0; diff --git a/oscar64/Scanner.cpp b/oscar64/Scanner.cpp index df2ca5a..5607d0c 100644 --- a/oscar64/Scanner.cpp +++ b/oscar64/Scanner.cpp @@ -185,11 +185,11 @@ Macro::~Macro(void) void Macro::SetString(const char* str) { - int s = strlen(str); + ptrdiff_t s = strlen(str); SetString(str, s); } -void Macro::SetString(const char* str, int length) +void Macro::SetString(const char* str, ptrdiff_t length) { char* nstr = new char[length + 2]; @@ -1043,8 +1043,8 @@ void Scanner::NextPreToken(void) char tkbase[256]; strcpy_s(tkbase, mTokenIdent->mString); - int n = 0; - char tkident[256]; + ptrdiff_t n = 0; + char tkident[256]; while (IsIdentChar(mTokenChar)) { if (n < 255) diff --git a/oscar64/Scanner.h b/oscar64/Scanner.h index 45bc4a2..dd25a7e 100644 --- a/oscar64/Scanner.h +++ b/oscar64/Scanner.h @@ -183,7 +183,7 @@ public: ~Macro(void); void SetString(const char* str); - void SetString(const char* str, int length); + void SetString(const char* str, ptrdiff_t length); void AddArgument(const Ident * ident); const Ident* mIdent; diff --git a/oscar64/oscar64.cpp b/oscar64/oscar64.cpp index e02fa95..7b999df 100644 --- a/oscar64/oscar64.cpp +++ b/oscar64/oscar64.cpp @@ -75,7 +75,7 @@ int main2(int argc, const char** argv) #else strcpy(strProductName, "oscar64"); - strcpy(strProductVersion, "1.26.234"); + strcpy(strProductVersion, "1.27.235"); #ifdef __APPLE__ uint32_t length = sizeof(basePath); @@ -263,7 +263,7 @@ int main2(int argc, const char** argv) if (!targetPath[0]) strcpy_s(targetPath, argv[i]); - int n = strlen(argv[i]); + ptrdiff_t n = strlen(argv[i]); if (n > 4 && argv[i][n - 4] == '.' && argv[i][n - 3] == 'c' && argv[i][n - 2] == 'p' && argv[i][n - 1] == 'p') { compiler->mCompilerOptions |= COPT_CPLUSPLUS; @@ -542,7 +542,11 @@ int main2(int argc, const char** argv) #ifndef _DEBUG int seh_filter(unsigned int code, struct _EXCEPTION_POINTERS* info) { +#ifdef _WIN64 + printf("oscar64 crashed. %08x %08llx", info->ExceptionRecord->ExceptionCode, (uint64)(info->ExceptionRecord->ExceptionAddress)); +#else printf("oscar64 crashed. %08x %08x", info->ExceptionRecord->ExceptionCode, (uint32)(info->ExceptionRecord->ExceptionAddress)); +#endif return EXCEPTION_EXECUTE_HANDLER; } #endif diff --git a/oscar64/oscar64.rc b/oscar64/oscar64.rc index d08de68..a5bc5f4 100644 --- a/oscar64/oscar64.rc +++ b/oscar64/oscar64.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,26,234,0 - PRODUCTVERSION 1,26,234,0 + FILEVERSION 1,27,235,0 + PRODUCTVERSION 1,27,235,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,12 +43,12 @@ BEGIN BEGIN VALUE "CompanyName", "oscar64" VALUE "FileDescription", "oscar64 compiler" - VALUE "FileVersion", "1.26.234.0" + VALUE "FileVersion", "1.27.235.0" VALUE "InternalName", "oscar64.exe" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "oscar64.exe" VALUE "ProductName", "oscar64" - VALUE "ProductVersion", "1.26.234.0" + VALUE "ProductVersion", "1.27.235.0" END END BLOCK "VarFileInfo" diff --git a/oscar64/oscar64.vcxproj b/oscar64/oscar64.vcxproj index 53df641..e3e1d27 100644 --- a/oscar64/oscar64.vcxproj +++ b/oscar64/oscar64.vcxproj @@ -52,6 +52,7 @@ v142 true Unicode + false @@ -79,6 +80,8 @@ true + $(SolutionDir)\$(Configuration)$(Platform)\ + $(Configuration)$(Platform)\ false @@ -134,6 +137,7 @@ Console true kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;version.lib;%(AdditionalDependencies) + 16000000 @@ -144,6 +148,9 @@ true NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true + AnySuitable + false + Speed Console @@ -151,7 +158,11 @@ true true kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;version.lib;%(AdditionalDependencies) + 16000000 + + copy $(TargetPath) $(SolutionDir)bin + diff --git a/oscar64setup/oscar64setup.vdproj b/oscar64setup/oscar64setup.vdproj index cd0284c..306a595 100644 --- a/oscar64setup/oscar64setup.vdproj +++ b/oscar64setup/oscar64setup.vdproj @@ -34,12 +34,6 @@ } "Entry" { - "MsmKey" = "8:_03D7013B0D39A89CEA9D267005ADCE39" - "OwnerKey" = "8:_FB2E467BC172457785F4279BB0BFE8B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_04ABABC55200450383686DD782DD1548" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -256,12 +250,6 @@ } "Entry" { - "MsmKey" = "8:_326B44043E3720E0A341FB5627DA8873" - "OwnerKey" = "8:_FB2E467BC172457785F4279BB0BFE8B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_3277DE1463544F67B7E7390175F8A9CF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -280,12 +268,6 @@ } "Entry" { - "MsmKey" = "8:_36B4A1247BFCE001E1BAE7560E9CFEEA" - "OwnerKey" = "8:_FB2E467BC172457785F4279BB0BFE8B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_379EE3C17FEC4C5EA79D07668CD05FC4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -358,12 +340,6 @@ } "Entry" { - "MsmKey" = "8:_458189403F0009BC49371204B74F3BD3" - "OwnerKey" = "8:_FB2E467BC172457785F4279BB0BFE8B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_47A877D439EE429BAB64C52FEF69EDA4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -544,12 +520,6 @@ } "Entry" { - "MsmKey" = "8:_749A2BA18335F50EB53CCE7029861FBC" - "OwnerKey" = "8:_FB2E467BC172457785F4279BB0BFE8B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_749F54DFBD4D404DA9C2E2D5BA7CDDBF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -646,12 +616,6 @@ } "Entry" { - "MsmKey" = "8:_8667075410229C38BF63AC1CC776055E" - "OwnerKey" = "8:_FB2E467BC172457785F4279BB0BFE8B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_8827B6B07A1C4B32B08DF784E090381D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -700,12 +664,6 @@ } "Entry" { - "MsmKey" = "8:_930F11977FD2D88B1FBF87EDC1CC3F88" - "OwnerKey" = "8:_FB2E467BC172457785F4279BB0BFE8B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_94AD9BFFA9D04AA0B6BC6EEA1D9A93ED" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1108,12 +1066,6 @@ } "Entry" { - "MsmKey" = "8:_DD5A4DD822437085CD584319732F2D4D" - "OwnerKey" = "8:_FB2E467BC172457785F4279BB0BFE8B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_DE1058FFA9E149D1909C819592A12273" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1198,12 +1150,6 @@ } "Entry" { - "MsmKey" = "8:_EA3C0BCB01F2639DFA2E37EC8436E5F6" - "OwnerKey" = "8:_FB2E467BC172457785F4279BB0BFE8B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_EC599856E7AE44F4A2F51AA76A4D044C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1252,12 +1198,6 @@ } "Entry" { - "MsmKey" = "8:_F20F5618C7576D758C01D89C87469AF8" - "OwnerKey" = "8:_FB2E467BC172457785F4279BB0BFE8B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F35970F9D8FA46B09F36D7E9DE5532CA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1451,26 +1391,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03D7013B0D39A89CEA9D267005ADCE39" - { - "SourcePath" = "8:VCRUNTIME140.dll" - "TargetName" = "8:VCRUNTIME140.dll" - "Tag" = "8:" - "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_04ABABC55200450383686DD782DD1548" { "SourcePath" = "8:..\\samples\\games\\lander.c" @@ -2191,26 +2111,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_326B44043E3720E0A341FB5627DA8873" - { - "SourcePath" = "8:api-ms-win-crt-stdio-l1-1-0.dll" - "TargetName" = "8:api-ms-win-crt-stdio-l1-1-0.dll" - "Tag" = "8:" - "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3277DE1463544F67B7E7390175F8A9CF" { "SourcePath" = "8:..\\samples\\rasterirq\\autocrawler.c" @@ -2271,26 +2171,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_36B4A1247BFCE001E1BAE7560E9CFEEA" - { - "SourcePath" = "8:api-ms-win-crt-math-l1-1-0.dll" - "TargetName" = "8:api-ms-win-crt-math-l1-1-0.dll" - "Tag" = "8:" - "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_379EE3C17FEC4C5EA79D07668CD05FC4" { "SourcePath" = "8:..\\samples\\memmap\\easyflash.c" @@ -2531,26 +2411,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_458189403F0009BC49371204B74F3BD3" - { - "SourcePath" = "8:api-ms-win-crt-string-l1-1-0.dll" - "TargetName" = "8:api-ms-win-crt-string-l1-1-0.dll" - "Tag" = "8:" - "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_47A877D439EE429BAB64C52FEF69EDA4" { "SourcePath" = "8:..\\samples\\memmap\\largemem.c" @@ -3151,26 +3011,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_749A2BA18335F50EB53CCE7029861FBC" - { - "SourcePath" = "8:api-ms-win-crt-runtime-l1-1-0.dll" - "TargetName" = "8:api-ms-win-crt-runtime-l1-1-0.dll" - "Tag" = "8:" - "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_749F54DFBD4D404DA9C2E2D5BA7CDDBF" { "SourcePath" = "8:..\\samples\\resources\\breakoutchars.bin" @@ -3491,26 +3331,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8667075410229C38BF63AC1CC776055E" - { - "SourcePath" = "8:api-ms-win-crt-filesystem-l1-1-0.dll" - "TargetName" = "8:api-ms-win-crt-filesystem-l1-1-0.dll" - "Tag" = "8:" - "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8827B6B07A1C4B32B08DF784E090381D" { "SourcePath" = "8:..\\samples\\memmap\\tsr.c" @@ -3671,26 +3491,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_930F11977FD2D88B1FBF87EDC1CC3F88" - { - "SourcePath" = "8:api-ms-win-crt-convert-l1-1-0.dll" - "TargetName" = "8:api-ms-win-crt-convert-l1-1-0.dll" - "Tag" = "8:" - "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_94AD9BFFA9D04AA0B6BC6EEA1D9A93ED" { "SourcePath" = "8:..\\bin\\oscar64.bat" @@ -5031,26 +4831,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DD5A4DD822437085CD584319732F2D4D" - { - "SourcePath" = "8:api-ms-win-crt-heap-l1-1-0.dll" - "TargetName" = "8:api-ms-win-crt-heap-l1-1-0.dll" - "Tag" = "8:" - "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE1058FFA9E149D1909C819592A12273" { "SourcePath" = "8:..\\samples\\particles\\fireworks_stripe.c" @@ -5331,26 +5111,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EA3C0BCB01F2639DFA2E37EC8436E5F6" - { - "SourcePath" = "8:VERSION.dll" - "TargetName" = "8:VERSION.dll" - "Tag" = "8:" - "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC599856E7AE44F4A2F51AA76A4D044C" { "SourcePath" = "8:..\\include\\opp\\bidxlist.h" @@ -5511,26 +5271,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F20F5618C7576D758C01D89C87469AF8" - { - "SourcePath" = "8:api-ms-win-crt-locale-l1-1-0.dll" - "TargetName" = "8:api-ms-win-crt-locale-l1-1-0.dll" - "Tag" = "8:" - "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F35970F9D8FA46B09F36D7E9DE5532CA" { "SourcePath" = "8:..\\include\\c64\\charwin.h" @@ -5877,7 +5617,7 @@ } "{3C67513D-01DD-4637-8A68-80971EB9504F}:_C95D3F098F884652A04D707B55B980EE" { - "DefaultLocation" = "8:[ProgramFilesFolder][ProductName]" + "DefaultLocation" = "8:[ProgramFiles64Folder][ProductName]" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -6024,15 +5764,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:oscar64" - "ProductCode" = "8:{5F8D6CAB-5D63-4D36-B670-E449BF110BEE}" - "PackageCode" = "8:{B1CB2849-F0F6-4C08-BF77-3D4911635457}" + "ProductCode" = "8:{FAD4CB49-D033-4D3A-80B8-21273E44EE3B}" + "PackageCode" = "8:{A85A2B1E-13B3-4152-AB35-806C65F1E9F1}" "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.26.234" + "ProductVersion" = "8:1.27.235" "Manufacturer" = "8:oscar64" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -6046,7 +5786,7 @@ "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" - "TargetPlatform" = "3:0" + "TargetPlatform" = "3:1" "PreBuildEvent" = "8:" "PostBuildEvent" = "8:" "RunPostBuildEvent" = "3:0" @@ -6546,7 +6286,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FB2E467BC172457785F4279BB0BFE8B6" { - "SourcePath" = "8:..\\Release\\oscar64.exe" + "SourcePath" = "8:..\\Releasex64\\oscar64.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_607E75AF0E2A4CB9908C4C39DF8FE6E4"