mirror of
				https://git.h3cjp.net/H3cJP/citra.git
				synced 2025-10-31 06:55:03 +00:00 
			
		
		
		
	Format: Run the new clang format on everything
This commit is contained in:
		
							parent
							
								
									1e662e6e9a
								
							
						
					
					
						commit
						096be16636
					
				|  | @ -236,7 +236,7 @@ public: | |||
|     IntTy m_val; | ||||
| }; | ||||
| 
 | ||||
| } // Common
 | ||||
| } // namespace Common
 | ||||
| 
 | ||||
| typedef Common::BitSet<u8> BitSet8; | ||||
| typedef Common::BitSet<u16> BitSet16; | ||||
|  |  | |||
|  | @ -607,8 +607,9 @@ public: | |||
|         u32 cookie = arbitraryNumber; | ||||
|         Do(cookie); | ||||
|         if (mode == PointerWrap::MODE_READ && cookie != arbitraryNumber) { | ||||
|             LOG_ERROR(Common, "After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " | ||||
|                               "Aborting savestate load...", | ||||
|             LOG_ERROR(Common, | ||||
|                       "After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " | ||||
|                       "Aborting savestate load...", | ||||
|                       prevName, cookie, cookie, arbitraryNumber, arbitraryNumber); | ||||
|             SetError(ERROR_FAILURE); | ||||
|         } | ||||
|  |  | |||
|  | @ -256,4 +256,4 @@ inline void EncodeX24S8(u8 stencil, u8* bytes) { | |||
|     bytes[3] = stencil; | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Color
 | ||||
|  |  | |||
|  | @ -873,20 +873,19 @@ bool IOFile::Flush() { | |||
| } | ||||
| 
 | ||||
| bool IOFile::Resize(u64 size) { | ||||
|     if (!IsOpen() || | ||||
|         0 != | ||||
|     if (!IsOpen() || 0 != | ||||
| #ifdef _WIN32 | ||||
|             // ector: _chsize sucks, not 64-bit safe
 | ||||
|             // F|RES: changed to _chsize_s. i think it is 64-bit safe
 | ||||
|             _chsize_s(_fileno(m_file), size) | ||||
|                          // ector: _chsize sucks, not 64-bit safe
 | ||||
|                          // F|RES: changed to _chsize_s. i think it is 64-bit safe
 | ||||
|                          _chsize_s(_fileno(m_file), size) | ||||
| #else | ||||
|             // TODO: handle 64bit and growing
 | ||||
|             ftruncate(fileno(m_file), size) | ||||
|                          // TODO: handle 64bit and growing
 | ||||
|                          ftruncate(fileno(m_file), size) | ||||
| #endif | ||||
|             ) | ||||
|     ) | ||||
|         m_good = false; | ||||
| 
 | ||||
|     return m_good; | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace FileUtil
 | ||||
|  |  | |||
|  | @ -253,7 +253,7 @@ private: | |||
|     bool m_good = true; | ||||
| }; | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace FileUtil
 | ||||
| 
 | ||||
| // To deal with Windows being dumb at unicode:
 | ||||
| template <typename T> | ||||
|  |  | |||
|  | @ -132,4 +132,4 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned | |||
| 
 | ||||
|     PrintColoredMessage(entry); | ||||
| } | ||||
| } | ||||
| } // namespace Log
 | ||||
|  |  | |||
|  | @ -47,4 +47,4 @@ Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsign | |||
|                   const char* function, const char* format, va_list args); | ||||
| 
 | ||||
| void SetFilter(Filter* filter); | ||||
| } | ||||
| } // namespace Log
 | ||||
|  |  | |||
|  | @ -94,4 +94,4 @@ bool Filter::ParseFilterRule(const std::string::const_iterator begin, | |||
| bool Filter::CheckMessage(Class log_class, Level level) const { | ||||
|     return static_cast<u8>(level) >= static_cast<u8>(class_levels[static_cast<size_t>(log_class)]); | ||||
| } | ||||
| } | ||||
| } // namespace Log
 | ||||
|  |  | |||
|  | @ -50,4 +50,4 @@ public: | |||
| private: | ||||
|     std::array<Level, (size_t)Class::Count> class_levels; | ||||
| }; | ||||
| } | ||||
| } // namespace Log
 | ||||
