mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +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
					
				
					 9 changed files with 66 additions and 13 deletions
				
			
		|  | @ -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) { | ||||
|     ModuleDef module = {name, num_functions, func_table}; | ||||
|     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); | ||||
| 
 | ||||
| Addr CallGetThreadCommandBuffer(); | ||||
| 
 | ||||
| void Init(); | ||||
| 
 | ||||
| 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…
	
	Add table
		Add a link
		
	
		Reference in a new issue