ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting.

This commit is contained in:
Dr. Chat 2015-07-05 16:28:11 -05:00
parent 82986c6eec
commit 4e6b036b3c
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/cpu/xex_module.cc
View File

@ -303,7 +303,7 @@ bool XexModule::Unload() {
memory()->LookupHeap(*exe_address)->Release(*exe_address); 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_; delete[] xex_header_;
xex_header_ = nullptr; xex_header_ = nullptr;

2
src/xenia/kernel/objects/xthread.h
View File

@ -160,7 +160,7 @@ class XThread : public XObject {
uint32_t pcr_address_; uint32_t pcr_address_;
uint32_t thread_state_address_; uint32_t thread_state_address_;
cpu::ThreadState* thread_state_; cpu::ThreadState* thread_state_;
bool guest_thread_; // Launched into guest code? bool guest_thread_; // Launched into guest code?
bool running_; bool running_;
std::string name_; std::string name_;

5
src/xenia/kernel/xam_info.cc
View File

@ -125,7 +125,8 @@ dword_result_t XamLoaderGetLaunchDataSize(lpdword_t size_ptr) {
} }
DECLARE_XAM_EXPORT(XamLoaderGetLaunchDataSize, ExportTag::kSketchy); 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_module = kernel_state()->GetModule("xam.xex");
auto xam = kernel::object_ref<kernel::XamModule>( auto xam = kernel::object_ref<kernel::XamModule>(
reinterpret_cast<kernel::XamModule*>(xam_module.release())); reinterpret_cast<kernel::XamModule*>(xam_module.release()));
@ -153,7 +154,7 @@ void XamLoaderLaunchTitle(lpstring_t raw_name, dword_t flags) {
auto& loader_data = xam->loader_data(); auto& loader_data = xam->loader_data();
loader_data.launch_flags = flags; loader_data.launch_flags = flags;
// Translate the launch path to a full path. // Translate the launch path to a full path.
if (raw_name) { if (raw_name) {
std::string name = xe::find_name_from_path(std::string(raw_name)); std::string name = xe::find_name_from_path(std::string(raw_name));

3
src/xenia/kernel/xam_module.cc
View File

@ -17,8 +17,7 @@ namespace xe {
namespace kernel { namespace kernel {
XamModule::XamModule(Emulator* emulator, KernelState* kernel_state) XamModule::XamModule(Emulator* emulator, KernelState* kernel_state)
: XKernelModule(kernel_state, "xe:\\xam.xex") : XKernelModule(kernel_state, "xe:\\xam.xex"), loader_data_() {
, loader_data_() {
RegisterExportTable(export_resolver_); RegisterExportTable(export_resolver_);
// Register all exported functions. // Register all exported functions.

4
src/xenia/kernel/xam_module.h
View File

@ -35,14 +35,14 @@ class XamModule : public XKernelModule {
uint32_t launch_data_ptr; uint32_t launch_data_ptr;
uint32_t launch_data_size; uint32_t launch_data_size;
uint32_t launch_flags; 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_; } const LoaderData& loader_data() const { return loader_data_; }
LoaderData& loader_data() { return loader_data_; } LoaderData& loader_data() { return loader_data_; }
private: private:
LoaderData loader_data_; LoaderData loader_data_;
}; };
} // namespace kernel } // namespace kernel