mirror of
https://github.com/citra-emu/citra.git
synced 2024-12-29 01:10:05 +00:00
moved HLE::MRC to its own module, added support for catching data synchronization barrier command
This commit is contained in:
parent
6151e26958
commit
cb0663de51
src/core
@ -18,6 +18,7 @@ set(SRCS core.cpp
|
|||||||
file_sys/directory_file_system.cpp
|
file_sys/directory_file_system.cpp
|
||||||
file_sys/meta_file_system.cpp
|
file_sys/meta_file_system.cpp
|
||||||
hle/hle.cpp
|
hle/hle.cpp
|
||||||
|
hle/mrc.cpp
|
||||||
hle/syscall.cpp
|
hle/syscall.cpp
|
||||||
hle/service/apt.cpp
|
hle/service/apt.cpp
|
||||||
hle/service/gsp.cpp
|
hle/service/gsp.cpp
|
||||||
|
@ -4467,7 +4467,7 @@ ARMul_Emulate26 (ARMul_State * state)
|
|||||||
}
|
}
|
||||||
/* Drop through. */
|
/* Drop through. */
|
||||||
|
|
||||||
case 0xe0:
|
//case 0xe0:
|
||||||
case 0xe4:
|
case 0xe4:
|
||||||
case 0xe6:
|
case 0xe6:
|
||||||
case 0xe8:
|
case 0xe8:
|
||||||
@ -4502,6 +4502,7 @@ ARMul_Emulate26 (ARMul_State * state)
|
|||||||
|
|
||||||
|
|
||||||
/* Co-Processor Register Transfers (MRC) and Data Ops. */
|
/* Co-Processor Register Transfers (MRC) and Data Ops. */
|
||||||
|
case 0xe0:
|
||||||
case 0xe1:
|
case 0xe1:
|
||||||
case 0xe3:
|
case 0xe3:
|
||||||
case 0xe5:
|
case 0xe5:
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
//#include "ansidecl.h"
|
//#include "ansidecl.h"
|
||||||
#include "skyeye_defs.h"
|
#include "skyeye_defs.h"
|
||||||
#include "core/hle/hle.h"
|
#include "core/hle/mrc.h"
|
||||||
#include "core/arm/disassembler/arm_disasm.h"
|
#include "core/arm/disassembler/arm_disasm.h"
|
||||||
|
|
||||||
unsigned xscale_cp15_cp_access_allowed (ARMul_State * state, unsigned reg,
|
unsigned xscale_cp15_cp_access_allowed (ARMul_State * state, unsigned reg,
|
||||||
@ -738,7 +738,8 @@ ARMword
|
|||||||
ARMul_MRC (ARMul_State * state, ARMword instr)
|
ARMul_MRC (ARMul_State * state, ARMword instr)
|
||||||
{
|
{
|
||||||
unsigned cpab;
|
unsigned cpab;
|
||||||
ARMword result = HLE::CallGetThreadCommandBuffer();
|
|
||||||
|
ARMword result = HLE::CallMRC((HLE::ARM11_MRC_OPERATION)BITS(20, 27));
|
||||||
|
|
||||||
////printf("SKYEYE ARMul_MRC, CPnum is %x, instr %x\n",CPNum, instr);
|
////printf("SKYEYE ARMul_MRC, CPnum is %x, instr %x\n",CPNum, instr);
|
||||||
//if (!CP_ACCESS_ALLOWED (state, CPNum)) {
|
//if (!CP_ACCESS_ALLOWED (state, CPNum)) {
|
||||||
|
@ -153,6 +153,7 @@
|
|||||||
<ClCompile Include="file_sys\directory_file_system.cpp" />
|
<ClCompile Include="file_sys\directory_file_system.cpp" />
|
||||||
<ClCompile Include="file_sys\meta_file_system.cpp" />
|
<ClCompile Include="file_sys\meta_file_system.cpp" />
|
||||||
<ClCompile Include="hle\hle.cpp" />
|
<ClCompile Include="hle\hle.cpp" />
|
||||||
|
<ClCompile Include="hle\mrc.cpp" />
|
||||||
<ClCompile Include="hle\service\apt.cpp" />
|
<ClCompile Include="hle\service\apt.cpp" />
|
||||||
<ClCompile Include="hle\service\gsp.cpp" />
|
<ClCompile Include="hle\service\gsp.cpp" />
|
||||||
<ClCompile Include="hle\service\hid.cpp" />
|
<ClCompile Include="hle\service\hid.cpp" />
|
||||||
@ -192,6 +193,7 @@
|
|||||||
<ClInclude Include="file_sys\meta_file_system.h" />
|
<ClInclude Include="file_sys\meta_file_system.h" />
|
||||||
<ClInclude Include="hle\function_wrappers.h" />
|
<ClInclude Include="hle\function_wrappers.h" />
|
||||||
<ClInclude Include="hle\hle.h" />
|
<ClInclude Include="hle\hle.h" />
|
||||||
|
<ClInclude Include="hle\mrc.h" />
|
||||||
<ClInclude Include="hle\service\apt.h" />
|
<ClInclude Include="hle\service\apt.h" />
|
||||||
<ClInclude Include="hle\service\gsp.h" />
|
<ClInclude Include="hle\service\gsp.h" />
|
||||||
<ClInclude Include="hle\service\hid.h" />
|
<ClInclude Include="hle\service\hid.h" />
|
||||||
|
@ -105,6 +105,9 @@
|
|||||||
<ClCompile Include="hw\lcd.cpp">
|
<ClCompile Include="hw\lcd.cpp">
|
||||||
<Filter>hw</Filter>
|
<Filter>hw</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="hle\mrc.cpp">
|
||||||
|
<Filter>hle</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="arm\disassembler\arm_disasm.h">
|
<ClInclude Include="arm\disassembler\arm_disasm.h">
|
||||||
@ -205,6 +208,9 @@
|
|||||||
<ClInclude Include="hw\lcd.h">
|
<ClInclude Include="hw\lcd.h">
|
||||||
<Filter>hw</Filter>
|
<Filter>hw</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="hle\mrc.h">
|
||||||
|
<Filter>hle</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Text Include="CMakeLists.txt" />
|
<Text Include="CMakeLists.txt" />
|
||||||
|
@ -80,14 +80,6 @@ void CallSyscall(u32 opcode) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns the coprocessor (in this case, syscore) command buffer pointer
|
|
||||||
Addr CallGetThreadCommandBuffer() {
|
|
||||||
// Called on insruction: mrc p15, 0, r0, c13, c0, 3
|
|
||||||
// Returns an address in OSHLE memory for the CPU to read/write to
|
|
||||||
RETURN(CMD_BUFFER_ADDR);
|
|
||||||
return CMD_BUFFER_ADDR;
|
|
||||||
}
|
|
||||||
|
|
||||||
void RegisterModule(std::string name, int num_functions, const FunctionDef* func_table) {
|
void RegisterModule(std::string name, int num_functions, const FunctionDef* func_table) {
|
||||||
ModuleDef module = {name, num_functions, func_table};
|
ModuleDef module = {name, num_functions, func_table};
|
||||||
g_module_db.push_back(module);
|
g_module_db.push_back(module);
|
||||||
|
@ -57,8 +57,6 @@ void RegisterModule(std::string name, int num_functions, const FunctionDef *func
|
|||||||
|
|
||||||
void CallSyscall(u32 opcode);
|
void CallSyscall(u32 opcode);
|
||||||
|
|
||||||
Addr CallGetThreadCommandBuffer();
|
|
||||||
|
|
||||||
void Init();
|
void Init();
|
||||||
|
|
||||||
void Shutdown();
|
void Shutdown();
|
||||||
|
32
src/core/hle/mrc.cpp
Normal file
32
src/core/hle/mrc.cpp
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
#include "mrc.h"
|
||||||
|
#include "hle.h"
|
||||||
|
|
||||||
|
namespace HLE {
|
||||||
|
|
||||||
|
/// Returns the coprocessor (in this case, syscore) command buffer pointer
|
||||||
|
Addr CallGetThreadCommandBuffer() {
|
||||||
|
// Called on insruction: mrc p15, 0, r0, c13, c0, 3
|
||||||
|
// Returns an address in OSHLE memory for the CPU to read/write to
|
||||||
|
RETURN(CMD_BUFFER_ADDR);
|
||||||
|
return CMD_BUFFER_ADDR;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Call an MRC operation in HLE
|
||||||
|
u32 CallMRC(ARM11_MRC_OPERATION operation) {
|
||||||
|
switch (operation) {
|
||||||
|
|
||||||
|
case DATA_SYNCHRONIZATION_BARRIER:
|
||||||
|
ERROR_LOG(OSHLE, "Unimplemented MRC operation DATA_SYNCHRONIZATION_BARRIER");
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CALL_GET_THREAD_COMMAND_BUFFER:
|
||||||
|
return CallGetThreadCommandBuffer();
|
||||||
|
|
||||||
|
default:
|
||||||
|
ERROR_LOG(OSHLE, "Unimplemented MRC operation 0x%02X", operation);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
20
src/core/hle/mrc.h
Normal file
20
src/core/hle/mrc.h
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
// Copyright 2014 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "common/common_types.h"
|
||||||
|
|
||||||
|
namespace HLE {
|
||||||
|
|
||||||
|
/// MRC operations (ARM register from coprocessor), decoded as instr[20:27]
|
||||||
|
enum ARM11_MRC_OPERATION {
|
||||||
|
DATA_SYNCHRONIZATION_BARRIER = 0xE0,
|
||||||
|
CALL_GET_THREAD_COMMAND_BUFFER = 0xE1,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// Call an MRC operation in HLE
|
||||||
|
u32 CallMRC(ARM11_MRC_OPERATION operation);
|
||||||
|
|
||||||
|
} // namespace
|
Loading…
Reference in New Issue
Block a user