|  |  | |||
|  | @ -129,4 +129,4 @@ void PrintColoredMessage(const Entry& entry) { | |||
| #undef ESC | ||||
| #endif | ||||
| } | ||||
| } | ||||
| } // namespace Log
 | ||||
|  |  | |||
|  | @ -28,4 +28,4 @@ void FormatLogMessage(const Entry& entry, char* out_text, size_t text_len); | |||
| void PrintMessage(const Entry& entry); | ||||
| /// Prints the same message as `PrintMessage`, but colored acoording to the severity level.
 | ||||
| void PrintColoredMessage(const Entry& entry); | ||||
| } | ||||
| } // namespace Log
 | ||||
|  |  | |||
|  | @ -40,11 +40,12 @@ void* AllocateExecutableMemory(size_t size, bool low) { | |||
|     if (low && (!map_hint)) | ||||
|         map_hint = (char*)round_page(512 * 1024 * 1024); /* 0.5 GB rounded up to the next page */ | ||||
| #endif | ||||
|     void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE | ||||
|     void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, | ||||
|                      MAP_ANON | MAP_PRIVATE | ||||
| #if defined(ARCHITECTURE_X64) && defined(MAP_32BIT) | ||||
|                                                                              | (low ? MAP_32BIT : 0) | ||||
|                          | (low ? MAP_32BIT : 0) | ||||
| #endif | ||||
|                                                                              , | ||||
|                          , | ||||
|                      -1, 0); | ||||
| #endif /* defined(_WIN32) */ | ||||
| 
 | ||||
|  |  | |||
|  | @ -46,4 +46,4 @@ inline Quaternion<float> MakeQuaternion(const Math::Vec3<float>& axis, float ang | |||
|     return {axis * std::sin(angle / 2), std::cos(angle / 2)}; | ||||
| } | ||||
| 
 | ||||
| } // namspace Math
 | ||||
| } // namespace Math
 | ||||
|  |  | |||
|  | @ -12,4 +12,4 @@ extern const char g_scm_desc[]; | |||
| extern const char g_build_name[]; | ||||
| extern const char g_build_date[]; | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Common
 | ||||
|  |  | |||
|  | @ -22,7 +22,7 @@ template <typename Func> | |||
| ScopeExitHelper<Func> ScopeExit(Func&& func) { | ||||
|     return ScopeExitHelper<Func>(std::move(func)); | ||||
| } | ||||
| } | ||||
| } // namespace detail
 | ||||
| 
 | ||||
| /**
 | ||||
|  * This macro allows you to conveniently specify a block of code that will run on scope exit. Handy | ||||
|  |  | |||
|  | @ -202,7 +202,7 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _ | |||
| #ifdef _WIN32 | ||||
|                                             ":" | ||||
| #endif | ||||
|                                             ); | ||||
|     ); | ||||
|     if (std::string::npos == dir_end) | ||||
|         dir_end = 0; | ||||
|     else | ||||
|  | @ -462,4 +462,4 @@ std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, size_t max_l | |||
| 
 | ||||
|     return std::string(buffer, len); | ||||
| } | ||||
| } | ||||
| } // namespace Common
 | ||||
|  |  | |||
|  | @ -134,4 +134,4 @@ bool ComparePartialString(InIt begin, InIt end, const char* other) { | |||
|  * NUL-terminated then the string ends at max_len characters. | ||||
|  */ | ||||
| std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, size_t max_len); | ||||
| } | ||||
| } // namespace Common
 | ||||
|  |  | |||
|  | @ -158,4 +158,4 @@ private: | |||
|     std::array<Queue, NUM_QUEUES> queues; | ||||
| }; | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Common
 | ||||
|  |  | |||
|  | @ -60,20 +60,41 @@ const Xbyak::Reg ABI_PARAM4 = Xbyak::util::r9; | |||
| 
 | ||||
| const BitSet32 ABI_ALL_CALLER_SAVED = BuildRegSet({ | ||||
|     // GPRs
 | ||||
|     Xbyak::util::rcx, Xbyak::util::rdx, Xbyak::util::r8, Xbyak::util::r9, Xbyak::util::r10, | ||||
|     Xbyak::util::rcx, | ||||
|     Xbyak::util::rdx, | ||||
|     Xbyak::util::r8, | ||||
|     Xbyak::util::r9, | ||||
|     Xbyak::util::r10, | ||||
|     Xbyak::util::r11, | ||||
|     // XMMs
 | ||||
|     Xbyak::util::xmm0, Xbyak::util::xmm1, Xbyak::util::xmm2, Xbyak::util::xmm3, Xbyak::util::xmm4, | ||||
|     Xbyak::util::xmm0, | ||||
|     Xbyak::util::xmm1, | ||||
|     Xbyak::util::xmm2, | ||||
|     Xbyak::util::xmm3, | ||||
|     Xbyak::util::xmm4, | ||||
|     Xbyak::util::xmm5, | ||||
| }); | ||||
| 
 | ||||
