mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 13:50:03 +00:00 
			
		
		
		
	Kernel: Added support for shared memory objects.
SharedMemory: Added optional name field for tracking known objects.
This commit is contained in:
		
							parent
							
								
									3013015a0c
								
							
						
					
					
						commit
						e547128185
					
				
					 5 changed files with 142 additions and 0 deletions
				
			
		
							
								
								
									
										94
									
								
								src/core/hle/kernel/shared_memory.cpp
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										94
									
								
								src/core/hle/kernel/shared_memory.cpp
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,94 @@ | |||
| // Copyright 2014 Citra Emulator Project
 | ||||
| // Licensed under GPLv2
 | ||||
| // Refer to the license.txt file included.  
 | ||||
| 
 | ||||
| #include "common/common.h" | ||||
| 
 | ||||
| #include "core/mem_map.h" | ||||
| #include "core/hle/kernel/shared_memory.h" | ||||
| 
 | ||||
| namespace Kernel { | ||||
| 
 | ||||
| class SharedMemory : public Object { | ||||
| public: | ||||
|     const char* GetTypeName() const { return "SharedMemory"; } | ||||
| 
 | ||||
|     static Kernel::HandleType GetStaticHandleType() {  return Kernel::HandleType::SharedMemory; } | ||||
|     Kernel::HandleType GetHandleType() const { return Kernel::HandleType::SharedMemory; } | ||||
| 
 | ||||
|     /**
 | ||||
|      * Wait for kernel object to synchronize | ||||
|      * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||||
|      * @return Result of operation, 0 on success, otherwise error code | ||||
|      */ | ||||
|     Result WaitSynchronization(bool* wait) { | ||||
|         // TODO(bunnei): ImplementMe
 | ||||
|         ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); | ||||
|         return 0; | ||||
|     } | ||||
| 
 | ||||
|     u32 base_address;       ///< Address of shared memory block in RAM
 | ||||
|     u32 permissions;        ///< Permissions of shared memory block (specified by SVC field)
 | ||||
|     u32 other_permissions;  ///< Other permissions of shared memory block (specified by SVC field)
 | ||||
|     std::string name;       ///< Name of shared memory object (optional)
 | ||||
| }; | ||||
| 
 | ||||
| ////////////////////////////////////////////////////////////////////////////////////////////////////
 | ||||
| 
 | ||||
| /**
 | ||||
|  * Creates a shared memory object | ||||
|  * @param handle Handle of newly created shared memory object | ||||
|  * @param name Name of shared memory object | ||||
|  * @return Pointer to newly created shared memory object | ||||
|  */ | ||||
| SharedMemory* CreateSharedMemory(Handle& handle, const std::string& name) { | ||||
|     SharedMemory* shared_memory = new SharedMemory; | ||||
|     handle = Kernel::g_object_pool.Create(shared_memory); | ||||
|     shared_memory->name = name; | ||||
|     return shared_memory; | ||||
| } | ||||
| 
 | ||||
| /**
 | ||||
|  * Creates a shared memory object | ||||
|  * @param name Optional name of shared memory object | ||||
|  * @return Handle of newly created shared memory object | ||||
|  */ | ||||
| Handle CreateSharedMemory(const std::string& name) { | ||||
|     Handle handle; | ||||
|     CreateSharedMemory(handle, name); | ||||
|     return handle; | ||||
| } | ||||
| 
 | ||||
| /**
 | ||||
|  * Maps a shared memory block to an address in system memory | ||||
|  * @param handle Shared memory block handle | ||||
|  * @param address Address in system memory to map shared memory block to | ||||
|  * @param permissions Memory block map permissions (specified by SVC field) | ||||
|  * @param other_permissions Memory block map other permissions (specified by SVC field) | ||||
|  * @return Result of operation, 0 on success, otherwise error code | ||||
|  */ | ||||
| Result MapSharedMemory(u32 handle, u32 address, u32 permissions, u32 other_permissions) { | ||||
|     SharedMemory* shared_memory = Kernel::g_object_pool.GetFast<SharedMemory>(handle); | ||||
|     shared_memory->base_address = address; | ||||
|     shared_memory->permissions = permissions; | ||||
|     shared_memory->other_permissions = other_permissions; | ||||
|     return 0; | ||||
| } | ||||
| 
 | ||||
| /**
 | ||||
|  * Gets a pointer to the shared memory block | ||||
|  * @param handle Shared memory block handle | ||||
|  * @param offset Offset from the start of the shared memory block to get pointer | ||||
|  * @return Pointer to the shared memory block from the specified offset | ||||
|  */ | ||||
| u8* GetSharedMemoryPointer(Handle handle, u32 offset) { | ||||
|     SharedMemory* shared_memory = Kernel::g_object_pool.GetFast<SharedMemory>(handle); | ||||
|     _assert_msg_(KERNEL, (shared_memory != nullptr), "handle 0x%08X is not valid!", handle); | ||||
|     if (0 != shared_memory->base_address) | ||||
|         return Memory::GetPointer(shared_memory->base_address + offset); | ||||
| 
 | ||||
|     ERROR_LOG(KERNEL, "memory block handle=0x%08X not mapped!", handle); | ||||
|     return nullptr; | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
							
								
								
									
										38
									
								
								src/core/hle/kernel/shared_memory.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										38
									
								
								src/core/hle/kernel/shared_memory.h
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,38 @@ | |||
| // Copyright 2014 Citra Emulator Project
 | ||||
| // Licensed under GPLv2
 | ||||
| // Refer to the license.txt file included.  
 | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include "common/common_types.h" | ||||
| 
 | ||||
| #include "core/hle/kernel/kernel.h" | ||||
| 
 | ||||
| namespace Kernel { | ||||
| 
 | ||||
| /**
 | ||||
|  * Creates a shared memory object | ||||
|  * @param name Optional name of shared memory object | ||||
|  * @return Handle of newly created shared memory object | ||||
|  */ | ||||
| Handle CreateSharedMemory(const std::string& name="Unknown"); | ||||
| 
 | ||||
| /**
 | ||||
|  * Maps a shared memory block to an address in system memory | ||||
|  * @param handle Shared memory block handle | ||||
|  * @param address Address in system memory to map shared memory block to | ||||
|  * @param permissions Memory block map permissions (specified by SVC field) | ||||
|  * @param other_permissions Memory block map other permissions (specified by SVC field) | ||||
|  * @return Result of operation, 0 on success, otherwise error code | ||||
|  */ | ||||
| Result MapSharedMemory(u32 handle, u32 address, u32 permissions, u32 other_permissions); | ||||
| 
 | ||||
| /**
 | ||||
|  * Gets a pointer to the shared memory block | ||||
|  * @param handle Shared memory block handle | ||||
|  * @param offset Offset from the start of the shared memory block to get pointer | ||||
|  * @return Pointer to the shared memory block from the specified offset | ||||
|  */ | ||||
| u8* GetSharedMemoryPointer(Handle handle, u32 offset); | ||||
| 
 | ||||
| } // namespace
 | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue