diff options
author | bunnei <ericbunnie@gmail.com> | 2014-05-02 05:03:50 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-05-02 05:03:50 +0200 |
commit | f7c6302009aa2453c37a6a7a3b1af4843f620078 (patch) | |
tree | 59d429e36b9c3acd60a779ffbf063c59b2079e32 /src/core/hle | |
parent | fixed include in coprocessor.cpp (diff) | |
download | yuzu-f7c6302009aa2453c37a6a7a3b1af4843f620078.tar yuzu-f7c6302009aa2453c37a6a7a3b1af4843f620078.tar.gz yuzu-f7c6302009aa2453c37a6a7a3b1af4843f620078.tar.bz2 yuzu-f7c6302009aa2453c37a6a7a3b1af4843f620078.tar.lz yuzu-f7c6302009aa2453c37a6a7a3b1af4843f620078.tar.xz yuzu-f7c6302009aa2453c37a6a7a3b1af4843f620078.tar.zst yuzu-f7c6302009aa2453c37a6a7a3b1af4843f620078.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/coprocessor.cpp | 16 | ||||
-rw-r--r-- | src/core/hle/coprocessor.h | 11 |
2 files changed, 20 insertions, 7 deletions
diff --git a/src/core/hle/coprocessor.cpp b/src/core/hle/coprocessor.cpp index 5b412c586..df1362176 100644 --- a/src/core/hle/coprocessor.cpp +++ b/src/core/hle/coprocessor.cpp @@ -44,8 +44,18 @@ Addr GetThreadCommandBuffer() { return CMD_BUFFER_ADDR; } -/// Call an MRC operation in HLE -u32 CallMRC(ARM11_MRC_OPERATION operation) { +/// Call an MCR (move to coprocessor from ARM register) instruction in HLE +s32 CallMCR(u32 instruction, u32 value) { + CoprocessorOperation operation = (CoprocessorOperation)((instruction >> 20) & 0xFF); + ERROR_LOG(OSHLE, "unimplemented MCR instruction=0x%08X, operation=%02X, value=%08X", + instruction, operation, value); + return -1; +} + +/// Call an MRC (move to ARM register from coprocessor) instruction in HLE +s32 CallMRC(u32 instruction) { + CoprocessorOperation operation = (CoprocessorOperation)((instruction >> 20) & 0xFF); + switch (operation) { case DATA_SYNCHRONIZATION_BARRIER: @@ -55,7 +65,7 @@ u32 CallMRC(ARM11_MRC_OPERATION operation) { return GetThreadCommandBuffer(); default: - ERROR_LOG(OSHLE, "unimplemented MRC operation 0x%02X", operation); + ERROR_LOG(OSHLE, "unimplemented MRC instruction 0x%08X", instruction); break; } return -1; diff --git a/src/core/hle/coprocessor.h b/src/core/hle/coprocessor.h index d6b9f162f..03822af13 100644 --- a/src/core/hle/coprocessor.h +++ b/src/core/hle/coprocessor.h @@ -8,13 +8,16 @@ namespace HLE { -/// MRC operations (ARM register from coprocessor), decoded as instr[20:27] -enum ARM11_MRC_OPERATION { +/// Coprocessor operations +enum CoprocessorOperation { DATA_SYNCHRONIZATION_BARRIER = 0xE0, CALL_GET_THREAD_COMMAND_BUFFER = 0xE1, }; -/// Call an MRC operation in HLE -u32 CallMRC(ARM11_MRC_OPERATION operation); +/// Call an MCR (move to coprocessor from ARM register) instruction in HLE +s32 CallMCR(u32 instruction, u32 value); + +/// Call an MRC (move to ARM register from coprocessor) instruction in HLE +s32 CallMRC(u32 instruction); } // namespace |