| const BitSet32 ABI_ALL_CALLEE_SAVED = BuildRegSet({ | ||||
|     // GPRs
 | ||||
|     Xbyak::util::rbx, Xbyak::util::rsi, Xbyak::util::rdi, Xbyak::util::rbp, Xbyak::util::r12, | ||||
|     Xbyak::util::r13, Xbyak::util::r14, Xbyak::util::r15, | ||||
|     Xbyak::util::rbx, | ||||
|     Xbyak::util::rsi, | ||||
|     Xbyak::util::rdi, | ||||
|     Xbyak::util::rbp, | ||||
|     Xbyak::util::r12, | ||||
|     Xbyak::util::r13, | ||||
|     Xbyak::util::r14, | ||||
|     Xbyak::util::r15, | ||||
|     // XMMs
 | ||||
|     Xbyak::util::xmm6, Xbyak::util::xmm7, Xbyak::util::xmm8, Xbyak::util::xmm9, Xbyak::util::xmm10, | ||||
|     Xbyak::util::xmm11, Xbyak::util::xmm12, Xbyak::util::xmm13, Xbyak::util::xmm14, | ||||
|     Xbyak::util::xmm6, | ||||
|     Xbyak::util::xmm7, | ||||
|     Xbyak::util::xmm8, | ||||
|     Xbyak::util::xmm9, | ||||
|     Xbyak::util::xmm10, | ||||
|     Xbyak::util::xmm11, | ||||
|     Xbyak::util::xmm12, | ||||
|     Xbyak::util::xmm13, | ||||
|     Xbyak::util::xmm14, | ||||
|     Xbyak::util::xmm15, | ||||
| }); | ||||
| 
 | ||||
|  | @ -90,18 +111,40 @@ const Xbyak::Reg ABI_PARAM4 = Xbyak::util::rcx; | |||
| 
 | ||||
| const BitSet32 ABI_ALL_CALLER_SAVED = BuildRegSet({ | ||||
|     // GPRs
 | ||||
|     Xbyak::util::rcx, Xbyak::util::rdx, Xbyak::util::rdi, Xbyak::util::rsi, Xbyak::util::r8, | ||||
|     Xbyak::util::r9, Xbyak::util::r10, Xbyak::util::r11, | ||||
|     Xbyak::util::rcx, | ||||
|     Xbyak::util::rdx, | ||||
|     Xbyak::util::rdi, | ||||
|     Xbyak::util::rsi, | ||||
|     Xbyak::util::r8, | ||||
|     Xbyak::util::r9, | ||||
|     Xbyak::util::r10, | ||||
|     Xbyak::util::r11, | ||||
|     // XMMs
 | ||||
|     Xbyak::util::xmm0, Xbyak::util::xmm1, Xbyak::util::xmm2, Xbyak::util::xmm3, Xbyak::util::xmm4, | ||||
|     Xbyak::util::xmm5, Xbyak::util::xmm6, Xbyak::util::xmm7, Xbyak::util::xmm8, Xbyak::util::xmm9, | ||||
|     Xbyak::util::xmm10, Xbyak::util::xmm11, Xbyak::util::xmm12, Xbyak::util::xmm13, | ||||
|     Xbyak::util::xmm14, Xbyak::util::xmm15, | ||||
|     Xbyak::util::xmm0, | ||||
|     Xbyak::util::xmm1, | ||||
|     Xbyak::util::xmm2, | ||||
|     Xbyak::util::xmm3, | ||||
|     Xbyak::util::xmm4, | ||||
|     Xbyak::util::xmm5, | ||||
|     Xbyak::util::xmm6, | ||||
|     Xbyak::util::xmm7, | ||||
|     Xbyak::util::xmm8, | ||||
|     Xbyak::util::xmm9, | ||||
|     Xbyak::util::xmm10, | ||||
|     Xbyak::util::xmm11, | ||||
|     Xbyak::util::xmm12, | ||||
|     Xbyak::util::xmm13, | ||||
|     Xbyak::util::xmm14, | ||||
|     Xbyak::util::xmm15, | ||||
| }); | ||||
| 
 | ||||
