Formatting all code. Too gnarly to rebase properly.
This commit is contained in:
@@ -111,8 +111,8 @@ uint32_t KernelModule::GetProcAddressByOrdinal(uint16_t ordinal) {
|
||||
handler =
|
||||
(cpu::GuestFunction::ExternHandler)export_entry->function_data.shim;
|
||||
}
|
||||
static_cast<cpu::GuestFunction*>(function)
|
||||
->SetupExtern(handler, export_entry);
|
||||
static_cast<cpu::GuestFunction*>(function)->SetupExtern(handler,
|
||||
export_entry);
|
||||
|
||||
function->set_status(cpu::Symbol::Status::kDeclared);
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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<ObjectTableEntry*>(realloc(table_, new_size));
|
||||
auto new_table =
|
||||
reinterpret_cast<ObjectTableEntry*>(realloc(table_, new_size));
|
||||
if (!new_table) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Zero out new entries.
|
||||
if (new_size > old_size) {
|
||||
std::memset(reinterpret_cast<uint8_t*>(new_table) + old_size, 0, new_size - old_size);
|
||||
std::memset(reinterpret_cast<uint8_t*>(new_table) + old_size, 0,
|
||||
new_size - old_size);
|
||||
}
|
||||
|
||||
last_free_entry_ = table_capacity_;
|
||||
|
||||
@@ -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 <typename T>
|
||||
@@ -78,7 +78,7 @@ class ObjectTable {
|
||||
}
|
||||
|
||||
std::vector<object_ref<XObject>> GetAllObjects();
|
||||
void PurgeAllObjects(); // Purges the object table of all guest objects
|
||||
void PurgeAllObjects(); // Purges the object table of all guest objects
|
||||
|
||||
private:
|
||||
typedef struct {
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -47,4 +47,4 @@ bool XIOCompletion::WaitForNotification(uint64_t wait_ticks) {
|
||||
}
|
||||
|
||||
} // namespace kernel
|
||||
} // namespace xe
|
||||
} // namespace xe
|
||||
|
||||
@@ -51,4 +51,4 @@ class XIOCompletion : public XObject {
|
||||
} // namespace kernel
|
||||
} // namespace xe
|
||||
|
||||
#endif // XENIA_KERNEL_XIOCOMPLETION_H_
|
||||
#endif // XENIA_KERNEL_XIOCOMPLETION_H_
|
||||
|
||||
@@ -80,7 +80,8 @@ class XModule : public XObject {
|
||||
static uint32_t GetHandleFromHModule(void* hmodule);
|
||||
|
||||
virtual bool Save(ByteStream* stream) override;
|
||||
static object_ref<XModule> Restore(KernelState* kernel_state, ByteStream* stream);
|
||||
static object_ref<XModule> Restore(KernelState* kernel_state,
|
||||
ByteStream* stream);
|
||||
|
||||
protected:
|
||||
void OnLoad();
|
||||
|
||||
@@ -187,7 +187,6 @@ class XObject {
|
||||
static object_ref<T> 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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user