From dab5b00be7a8338596cdb94acc9d5fd83c0fbf95 Mon Sep 17 00:00:00 2001 From: Dirk Hoffmann Date: Fri, 20 Sep 2024 13:47:26 +0300 Subject: [PATCH] This is vAmiga v3.0b2 --- Emulator/Components/CIA/CIA.cpp | 9 ++++++--- Emulator/config.h | 4 ++-- vAmiga.xcodeproj/project.pbxproj | 8 ++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Emulator/Components/CIA/CIA.cpp b/Emulator/Components/CIA/CIA.cpp index 404e2b1ce..1990e16ac 100755 --- a/Emulator/Components/CIA/CIA.cpp +++ b/Emulator/Components/CIA/CIA.cpp @@ -182,9 +182,12 @@ CIA::cacheStats(CIAStats &result) const { { SYNCHRONIZED - result.idleSince = idleSince(); - result.idleTotal = idleTotal() + result.idleSince; - result.idlePercentage = clock ? (double)result.idleTotal / (double)clock : 100.0; + auto idle = idleSince(); + auto total = idleTotal() + idle; + + result.idleSince = idle; + result.idleTotal = total; + result.idlePercentage = clock ? double(total) / double(clock + idle) : 100.0; } } diff --git a/Emulator/config.h b/Emulator/config.h index 3904f0db9..35d792e76 100644 --- a/Emulator/config.h +++ b/Emulator/config.h @@ -17,13 +17,13 @@ #define VER_MAJOR 3 #define VER_MINOR 0 #define VER_SUBMINOR 0 -#define VER_BETA 1 +#define VER_BETA 2 // Snapshot version number #define SNP_MAJOR 3 #define SNP_MINOR 0 #define SNP_SUBMINOR 0 -#define SNP_BETA 1 +#define SNP_BETA 2 // Uncomment this setting in a release build // #define RELEASEBUILD diff --git a/vAmiga.xcodeproj/project.pbxproj b/vAmiga.xcodeproj/project.pbxproj index 3931596d3..a45c720b7 100644 --- a/vAmiga.xcodeproj/project.pbxproj +++ b/vAmiga.xcodeproj/project.pbxproj @@ -2868,7 +2868,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 240915; + CURRENT_PROJECT_VERSION = 240920; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_APP_SANDBOX = NO; @@ -2889,7 +2889,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 3.0b1; + MARKETING_VERSION = 3.0b2; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20"; PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2919,7 +2919,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 240915; + CURRENT_PROJECT_VERSION = 240920; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_APP_SANDBOX = NO; @@ -2938,7 +2938,7 @@ ); LLVM_LTO = YES_THIN; MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 3.0b1; + MARKETING_VERSION = 3.0b2; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20"; PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga; PRODUCT_NAME = "$(TARGET_NAME)";