| const BitSet32 ABI_ALL_CALLEE_SAVED = BuildRegSet({ | ||||
|     // GPRs
 | ||||
|     Xbyak::util::rbx, Xbyak::util::rbp, Xbyak::util::r12, Xbyak::util::r13, Xbyak::util::r14, | ||||
|     Xbyak::util::rbx, | ||||
|     Xbyak::util::rbp, | ||||
|     Xbyak::util::r12, | ||||
|     Xbyak::util::r13, | ||||
|     Xbyak::util::r14, | ||||
|     Xbyak::util::r15, | ||||
| }); | ||||
| 
 | ||||
|  |  | |||
|  | @ -119,4 +119,4 @@ std::vector<u8> Path::AsBinary() const { | |||
|         return {}; | ||||
|     } | ||||
| } | ||||
| } | ||||
| } // namespace FileSys
 | ||||
|  |  | |||
|  | @ -91,4 +91,4 @@ bool GetCpuStepFlag(); | |||
|  * @param is_step | ||||
|  */ | ||||
| void SetCpuStepFlag(bool is_step); | ||||
| } | ||||
| } // namespace GDBStub
 | ||||
|  |  | |||
|  | @ -28,4 +28,4 @@ void Init() { | |||
|     config_mem.firm_ctr_sdk_ver = 0x0000F297; | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace ConfigMem
 | ||||
|  |  | |||
|  | @ -53,4 +53,4 @@ extern ConfigMemDef config_mem; | |||
| 
 | ||||
| void Init(); | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace ConfigMem
 | ||||
|  |  | |||
|  | @ -57,4 +57,4 @@ private: | |||
|     ~AddressArbiter() override; | ||||
| }; | ||||
| 
 | ||||
| } // namespace FileSys
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -39,4 +39,4 @@ ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() { | |||
|     return MakeResult(std::get<SharedPtr<ClientSession>>(sessions)); | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -47,4 +47,4 @@ private: | |||
|     ~ClientPort() override; | ||||
| }; | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -48,4 +48,4 @@ ResultCode ClientSession::SendSyncRequest(SharedPtr<Thread> thread) { | |||
|     return server->HandleSyncRequest(std::move(thread)); | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -45,4 +45,4 @@ private: | |||
|     ~ClientSession() override; | ||||
| }; | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -4,8 +4,8 @@ | |||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include <queue> | ||||
| #include <string> | ||||
| #include <queue> | ||||
| #include "common/common_types.h" | ||||
| #include "core/hle/kernel/kernel.h" | ||||
| #include "core/hle/kernel/wait_object.h" | ||||
|  |  | |||
|  | @ -52,4 +52,4 @@ void Event::WakeupAllWaitingThreads() { | |||
|         signaled = false; | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -49,4 +49,4 @@ private: | |||
|     ~Event() override; | ||||
| }; | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -104,4 +104,4 @@ void HandleTable::Clear() { | |||
|     next_free_slot = 0; | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -130,4 +130,4 @@ private: | |||
| 
 | ||||
| extern HandleTable g_handle_table; | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -99,9 +99,8 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) { | |||
| 
 | ||||
|     data_payload_offset = rp.GetCurrentOffset(); | ||||
| 
 | ||||
|     if (domain_message_header && | ||||
|         domain_message_header->command == | ||||
|             IPC::DomainMessageHeader::CommandType::CloseVirtualHandle) { | ||||
|     if (domain_message_header && domain_message_header->command == | ||||
|                                      IPC::DomainMessageHeader::CommandType::CloseVirtualHandle) { | ||||
|         // CloseVirtualHandle command does not have SFC* or any data
 | ||||
|         return; | ||||
|     } | ||||
|  |  | |||
|  | @ -151,4 +151,4 @@ void ResourceLimitsInit() { | |||
| 
 | ||||
| void ResourceLimitsShutdown() {} | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -123,4 +123,4 @@ void ResourceLimitsInit(); | |||
| // Destroys the resource limits
 | ||||
| void ResourceLimitsShutdown(); | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -50,4 +50,4 @@ std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> ServerPort::CreatePortP | |||
|     return std::make_tuple(std::move(server_port), std::move(client_port)); | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -72,4 +72,4 @@ private: | |||
|     ~ServerPort() override; | ||||
| }; | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -113,4 +113,4 @@ private: | |||
|  * in the command buffer. | ||||
|  */ | ||||
| ResultCode TranslateHLERequest(ServerSession* server_session); | ||||
| } | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -9,4 +9,4 @@ namespace Kernel { | |||
| 
 | ||||
| Session::Session() {} | ||||
| Session::~Session() {} | ||||
| } | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -24,4 +24,4 @@ public: | |||
|     ServerSession* server = nullptr; ///< The server endpoint of the session.
 | ||||
|     SharedPtr<ClientPort> port;      ///< The port that this session is associated with (optional).
 | ||||
| }; | ||||
| } | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -98,10 +98,10 @@ public: | |||
|     ResultCode Unmap(Process* target_process, VAddr address); | ||||
| 
 | ||||
