From e7b3afbc7ab1d88e824fbe8f2ebe5a489c9ab9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 13 Jun 2021 10:28:27 +0200 Subject: [PATCH] Minor cleanups --- UI/DevScreens.cpp | 4 ---- unittest/TestThreadManager.cpp | 2 +- unittest/UnitTest.cpp | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 29baf2f2e9..735ae47928 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -472,13 +472,9 @@ void SystemInfoScreen::CreateViews() { deviceSpecs->Add(new ItemHeader(si->T("CPU Information"))); deviceSpecs->Add(new InfoItem(si->T("CPU Name", "Name"), cpu_info.brand_string)); -#if PPSSPP_ARCH(ARM) || PPSSPP_ARCH(ARM64) || PPSSPP_ARCH(MIPS) || PPSSPP_ARCH(MIPS64) - deviceSpecs->Add(new InfoItem(si->T("Cores"), StringFromInt(cpu_info.num_cores))); -#else int totalThreads = cpu_info.num_cores * cpu_info.logical_cpu_count; std::string cores = StringFromFormat(si->T("%d (%d per core, %d cores)"), totalThreads, cpu_info.logical_cpu_count, cpu_info.num_cores); deviceSpecs->Add(new InfoItem(si->T("Threads"), cores)); -#endif #if PPSSPP_PLATFORM(IOS) deviceSpecs->Add(new InfoItem(si->T("JIT available"), System_GetPropertyBool(SYSPROP_CAN_JIT) ? di->T("Yes") : di->T("No"))); #endif diff --git a/unittest/TestThreadManager.cpp b/unittest/TestThreadManager.cpp index 803007e08e..c6e96559b4 100644 --- a/unittest/TestThreadManager.cpp +++ b/unittest/TestThreadManager.cpp @@ -62,7 +62,7 @@ bool TestThreadManager() { } ThreadManager manager; - manager.Init(8, 8); + manager.Init(8, 1); Promise *object(Promise::Spawn(&manager, &ResultProducer, TaskType::IO_BLOCKING)); diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp index ddb5db80f9..7c399f0f9c 100644 --- a/unittest/UnitTest.cpp +++ b/unittest/UnitTest.cpp @@ -77,8 +77,9 @@ bool System_GetPropertyBool(SystemProperty prop) { switch (prop) { case SYSPROP_CAN_JIT: return true; + default: + return false; } - return false; } #if PPSSPP_PLATFORM(ANDROID)