From 948aa2400ddc0f6de4b42acecb0dc9dd6cc8b30b Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Tue, 29 Dec 2015 13:13:34 -0800 Subject: [PATCH] Formatting all code. Too gnarly to rebase properly. --- src/xenia/base/byte_stream.cc | 4 +--- src/xenia/cpu/backend/backend.h | 4 +++- src/xenia/cpu/processor.cc | 2 +- src/xenia/cpu/xex_module.cc | 3 ++- src/xenia/emulator.cc | 3 ++- src/xenia/gpu/command_processor.h | 1 - src/xenia/kernel/kernel_module.cc | 4 ++-- src/xenia/kernel/kernel_state.cc | 8 ++------ src/xenia/kernel/util/object_table.cc | 6 ++++-- src/xenia/kernel/util/object_table.h | 6 +++--- src/xenia/kernel/xboxkrnl/xboxkrnl_io.cc | 2 +- src/xenia/kernel/xiocompletion.cc | 2 +- src/xenia/kernel/xiocompletion.h | 2 +- src/xenia/kernel/xmodule.h | 3 ++- src/xenia/kernel/xobject.h | 5 +---- src/xenia/kernel/xthread.h | 2 +- 16 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/xenia/base/byte_stream.cc b/src/xenia/base/byte_stream.cc index 03a76774c..abc49c1ba 100644 --- a/src/xenia/base/byte_stream.cc +++ b/src/xenia/base/byte_stream.cc @@ -18,9 +18,7 @@ ByteStream::ByteStream(uint8_t* data, size_t data_length, size_t offset) ByteStream::~ByteStream() = default; -void ByteStream::Advance(size_t num_bytes) { - offset_ += num_bytes; -} +void ByteStream::Advance(size_t num_bytes) { offset_ += num_bytes; } void ByteStream::Read(uint8_t* buf, size_t len) { assert_true(offset_ < data_length_); diff --git a/src/xenia/cpu/backend/backend.h b/src/xenia/cpu/backend/backend.h index 1f0c540a6..81a0d33d6 100644 --- a/src/xenia/cpu/backend/backend.h +++ b/src/xenia/cpu/backend/backend.h @@ -54,7 +54,9 @@ class Backend { Module* module, uint32_t address) = 0; virtual bool InstallBreakpoint(Breakpoint* bp) { return false; } - virtual bool InstallBreakpoint(Breakpoint* bp, Function* func) { return false; } + virtual bool InstallBreakpoint(Breakpoint* bp, Function* func) { + return false; + } virtual bool UninstallBreakpoint(Breakpoint* bp) { return false; } protected: diff --git a/src/xenia/cpu/processor.cc b/src/xenia/cpu/processor.cc index 2cde61ac0..f292ef6ce 100644 --- a/src/xenia/cpu/processor.cc +++ b/src/xenia/cpu/processor.cc @@ -461,7 +461,7 @@ bool Processor::BreakpointHit(uint32_t address, uint64_t host_pc) { auto bp = FindBreakpoint(address); if (bp) { bp->Hit(host_pc); - + xe::threading::Thread::GetCurrentThread()->Suspend(); return true; } diff --git a/src/xenia/cpu/xex_module.cc b/src/xenia/cpu/xex_module.cc index eff23b2bb..860b204b5 100644 --- a/src/xenia/cpu/xex_module.cc +++ b/src/xenia/cpu/xex_module.cc @@ -475,7 +475,8 @@ bool XexModule::SetupLibraryImports(const char* name, XELOGW("WARNING: Imported kernel function %s is unimplemented!", import_name.GetString()); } - static_cast(function)->SetupExtern(handler, kernel_export); + static_cast(function)->SetupExtern(handler, + kernel_export); } function->set_status(Symbol::Status::kDeclared); } else { diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc index d854fb525..f1d219a9f 100644 --- a/src/xenia/emulator.cc +++ b/src/xenia/emulator.cc @@ -403,7 +403,8 @@ bool Emulator::RestoreFromFile(const std::wstring& path) { } // Update the main thread. - auto threads = kernel_state_->object_table()->GetObjectsByType(); + auto threads = + kernel_state_->object_table()->GetObjectsByType(); for (auto thread : threads) { if (thread->main_thread()) { main_thread_ = thread->thread(); diff --git a/src/xenia/gpu/command_processor.h b/src/xenia/gpu/command_processor.h index 7202b65cf..19a7cbdb5 100644 --- a/src/xenia/gpu/command_processor.h +++ b/src/xenia/gpu/command_processor.h @@ -226,7 +226,6 @@ class CommandProcessor { Shader* active_pixel_shader_ = nullptr; bool paused_ = false; - }; } // namespace gpu diff --git a/src/xenia/kernel/kernel_module.cc b/src/xenia/kernel/kernel_module.cc index 3126543ce..befa08d33 100644 --- a/src/xenia/kernel/kernel_module.cc +++ b/src/xenia/kernel/kernel_module.cc @@ -111,8 +111,8 @@ uint32_t KernelModule::GetProcAddressByOrdinal(uint16_t ordinal) { handler = (cpu::GuestFunction::ExternHandler)export_entry->function_data.shim; } - static_cast(function) - ->SetupExtern(handler, export_entry); + static_cast(function)->SetupExtern(handler, + export_entry); function->set_status(cpu::Symbol::Status::kDeclared); diff --git a/src/xenia/kernel/kernel_state.cc b/src/xenia/kernel/kernel_state.cc index ba85ad8fb..b41ff2d85 100644 --- a/src/xenia/kernel/kernel_state.cc +++ b/src/xenia/kernel/kernel_state.cc @@ -139,13 +139,9 @@ void KernelState::set_process_type(uint32_t value) { pib->process_type = uint8_t(value); } -uint32_t KernelState::AllocateTLS() { - return uint32_t(tls_bitmap_.Acquire()); -} +uint32_t KernelState::AllocateTLS() { return uint32_t(tls_bitmap_.Acquire()); } -void KernelState::FreeTLS(uint32_t slot) { - tls_bitmap_.Release(slot); -} +void KernelState::FreeTLS(uint32_t slot) { tls_bitmap_.Release(slot); } void KernelState::RegisterTitleTerminateNotification(uint32_t routine, uint32_t priority) { diff --git a/src/xenia/kernel/util/object_table.cc b/src/xenia/kernel/util/object_table.cc index ddb8eec46..c71b345c1 100644 --- a/src/xenia/kernel/util/object_table.cc +++ b/src/xenia/kernel/util/object_table.cc @@ -76,14 +76,16 @@ X_STATUS ObjectTable::FindFreeSlot(uint32_t* out_slot) { bool ObjectTable::Resize(uint32_t new_capacity) { uint32_t new_size = new_capacity * sizeof(ObjectTableEntry); uint32_t old_size = table_capacity_ * sizeof(ObjectTableEntry); - auto new_table = reinterpret_cast(realloc(table_, new_size)); + auto new_table = + reinterpret_cast(realloc(table_, new_size)); if (!new_table) { return false; } // Zero out new entries. if (new_size > old_size) { - std::memset(reinterpret_cast(new_table) + old_size, 0, new_size - old_size); + std::memset(reinterpret_cast(new_table) + old_size, 0, + new_size - old_size); } last_free_entry_ = table_capacity_; diff --git a/src/xenia/kernel/util/object_table.h b/src/xenia/kernel/util/object_table.h index 3f6f4c02f..32e48f997 100644 --- a/src/xenia/kernel/util/object_table.h +++ b/src/xenia/kernel/util/object_table.h @@ -42,8 +42,8 @@ class ObjectTable { bool Save(ByteStream* stream); bool Restore(ByteStream* stream); - // Restores a XObject reference with a handle. Mainly for internal use - do not - // use. + // Restores a XObject reference with a handle. Mainly for internal use - do + // not use. X_STATUS RestoreHandle(X_HANDLE handle, XObject* object); template @@ -78,7 +78,7 @@ class ObjectTable { } std::vector> GetAllObjects(); - void PurgeAllObjects(); // Purges the object table of all guest objects + void PurgeAllObjects(); // Purges the object table of all guest objects private: typedef struct { diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_io.cc b/src/xenia/kernel/xboxkrnl/xboxkrnl_io.cc index ff3bdeebb..c7f57c308 100644 --- a/src/xenia/kernel/xboxkrnl/xboxkrnl_io.cc +++ b/src/xenia/kernel/xboxkrnl/xboxkrnl_io.cc @@ -14,8 +14,8 @@ #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h" #include "xenia/kernel/xevent.h" -#include "xenia/kernel/xiocompletion.h" #include "xenia/kernel/xfile.h" +#include "xenia/kernel/xiocompletion.h" #include "xenia/kernel/xthread.h" #include "xenia/vfs/device.h" #include "xenia/xbox.h" diff --git a/src/xenia/kernel/xiocompletion.cc b/src/xenia/kernel/xiocompletion.cc index fd525edc4..4739424ba 100644 --- a/src/xenia/kernel/xiocompletion.cc +++ b/src/xenia/kernel/xiocompletion.cc @@ -47,4 +47,4 @@ bool XIOCompletion::WaitForNotification(uint64_t wait_ticks) { } } // namespace kernel -} // namespace xe \ No newline at end of file +} // namespace xe diff --git a/src/xenia/kernel/xiocompletion.h b/src/xenia/kernel/xiocompletion.h index fd608e418..1634f2519 100644 --- a/src/xenia/kernel/xiocompletion.h +++ b/src/xenia/kernel/xiocompletion.h @@ -51,4 +51,4 @@ class XIOCompletion : public XObject { } // namespace kernel } // namespace xe -#endif // XENIA_KERNEL_XIOCOMPLETION_H_ \ No newline at end of file +#endif // XENIA_KERNEL_XIOCOMPLETION_H_ diff --git a/src/xenia/kernel/xmodule.h b/src/xenia/kernel/xmodule.h index 0e559e4f3..3b085554b 100644 --- a/src/xenia/kernel/xmodule.h +++ b/src/xenia/kernel/xmodule.h @@ -80,7 +80,8 @@ class XModule : public XObject { static uint32_t GetHandleFromHModule(void* hmodule); virtual bool Save(ByteStream* stream) override; - static object_ref Restore(KernelState* kernel_state, ByteStream* stream); + static object_ref Restore(KernelState* kernel_state, + ByteStream* stream); protected: void OnLoad(); diff --git a/src/xenia/kernel/xobject.h b/src/xenia/kernel/xobject.h index db206a516..a0ec76050 100644 --- a/src/xenia/kernel/xobject.h +++ b/src/xenia/kernel/xobject.h @@ -187,7 +187,6 @@ class XObject { static object_ref GetNativeObject(KernelState* kernel_state, void* native_ptr, int32_t as_type = -1); - protected: bool SaveObject(ByteStream* stream); bool RestoreObject(ByteStream* stream); @@ -313,9 +312,7 @@ class object_ref { void reset(T* value) noexcept { object_ref(value).swap(*this); } - inline bool operator==(const T* right) noexcept { - return value_ == right; - } + inline bool operator==(const T* right) noexcept { return value_ == right; } private: T* value_ = nullptr; diff --git a/src/xenia/kernel/xthread.h b/src/xenia/kernel/xthread.h index 7c425ed6b..f4ef2264e 100644 --- a/src/xenia/kernel/xthread.h +++ b/src/xenia/kernel/xthread.h @@ -17,8 +17,8 @@ #include "xenia/base/threading.h" #include "xenia/cpu/thread_state.h" #include "xenia/kernel/util/native_list.h" -#include "xenia/kernel/xobject.h" #include "xenia/kernel/xmutant.h" +#include "xenia/kernel/xobject.h" #include "xenia/xbox.h" namespace xe {