|     /**
 | ||||
|     * Gets a pointer to the shared memory block | ||||
|     * @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 | ||||
|     */ | ||||
|      * Gets a pointer to the shared memory block | ||||
|      * @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* GetPointer(u32 offset = 0); | ||||
| 
 | ||||
|     /// Process that created this shared memory block.
 | ||||
|  | @ -129,4 +129,4 @@ private: | |||
|     ~SharedMemory() override; | ||||
| }; | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -255,8 +255,9 @@ static ResultCode CancelSynchronization(Handle thread_handle) { | |||
| /// Attempts to locks a mutex, creating it if it does not already exist
 | ||||
| static ResultCode ArbitrateLock(Handle holding_thread_handle, VAddr mutex_addr, | ||||
|                                 Handle requesting_thread_handle) { | ||||
|     LOG_TRACE(Kernel_SVC, "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, " | ||||
|                           "requesting_current_thread_handle=0x%08X", | ||||
|     LOG_TRACE(Kernel_SVC, | ||||
|               "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, " | ||||
|               "requesting_current_thread_handle=0x%08X", | ||||
|               holding_thread_handle, mutex_addr, requesting_thread_handle); | ||||
| 
 | ||||
|     SharedPtr<Thread> holding_thread = g_handle_table.Get<Thread>(holding_thread_handle); | ||||
|  | @ -546,8 +547,9 @@ static ResultCode CreateThread(Handle* out_handle, VAddr entry_point, u64 arg, V | |||
| 
 | ||||
|     Core::System::GetInstance().PrepareReschedule(); | ||||
| 
 | ||||
|     LOG_TRACE(Kernel_SVC, "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, " | ||||
|                           "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", | ||||
|     LOG_TRACE(Kernel_SVC, | ||||
|               "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, " | ||||
|               "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", | ||||
|               entry_point, name.c_str(), arg, stack_top, priority, processor_id, *out_handle); | ||||
| 
 | ||||
|     return RESULT_SUCCESS; | ||||
|  |  | |||
|  | @ -111,4 +111,4 @@ void TimersInit() { | |||
| 
 | ||||
| void TimersShutdown() {} | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -76,4 +76,4 @@ void TimersInit(); | |||
| /// Tears down the timer variables
 | ||||
| void TimersShutdown(); | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Kernel
 | ||||
|  |  | |||
|  | @ -222,7 +222,8 @@ public: | |||
|     explicit IStorageAccessor(std::vector<u8> buffer) | ||||
|         : ServiceFramework("IStorageAccessor"), buffer(std::move(buffer)) { | ||||
|         static const FunctionInfo functions[] = { | ||||
|             {0, &IStorageAccessor::GetSize, "GetSize"}, {11, &IStorageAccessor::Read, "Read"}, | ||||
|             {0, &IStorageAccessor::GetSize, "GetSize"}, | ||||
|             {11, &IStorageAccessor::Read, "Read"}, | ||||
|         }; | ||||
|         RegisterHandlers(functions); | ||||
|     } | ||||
|  |  | |||
|  | @ -51,7 +51,8 @@ private: | |||
| 
 | ||||
| APM::APM() : ServiceFramework("apm") { | ||||
|     static const FunctionInfo functions[] = { | ||||
|         {0x00000000, &APM::OpenSession, "OpenSession"}, {0x00000001, nullptr, "GetPerformanceMode"}, | ||||
|         {0x00000000, &APM::OpenSession, "OpenSession"}, | ||||
|         {0x00000001, nullptr, "GetPerformanceMode"}, | ||||
|     }; | ||||
|     RegisterHandlers(functions); | ||||
| } | ||||
|  |  | |||
|  | @ -7,8 +7,8 @@ | |||
| #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" | ||||
| #include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h" | ||||
| #include "core/hle/service/nvdrv/devices/nvmap.h" | ||||
| #include "core/hle/service/nvdrv/nvdrv.h" | ||||
| #include "core/hle/service/nvdrv/interface.h" | ||||
| #include "core/hle/service/nvdrv/nvdrv.h" | ||||
| 
 | ||||
| namespace Service { | ||||
| namespace Nvidia { | ||||
|  |  | |||
|  | @ -21,7 +21,7 @@ class ClientPort; | |||
| class ServerPort; | ||||
| class ServerSession; | ||||
| class HLERequestContext; | ||||
| } | ||||
| } // namespace Kernel
 | ||||
| 
 | ||||
| namespace Service { | ||||
| 
 | ||||
|  | @ -189,4 +189,4 @@ extern std::unordered_map<std::string, Kernel::SharedPtr<Kernel::ClientPort>> g_ | |||
| /// Adds a port to the named port table
 | ||||
| void AddNamedPort(std::string name, Kernel::SharedPtr<Kernel::ClientPort> port); | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace Service
 | ||||
|  |  | |||
|  | @ -82,4 +82,4 @@ void Init() { | |||
|     CoreTiming::ScheduleEvent(0, update_time_event); | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace SharedPage
 | ||||
|  |  | |||
|  | @ -66,4 +66,4 @@ extern SharedPageDef shared_page; | |||
| 
 | ||||
| void Init(); | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace SharedPage
 | ||||
|  |  | |||
|  | @ -91,4 +91,4 @@ void Shutdown() { | |||
|     LCD::Shutdown(); | ||||
|     LOG_DEBUG(HW, "shutdown OK"); | ||||
| } | ||||
| } | ||||
| } // namespace HW
 | ||||
|  |  | |||
|  | @ -47,4 +47,4 @@ void Init(); | |||
| /// Shutdown hardware
 | ||||
| void Shutdown(); | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace HW
 | ||||
|  |  | |||
|  | @ -64,4 +64,4 @@ void Shutdown() { | |||
|     LOG_DEBUG(HW_LCD, "shutdown OK"); | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace LCD
 | ||||
|  |  | |||
|  | @ -83,4 +83,4 @@ void Init(); | |||
| /// Shutdown hardware
 | ||||
| void Shutdown(); | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace LCD
 | ||||
|  |  | |||
|  | @ -323,8 +323,9 @@ SharedPtr<CodeSet> ElfReader::LoadInto(u32 vaddr) { | |||
|             } | ||||
| 
 | ||||
|             if (codeset_segment->size != 0) { | ||||
|                 LOG_ERROR(Loader, "ELF has more than one segment of the same type. Skipping extra " | ||||
|                                   "segment (id %i)", | ||||
|                 LOG_ERROR(Loader, | ||||
|                           "ELF has more than one segment of the same type. Skipping extra " | ||||
|                           "segment (id %i)", | ||||
|                           i); | ||||
|                 continue; | ||||
|             } | ||||
|  |  | |||
|  | @ -29,4 +29,4 @@ void MapMemoryRegion(PageTable& page_table, VAddr base, u64 size, u8* target); | |||
| void MapIoRegion(PageTable& page_table, VAddr base, u64 size, MMIORegionPointer mmio_handler); | ||||
| 
 | ||||
| void UnmapRegion(PageTable& page_table, VAddr base, u64 size); | ||||
| } | ||||
| } // namespace Memory
 | ||||
|  |  | |||
|  | @ -35,4 +35,4 @@ public: | |||
| }; | ||||
| 
 | ||||
| using MMIORegionPointer = std::shared_ptr<MMIORegion>; | ||||
| }; | ||||
| }; // namespace Memory
 | ||||
|  |  | |||
|  | @ -100,7 +100,8 @@ enum Values { | |||
| }; | ||||
| 
 | ||||
| static const std::array<const char*, NumAnalogs> mapping = {{ | ||||
|     "lstick", "rstick", | ||||
|     "lstick", | ||||
|     "rstick", | ||||
| }}; | ||||
| } // namespace NativeAnalog
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -97,4 +97,4 @@ struct CTStreamElement { | |||
| }; | ||||
| 
 | ||||
| #pragma pack() | ||||
| } | ||||
| } // namespace CiTrace
 | ||||
