From 4e6b036b3c8061d9a1381287c13381390148d521 Mon Sep 17 00:00:00 2001 From: "Dr. Chat" Date: Sun, 5 Jul 2015 16:28:11 -0500 Subject: [PATCH] Formatting. --- src/xenia/cpu/xex_module.cc | 2 +- src/xenia/kernel/objects/xthread.h | 2 +- src/xenia/kernel/xam_info.cc | 5 +++-- src/xenia/kernel/xam_module.cc | 3 +-- src/xenia/kernel/xam_module.h | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/xenia/cpu/xex_module.cc b/src/xenia/cpu/xex_module.cc index e800829a0..3dbfbe143 100644 --- a/src/xenia/cpu/xex_module.cc +++ b/src/xenia/cpu/xex_module.cc @@ -303,7 +303,7 @@ bool XexModule::Unload() { memory()->LookupHeap(*exe_address)->Release(*exe_address); - assert_not_null(xex_header_); // Unloading a module that wasn't loaded? + assert_not_null(xex_header_); // Unloading a module that wasn't loaded? delete[] xex_header_; xex_header_ = nullptr; diff --git a/src/xenia/kernel/objects/xthread.h b/src/xenia/kernel/objects/xthread.h index a9914fb52..8793381e7 100644 --- a/src/xenia/kernel/objects/xthread.h +++ b/src/xenia/kernel/objects/xthread.h @@ -160,7 +160,7 @@ class XThread : public XObject { uint32_t pcr_address_; uint32_t thread_state_address_; cpu::ThreadState* thread_state_; - bool guest_thread_; // Launched into guest code? + bool guest_thread_; // Launched into guest code? bool running_; std::string name_; diff --git a/src/xenia/kernel/xam_info.cc b/src/xenia/kernel/xam_info.cc index 1042417df..6c51687f7 100644 --- a/src/xenia/kernel/xam_info.cc +++ b/src/xenia/kernel/xam_info.cc @@ -125,7 +125,8 @@ dword_result_t XamLoaderGetLaunchDataSize(lpdword_t size_ptr) { } DECLARE_XAM_EXPORT(XamLoaderGetLaunchDataSize, ExportTag::kSketchy); -dword_result_t XamLoaderGetLaunchData(lpvoid_t buffer_ptr, dword_t buffer_size) { +dword_result_t XamLoaderGetLaunchData(lpvoid_t buffer_ptr, + dword_t buffer_size) { auto xam_module = kernel_state()->GetModule("xam.xex"); auto xam = kernel::object_ref( reinterpret_cast(xam_module.release())); @@ -153,7 +154,7 @@ void XamLoaderLaunchTitle(lpstring_t raw_name, dword_t flags) { auto& loader_data = xam->loader_data(); loader_data.launch_flags = flags; - + // Translate the launch path to a full path. if (raw_name) { std::string name = xe::find_name_from_path(std::string(raw_name)); diff --git a/src/xenia/kernel/xam_module.cc b/src/xenia/kernel/xam_module.cc index 254f88d09..79199217d 100644 --- a/src/xenia/kernel/xam_module.cc +++ b/src/xenia/kernel/xam_module.cc @@ -17,8 +17,7 @@ namespace xe { namespace kernel { XamModule::XamModule(Emulator* emulator, KernelState* kernel_state) - : XKernelModule(kernel_state, "xe:\\xam.xex") - , loader_data_() { + : XKernelModule(kernel_state, "xe:\\xam.xex"), loader_data_() { RegisterExportTable(export_resolver_); // Register all exported functions. diff --git a/src/xenia/kernel/xam_module.h b/src/xenia/kernel/xam_module.h index ab8093491..2e0627ded 100644 --- a/src/xenia/kernel/xam_module.h +++ b/src/xenia/kernel/xam_module.h @@ -35,14 +35,14 @@ class XamModule : public XKernelModule { uint32_t launch_data_ptr; uint32_t launch_data_size; uint32_t launch_flags; - std::string launch_path; // Full path to next xex + std::string launch_path; // Full path to next xex }; const LoaderData& loader_data() const { return loader_data_; } LoaderData& loader_data() { return loader_data_; } private: - LoaderData loader_data_; + LoaderData loader_data_; }; } // namespace kernel