summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/kernel.cpp6
-rw-r--r--src/core/hle/kernel/kernel.h4
-rw-r--r--src/core/loader/loader.h12
-rw-r--r--src/core/loader/ncch.cpp10
-rw-r--r--src/core/loader/ncch.h6
-rw-r--r--src/core/system.cpp4
-rw-r--r--src/core/system.h2
7 files changed, 35 insertions, 9 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 9e1795927..0c8752670 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -124,13 +124,11 @@ void HandleTable::Clear() {
}
/// Initialize the kernel
-void Init() {
+void Init(u32 system_mode) {
ConfigMem::Init();
SharedPage::Init();
- // TODO(yuriks): The memory type parameter needs to be determined by the ExHeader field instead
- // For now it defaults to the one with a largest allocation to the app
- Kernel::MemoryInit(2); // Allocates 96MB to the application
+ Kernel::MemoryInit(system_mode);
Kernel::ResourceLimitsInit();
Kernel::ThreadingInit();
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 6b8dbecff..231cf7b75 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -286,8 +286,8 @@ private:
extern HandleTable g_handle_table;
-/// Initialize the kernel
-void Init();
+/// Initialize the kernel with the specified system mode.
+void Init(u32 system_mode);
/// Shutdown the kernel
void Shutdown();
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 9652d7ac5..5e3d46638 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -9,6 +9,7 @@
#include <memory>
#include <string>
#include <vector>
+#include <boost/optional.hpp>
#include "common/common_types.h"
#include "common/file_util.h"
@@ -96,6 +97,17 @@ public:
virtual ResultStatus Load() = 0;
/**
+ * Loads the system mode that this application needs.
+ * This function defaults to 2 (96MB allocated to the application) if it can't read the
+ * information.
+ * @returns Optional with the kernel system mode
+ */
+ virtual boost::optional<u32> LoadKernelSystemMode() {
+ // 96MB allocated to the application.
+ return 2;
+ }
+
+ /**
* Get the code (typically .code section) of the application
* @param buffer Reference to buffer to store data
* @return ResultStatus result of function
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index fadd7b16b..d4be61e0e 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -117,6 +117,14 @@ FileType AppLoader_NCCH::IdentifyType(FileUtil::IOFile& file) {
return FileType::Error;
}
+boost::optional<u32> AppLoader_NCCH::LoadKernelSystemMode() {
+ if (!is_loaded) {
+ if (LoadExeFS() != ResultStatus::Success)
+ return boost::none;
+ }
+ return exheader_header.arm11_system_local_caps.system_mode.Value();
+}
+
ResultStatus AppLoader_NCCH::LoadExec() {
using Kernel::SharedPtr;
using Kernel::CodeSet;
@@ -277,6 +285,8 @@ ResultStatus AppLoader_NCCH::LoadExeFS() {
LOG_DEBUG(Loader, "Core version: %d", core_version);
LOG_DEBUG(Loader, "Thread priority: 0x%X", priority);
LOG_DEBUG(Loader, "Resource limit category: %d", resource_limit_category);
+ LOG_DEBUG(Loader, "System Mode: %d",
+ exheader_header.arm11_system_local_caps.system_mode);
if (exheader_header.arm11_system_local_caps.program_id != ncch_header.program_id) {
LOG_ERROR(Loader, "ExHeader Program ID mismatch: the ROM is probably encrypted.");
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index f8718d063..bcf3ae6e3 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -186,6 +186,12 @@ public:
ResultStatus Load() override;
/**
+ * Loads the Exheader and returns the system mode for this application.
+ * @return Optional with the kernel system mode
+ */
+ boost::optional<u32> LoadKernelSystemMode();
+
+ /**
* Get the code (typically .code section) of the application
* @param buffer Reference to buffer to store data
* @return ResultStatus result of function
diff --git a/src/core/system.cpp b/src/core/system.cpp
index 7d54811a0..a5f763805 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -17,12 +17,12 @@ namespace System {
static bool is_powered_on{false};
-Result Init(EmuWindow* emu_window) {
+Result Init(EmuWindow* emu_window, u32 system_mode) {
Core::Init();
CoreTiming::Init();
Memory::Init();
HW::Init();
- Kernel::Init();
+ Kernel::Init(system_mode);
HLE::Init();
if (!VideoCore::Init(emu_window)) {
return Result::ErrorInitVideoCore;
diff --git a/src/core/system.h b/src/core/system.h
index 6d672b1b5..b41fc088a 100644
--- a/src/core/system.h
+++ b/src/core/system.h
@@ -15,7 +15,7 @@ enum class Result {
ErrorInitVideoCore, ///< Something went wrong during video core init
};
-Result Init(EmuWindow* emu_window);
+Result Init(EmuWindow* emu_window, u32 system_mode);
bool IsPoweredOn();
void Shutdown();
}