OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-02 10:10:04 +00:00
Code Issues Projects Releases Wiki Activity

Minecraft_THREADPROCESSORID_2

Browse Source
This commit is contained in:
citra 2017-10-18 18:39:35 +01:00
parent 219bf6d2c2
commit a34f43e3ea
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/citra_qt/debugger/wait_tree.cpp
View File

@ -213,6 +213,9 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThread::GetChildren() const {
case ThreadProcessorId::THREADPROCESSORID_1: case ThreadProcessorId::THREADPROCESSORID_1:
processor = tr("SysCore"); processor = tr("SysCore");
break; break;
case ThreadProcessorId::THREADPROCESSORID_2:
processor = tr("SysCore2");
break;
default: default:
processor = tr("Unknown processor %1").arg(thread.processor_id); processor = tr("Unknown processor %1").arg(thread.processor_id);
break; break;

1
src/core/hle/kernel/thread.h
View File

@ -27,6 +27,7 @@ enum ThreadProcessorId : s32 {
THREADPROCESSORID_ALL = -1, ///< Run thread on either core THREADPROCESSORID_ALL = -1, ///< Run thread on either core
THREADPROCESSORID_0 = 0, ///< Run thread on core 0 (AppCore) THREADPROCESSORID_0 = 0, ///< Run thread on core 0 (AppCore)
THREADPROCESSORID_1 = 1, ///< Run thread on core 1 (SysCore) THREADPROCESSORID_1 = 1, ///< Run thread on core 1 (SysCore)
THREADPROCESSORID_2 = 2, ///< Run thread on core 2 (SysCore)
THREADPROCESSORID_MAX = 2, ///< Processor ID must be less than this THREADPROCESSORID_MAX = 2, ///< Processor ID must be less than this
}; };

32
src/core/hle/svc.cpp
View File

@ -705,6 +705,7 @@ static ResultCode CreateThread(Kernel::Handle* out_handle, u32 priority, u32 ent
case THREADPROCESSORID_DEFAULT: case THREADPROCESSORID_DEFAULT:
case THREADPROCESSORID_0: case THREADPROCESSORID_0:
case THREADPROCESSORID_1: case THREADPROCESSORID_1:
case THREADPROCESSORID_2:
break; break;
default: default:
// TODO(bunnei): Implement support for other processor IDs // TODO(bunnei): Implement support for other processor IDs
@ -714,19 +715,40 @@ static ResultCode CreateThread(Kernel::Handle* out_handle, u32 priority, u32 ent
if (processor_id == THREADPROCESSORID_ALL) { if (processor_id == THREADPROCESSORID_ALL) {
LOG_INFO(Kernel_SVC, LOG_INFO(Kernel_SVC,
"Newly created thread is allowed to be run in any Core, unimplemented."); "Newly created thread is allowed to be run in any Core, unimplemented.");
}
if (processor_id == THREADPROCESSORID_DEFAULT &&
Kernel::g_current_process->ideal_processor == THREADPROCESSORID_0) {
LOG_WARNING(Kernel_SVC,
"Newly created thread is allowed to be run in the AppCore, unimplemented.");
}
if (processor_id == THREADPROCESSORID_0) {
LOG_ERROR(Kernel_SVC,
"Newly created thread must run in the AppCore, unimplemented.");
} }
if (processor_id == THREADPROCESSORID_DEFAULT && if (processor_id == THREADPROCESSORID_DEFAULT &&
Kernel::g_current_process->ideal_processor == THREADPROCESSORID_1) { Kernel::g_current_process->ideal_processor == THREADPROCESSORID_1) {
LOG_WARNING( LOG_WARNING(Kernel_SVC,
Kernel_SVC, "Newly created thread is allowed to be run in the SysCore (Core1), unimplemented.");
"Newly created thread is allowed to be run in the SysCore (Core1), unimplemented.");
} }
if (processor_id == THREADPROCESSORID_1) { if (processor_id == THREADPROCESSORID_1) {
LOG_ERROR(Kernel_SVC, LOG_ERROR(Kernel_SVC,
"Newly created thread must run in the SysCore (Core1), unimplemented."); "Newly created thread must run in the SysCore (Core1), unimplemented.");
}
if (processor_id == THREADPROCESSORID_DEFAULT &&
Kernel::g_current_process->ideal_processor == THREADPROCESSORID_2) {
LOG_WARNING(Kernel_SVC,
"Newly created thread is allowed to be run in the SysCore (Core2), unimplemented.");
}
if (processor_id == THREADPROCESSORID_2) {
LOG_ERROR(Kernel_SVC,
"Newly created thread must run in the SysCore (Core2), unimplemented.");
} }
CASCADE_RESULT(SharedPtr<Thread> thread, CASCADE_RESULT(SharedPtr<Thread> thread,