|  |  | |||
|  | @ -205,4 +205,4 @@ template void Recorder::RegisterWritten(u32, u8); | |||
| template void Recorder::RegisterWritten(u32, u16); | ||||
| template void Recorder::RegisterWritten(u32, u32); | ||||
| template void Recorder::RegisterWritten(u32, u64); | ||||
| } | ||||
| } // namespace CiTrace
 | ||||
|  |  | |||
|  | @ -63,9 +63,9 @@ private: | |||
|         CTStreamElement data; | ||||
| 
 | ||||
|         /**
 | ||||
|           * Extra data to store along "core" data. | ||||
|           * This is e.g. used for data used in MemoryUpdates. | ||||
|           */ | ||||
|          * Extra data to store along "core" data. | ||||
|          * This is e.g. used for data used in MemoryUpdates. | ||||
|          */ | ||||
|         std::vector<u8> extra_data; | ||||
| 
 | ||||
|         /// Optional CRC hash (e.g. for hashing memory regions)
 | ||||
|  | @ -84,4 +84,4 @@ private: | |||
|     std::unordered_map<boost::crc_32_type::value_type /*hash*/, u32 /*file_offset*/> memory_regions; | ||||
| }; | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace CiTrace
 | ||||
|  |  | |||
|  | @ -52,7 +52,8 @@ MotionEmu* GetMotionEmu() { | |||
| 
 | ||||
| std::string GenerateKeyboardParam(int key_code) { | ||||
|     Common::ParamPackage param{ | ||||
|         {"engine", "keyboard"}, {"code", std::to_string(key_code)}, | ||||
|         {"engine", "keyboard"}, | ||||
|         {"code", std::to_string(key_code)}, | ||||
|     }; | ||||
|     return param.Serialize(); | ||||
| } | ||||
|  |  | |||
|  | @ -10,7 +10,9 @@ namespace Common { | |||
| 
 | ||||
| TEST_CASE("ParamPackage", "[common]") { | ||||
|     ParamPackage original{ | ||||
|         {"abc", "xyz"}, {"def", "42"}, {"jkl", "$$:1:$2$,3"}, | ||||
|         {"abc", "xyz"}, | ||||
|         {"def", "42"}, | ||||
|         {"jkl", "$$:1:$2$,3"}, | ||||
|     }; | ||||
|     original.Set("ghi", 3.14f); | ||||
|     ParamPackage copy(original.Serialize()); | ||||
|  |  | |||
|  | @ -16,4 +16,4 @@ namespace GLShader { | |||
|  */ | ||||
| GLuint LoadProgram(const char* vertex_shader, const char* fragment_shader); | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace GLShader
 | ||||
|  |  | |||
|  | @ -49,4 +49,4 @@ static inline u32 GetMortonOffset(u32 x, u32 y, u32 bytes_per_pixel) { | |||
|     return (i + offset) * bytes_per_pixel; | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace VideoCore
 | ||||
|  |  | |||
|  | @ -39,4 +39,4 @@ void Shutdown() { | |||
|     LOG_DEBUG(Render, "shutdown OK"); | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace VideoCore
 | ||||
|  |  | |||
|  | @ -31,4 +31,4 @@ bool Init(EmuWindow* emu_window); | |||
| /// Shutdown the video core
 | ||||
| void Shutdown(); | ||||
| 
 | ||||
| } // namespace
 | ||||
| } // namespace VideoCore
 | ||||
|  |  | |||
|  | @ -26,10 +26,18 @@ const std::array<int, Settings::NativeButton::NumButtons> Config::default_button | |||
| 
 | ||||
| const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{ | ||||
|     { | ||||
|         Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_E, | ||||
|         Qt::Key_Up, | ||||
|         Qt::Key_Down, | ||||
|         Qt::Key_Left, | ||||
|         Qt::Key_Right, | ||||
|         Qt::Key_E, | ||||
|     }, | ||||
|     { | ||||
|         Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_R, | ||||
|         Qt::Key_I, | ||||
|         Qt::Key_K, | ||||
|         Qt::Key_J, | ||||
|         Qt::Key_L, | ||||
|         Qt::Key_R, | ||||
|     }, | ||||
| }}; | ||||
| 
 | ||||
|  |  | |||
|  | @ -14,7 +14,11 @@ | |||
| 
 | ||||
| const std::array<std::string, ConfigureInput::ANALOG_SUB_BUTTONS_NUM> | ||||
|     ConfigureInput::analog_sub_buttons{{ | ||||
|         "up", "down", "left", "right", "modifier", | ||||
|         "up", | ||||
|         "down", | ||||
|         "left", | ||||
|         "right", | ||||
|         "modifier", | ||||
|     }}; | ||||
| 
 | ||||
| static QString getKeyName(int key_code) { | ||||
|  | @ -36,7 +40,8 @@ static void SetAnalogButton(const Common::ParamPackage& input_param, | |||
|                             Common::ParamPackage& analog_param, const std::string& button_name) { | ||||
|     if (analog_param.Get("engine", "") != "analog_from_button") { | ||||
|         analog_param = { | ||||
|             {"engine", "analog_from_button"}, {"modifier_scale", "0.5"}, | ||||
|             {"engine", "analog_from_button"}, | ||||
|             {"modifier_scale", "0.5"}, | ||||
|         }; | ||||
|     } | ||||
|     analog_param.Set(button_name, input_param.Serialize()); | ||||
|  | @ -107,11 +112,17 @@ ConfigureInput::ConfigureInput(QWidget* parent) | |||
| 
 | ||||
|     analog_map_buttons = {{ | ||||
|         { | ||||
|             ui->buttonLStickUp, ui->buttonLStickDown, ui->buttonLStickLeft, ui->buttonLStickRight, | ||||
|             ui->buttonLStickUp, | ||||
|             ui->buttonLStickDown, | ||||
|             ui->buttonLStickLeft, | ||||
|             ui->buttonLStickRight, | ||||
|             ui->buttonLStickMod, | ||||
|         }, | ||||
|         { | ||||
|             ui->buttonRStickUp, ui->buttonRStickDown, ui->buttonRStickLeft, ui->buttonRStickRight, | ||||
|             ui->buttonRStickUp, | ||||
|             ui->buttonRStickDown, | ||||
|             ui->buttonRStickLeft, | ||||
|             ui->buttonRStickRight, | ||||
|             ui->buttonRStickMod, | ||||
|         }, | ||||
|     }}; | ||||
|  |  | |||
|  | @ -9,7 +9,18 @@ | |||
| #include "yuzu/ui_settings.h" | ||||
| 
 | ||||
| static const std::array<int, 12> days_in_month = {{ | ||||
|     31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, | ||||
|     31, | ||||
|     29, | ||||
|     31, | ||||
|     30, | ||||
|     31, | ||||
|     30, | ||||
|     31, | ||||
|     31, | ||||
|     30, | ||||
|     31, | ||||
|     30, | ||||
|     31, | ||||
| }}; | ||||
| 
 | ||||
| ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureSystem) { | ||||
|  |  | |||
|  | @ -20,7 +20,7 @@ class Mutex; | |||
| class ConditionVariable; | ||||
| class Thread; | ||||
| class Timer; | ||||
| } | ||||
| } // namespace Kernel
 | ||||
| 
 | ||||
| class WaitTreeThread; | ||||
| 
 | ||||
|  |  | |||
|  | @ -50,4 +50,4 @@ struct Values { | |||
| }; | ||||
| 
 | ||||
| extern Values values; | ||||
| } | ||||
| } // namespace UISettings
 | ||||
|  |  | |||
|  | @ -49,10 +49,18 @@ static const std::array<int, Settings::NativeButton::NumButtons> default_buttons | |||
| 
 | ||||
| static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> default_analogs{{ | ||||
|     { | ||||
|         SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT, SDL_SCANCODE_D, | ||||
|         SDL_SCANCODE_UP, | ||||
|         SDL_SCANCODE_DOWN, | ||||
|         SDL_SCANCODE_LEFT, | ||||
|         SDL_SCANCODE_RIGHT, | ||||
|         SDL_SCANCODE_D, | ||||
|     }, | ||||
|     { | ||||
|         SDL_SCANCODE_I, SDL_SCANCODE_K, SDL_SCANCODE_J, SDL_SCANCODE_L, SDL_SCANCODE_D, | ||||
|         SDL_SCANCODE_I, | ||||
|         SDL_SCANCODE_K, | ||||
|         SDL_SCANCODE_J, | ||||
|         SDL_SCANCODE_L, | ||||
|         SDL_SCANCODE_D, | ||||
|     }, | ||||
| }}; | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue