From 8124b61d2b42cd1a1ba80f7a791c6121611df13c Mon Sep 17 00:00:00 2001 From: Seth Polsley Date: Tue, 14 Jul 2020 16:48:06 -0500 Subject: [PATCH] Enable optimization by fixing inits and access bounds --- BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj | 1 + BasiliskII/src/bincue.cpp | 2 +- BasiliskII/src/cdrom.cpp | 7 +++++++ .../MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj index a1097e6c..4bb52379 100644 --- a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj +++ b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj @@ -1064,6 +1064,7 @@ GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_OPTIMIZATION_LEVEL = 3; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", ENABLE_MACOSX_ETHERHELPER, diff --git a/BasiliskII/src/bincue.cpp b/BasiliskII/src/bincue.cpp index 83232c9e..fe654bcc 100644 --- a/BasiliskII/src/bincue.cpp +++ b/BasiliskII/src/bincue.cpp @@ -681,7 +681,7 @@ bool GetPosition_bincue(void *fh, uint8 *pos) *pos++ = rel.m; *pos++ = rel.s; *pos++ = rel.f; - *pos++ = 0; +// *pos++ = 0; // D(bug("CDROM position %02d:%02d:%02d track %02d\n", abs.m, abs.s, abs.f, trackno)); return true; } diff --git a/BasiliskII/src/cdrom.cpp b/BasiliskII/src/cdrom.cpp index 89638322..36250297 100644 --- a/BasiliskII/src/cdrom.cpp +++ b/BasiliskII/src/cdrom.cpp @@ -234,6 +234,11 @@ static void read_toc(cdrom_drive_info &info) } #endif + // Default start + info.start_at[0] = 0; + info.start_at[1] = 0; + info.start_at[2] = 0; + // Find lead-out track info.lead_out[0] = 0; info.lead_out[1] = 0; @@ -410,6 +415,8 @@ int16 CDROMOpen(uint32 pb, uint32 dce) info->block_size = 512; info->twok_offset = -1; info->play_mode = 0x09; + info->play_order = 0; + info->repeat = 0; info->power_mode = 0; // Allocate drive status record diff --git a/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj b/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj index a686e0fb..086523f9 100755 --- a/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj +++ b/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj @@ -1286,7 +1286,7 @@ GCC_ENABLE_PASCAL_STRINGS = NO; GCC_ENABLE_TRIGRAPHS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = (