summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/Info.plist2
-rw-r--r--src/common/emu_window.cpp7
-rw-r--r--src/core/arm/dyncom/arm_dyncom_thumb.cpp17
-rw-r--r--src/core/core_timing.h2
-rw-r--r--src/core/hle/service/apt/apt.cpp7
-rw-r--r--src/core/hle/shared_page.cpp57
-rw-r--r--src/core/hle/shared_page.h5
7 files changed, 85 insertions, 12 deletions
diff --git a/src/citra_qt/Info.plist b/src/citra_qt/Info.plist
index 4c89e128b..7d46b39d1 100644
--- a/src/citra_qt/Info.plist
+++ b/src/citra_qt/Info.plist
@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
- <string>$(EXECUTABLE_NAME)</string>
+ <string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
<string></string>
<key>CFBundleIconFile</key>
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index 08270dd88..fd728c109 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -51,7 +51,6 @@ static bool IsWithinTouchscreen(const EmuWindow::FramebufferLayout& layout, unsi
}
std::tuple<unsigned,unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) {
-
new_x = std::max(new_x, framebuffer_layout.bottom_screen.left);
new_x = std::min(new_x, framebuffer_layout.bottom_screen.right-1);
@@ -92,9 +91,9 @@ void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
}
EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(unsigned width, unsigned height) {
-
- ASSERT(width > 0);
- ASSERT(height > 0);
+ // When hiding the widget, the function receives a size of 0
+ if (width == 0) width = 1;
+ if (height == 0) height = 1;
EmuWindow::FramebufferLayout res = { width, height, {}, {} };
diff --git a/src/core/arm/dyncom/arm_dyncom_thumb.cpp b/src/core/arm/dyncom/arm_dyncom_thumb.cpp
index 29272fd5d..3576370d1 100644
--- a/src/core/arm/dyncom/arm_dyncom_thumb.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_thumb.cpp
@@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <cstddef>
+
// We can provide simple Thumb simulation by decoding the Thumb instruction into its corresponding
// ARM instruction, and using the existing ARM simulator.
@@ -293,15 +295,22 @@ ThumbDecodeStatus TranslateThumbInstruction(u32 addr, u32 instr, u32* ainstr, u3
| (BIT(tinstr, 4) << 18); // enable bit
}
} else if ((tinstr & 0x0F00) == 0x0a00) {
- static const u32 subset[3] = {
+ static const u32 subset[4] = {
0xE6BF0F30, // REV
0xE6BF0FB0, // REV16
+ 0, // undefined
0xE6FF0FB0, // REVSH
};
- *ainstr = subset[BITS(tinstr, 6, 7)] // base
- | (BITS(tinstr, 0, 2) << 12) // Rd
- | BITS(tinstr, 3, 5); // Rm
+ size_t subset_index = BITS(tinstr, 6, 7);
+
+ if (subset_index == 2) {
+ valid = ThumbDecodeStatus::UNDEFINED;
+ } else {
+ *ainstr = subset[subset_index] // base
+ | (BITS(tinstr, 0, 2) << 12) // Rd
+ | BITS(tinstr, 3, 5); // Rm
+ }
} else {
static const u32 subset[4] = {
0xE92D0000, // STMDB sp!,{rlist}
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index 64f5b06d9..3d8a7d0c0 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -26,7 +26,7 @@
extern int g_clock_rate_arm11;
inline s64 msToCycles(int ms) {
- return g_clock_rate_arm11 / 1000 * ms;
+ return (s64)g_clock_rate_arm11 / 1000 * ms;
}
inline s64 msToCycles(float ms) {
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp
index 14d661b38..c009e6c98 100644
--- a/src/core/hle/service/apt/apt.cpp
+++ b/src/core/hle/service/apt/apt.cpp
@@ -72,6 +72,13 @@ void Initialize(Service::Interface* self) {
void GetSharedFont(Service::Interface* self) {
u32* cmd_buff = Kernel::GetCommandBuffer();
+ if (!shared_font_mem) {
+ LOG_ERROR(Service_APT, "shared font file missing - go dump it from your 3ds");
+ cmd_buff[0] = IPC::MakeHeader(0x44, 2, 2);
+ cmd_buff[1] = -1; // TODO: Find the right error code
+ return;
+ }
+
// The shared font has to be relocated to the new address before being passed to the application.
VAddr target_address = Memory::PhysicalToVirtualAddress(shared_font_mem->linear_heap_phys_address);
// The shared font dumped by 3dsutils (https://github.com/citra-emu/3dsutils) uses this address as base,
diff --git a/src/core/hle/shared_page.cpp b/src/core/hle/shared_page.cpp
index 2a1caeaac..4d9272923 100644
--- a/src/core/hle/shared_page.cpp
+++ b/src/core/hle/shared_page.cpp
@@ -2,8 +2,11 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <chrono>
#include <cstring>
+#include <ctime>
+#include "core/core_timing.h"
#include "core/hle/shared_page.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -12,6 +15,57 @@ namespace SharedPage {
SharedPageDef shared_page;
+static int update_time_event;
+
+/// Gets system time in 3DS format. The epoch is Jan 1900, and the unit is millisecond.
+static u64 GetSystemTime() {
+ auto now = std::chrono::system_clock::now();
+
+ // 3DS system does't allow user to set a time before Jan 1 2000,
+ // so we use it as an auxiliary epoch to calculate the console time.
+ std::tm epoch_tm;
+ epoch_tm.tm_sec = 0;
+ epoch_tm.tm_min = 0;
+ epoch_tm.tm_hour = 0;
+ epoch_tm.tm_mday = 1;
+ epoch_tm.tm_mon = 0;
+ epoch_tm.tm_year = 100;
+ epoch_tm.tm_isdst = 0;
+ auto epoch = std::chrono::system_clock::from_time_t(std::mktime(&epoch_tm));
+
+ // 3DS console time uses Jan 1 1900 as internal epoch,
+ // so we use the milliseconds between 1900 and 2000 as base console time
+ u64 console_time = 3155673600000ULL;
+
+ // Only when system time is after 2000, we set it as 3DS system time
+ if (now > epoch) {
+ console_time += std::chrono::duration_cast<std::chrono::milliseconds>(now - epoch).count();
+ }
+
+ // If the system time is in daylight saving, we give an additional hour to console time
+ std::time_t now_time_t = std::chrono::system_clock::to_time_t(now);
+ std::tm* now_tm = std::localtime(&now_time_t);
+ if (now_tm && now_tm->tm_isdst > 0)
+ console_time += 60 * 60 * 1000;
+
+ return console_time;
+}
+
+static void UpdateTimeCallback(u64 userdata, int cycles_late) {
+ DateTime& date_time = shared_page.date_time_counter % 2 ?
+ shared_page.date_time_0 : shared_page.date_time_1;
+
+ date_time.date_time = GetSystemTime();
+ date_time.update_tick = CoreTiming::GetTicks();
+ date_time.tick_to_second_coefficient = g_clock_rate_arm11;
+ date_time.tick_offset = 0;
+
+ ++shared_page.date_time_counter;
+
+ // system time is updated hourly
+ CoreTiming::ScheduleEvent(msToCycles(60 * 60 * 1000) - cycles_late, update_time_event);
+}
+
void Init() {
std::memset(&shared_page, 0, sizeof(shared_page));
@@ -19,6 +73,9 @@ void Init() {
// Some games wait until this value becomes 0x1, before asking running_hw
shared_page.unknown_value = 0x1;
+
+ update_time_event = CoreTiming::RegisterEvent("SharedPage::UpdateTimeCallback", UpdateTimeCallback);
+ CoreTiming::ScheduleEvent(0, update_time_event);
}
} // namespace
diff --git a/src/core/hle/shared_page.h b/src/core/hle/shared_page.h
index 35a07c685..cd9246726 100644
--- a/src/core/hle/shared_page.h
+++ b/src/core/hle/shared_page.h
@@ -25,13 +25,14 @@ namespace SharedPage {
struct DateTime {
u64_le date_time; // 0
u64_le update_tick; // 8
- INSERT_PADDING_BYTES(0x20 - 0x10); // 10
+ u64_le tick_to_second_coefficient; // 10
+ u64_le tick_offset; // 18
};
static_assert(sizeof(DateTime) == 0x20, "Datetime size is wrong");
struct SharedPageDef {
// Most of these names are taken from the 3dbrew page linked above.
- u32_le date_time_selector; // 0
+ u32_le date_time_counter; // 0
u8 running_hw; // 4
/// "Microcontroller hardware info"
u8 mcu_hw_info; // 5
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 17:03:07 +0200