mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 13:50:03 +00:00 
			
		
		
		
	Merge master into threading to add support for VFP
This commit is contained in:
		
						commit
						0b1ba2f37a
					
				
					 33 changed files with 14281 additions and 189 deletions
				
			
		|  | @ -9,42 +9,26 @@ | |||
| 
 | ||||
| namespace HLE { | ||||
| 
 | ||||
| /// Data synchronization barrier
 | ||||
| u32 DataSynchronizationBarrier() { | ||||
|     return 0; | ||||
| } | ||||
| 
 | ||||
| /// Returns the coprocessor (in this case, syscore) command buffer pointer
 | ||||
| Addr GetThreadCommandBuffer() { | ||||
|     // Called on insruction: mrc p15, 0, r0, c13, c0, 3
 | ||||
|     return Memory::KERNEL_MEMORY_VADDR; | ||||
| } | ||||
| 
 | ||||
| /// 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 0; | ||||
| } | ||||
| 
 | ||||
| /// 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: | ||||
|         return DataSynchronizationBarrier(); | ||||
| 
 | ||||
|     case CALL_GET_THREAD_COMMAND_BUFFER: | ||||
|         return GetThreadCommandBuffer(); | ||||
| 
 | ||||
|     default: | ||||
|         ERROR_LOG(OSHLE, "unimplemented MRC instruction 0x%08X", instruction); | ||||
|         //DEBUG_LOG(OSHLE, "unknown MRC call 0x%08X", instruction);
 | ||||
|         break; | ||||
|     } | ||||
|     return 0; | ||||
|     return -1; | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
|  |  | |||
|  | @ -14,9 +14,6 @@ enum CoprocessorOperation { | |||
|     CALL_GET_THREAD_COMMAND_BUFFER  = 0xE1, | ||||
| }; | ||||
| 
 | ||||
| /// 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); | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue