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

Though I disagree with these lint fixes, I want travis to shut up.

This commit is contained in:
Ben Vanik 2016-01-01 18:38:20 +00:00
parent b02ca62388
commit 2f012fb56d
11 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/kernel/util/shim_utils.h
View File

@ -422,7 +422,7 @@ xe::cpu::Export* RegisterExport(R (*fn)(Ps&...), const char* name,
static const auto export_entry = new cpu::Export( static const auto export_entry = new cpu::Export(
ORDINAL, xe::cpu::Export::Type::kFunction, name, ORDINAL, xe::cpu::Export::Type::kFunction, name,
tags | xe::cpu::ExportTag::kImplemented | xe::cpu::ExportTag::kLog); tags | xe::cpu::ExportTag::kImplemented | xe::cpu::ExportTag::kLog);
static R (*FN)(Ps&...) = fn; static R (*FN)(Ps & ...) = fn;
struct X { struct X {
static void Trampoline(PPCContext* ppc_context) { static void Trampoline(PPCContext* ppc_context) {
++export_entry->function_data.call_count; ++export_entry->function_data.call_count;
@ -455,7 +455,7 @@ xe::cpu::Export* RegisterExport(void (*fn)(Ps&...), const char* name,
static const auto export_entry = new cpu::Export( static const auto export_entry = new cpu::Export(
ORDINAL, xe::cpu::Export::Type::kFunction, name, ORDINAL, xe::cpu::Export::Type::kFunction, name,
tags | xe::cpu::ExportTag::kImplemented | xe::cpu::ExportTag::kLog); tags | xe::cpu::ExportTag::kImplemented | xe::cpu::ExportTag::kLog);
static void (*FN)(Ps&...) = fn; static void (*FN)(Ps & ...) = fn;
struct X { struct X {
static void Trampoline(PPCContext* ppc_context) { static void Trampoline(PPCContext* ppc_context) {
++export_entry->function_data.call_count; ++export_entry->function_data.call_count;

26
src/xenia/kernel/util/xex2.cc
View File

@ -854,20 +854,20 @@ int xe_xex2_load_pe(xe_xex2_ref xex) {
return 1; return 1;
} }
// Linker version - likely 8+ // Linker version - likely 8+
// Could be useful for recognizing certain patterns // Could be useful for recognizing certain patterns
// opthdr->MajorLinkerVersion; opthdr->MinorLinkerVersion; // opthdr->MajorLinkerVersion; opthdr->MinorLinkerVersion;
// Data directories of interest: // Data directories of interest:
// EXPORT IMAGE_EXPORT_DIRECTORY // EXPORT IMAGE_EXPORT_DIRECTORY
// IMPORT IMAGE_IMPORT_DESCRIPTOR[] // IMPORT IMAGE_IMPORT_DESCRIPTOR[]
// EXCEPTION IMAGE_CE_RUNTIME_FUNCTION_ENTRY[] // EXCEPTION IMAGE_CE_RUNTIME_FUNCTION_ENTRY[]
// BASERELOC // BASERELOC
// DEBUG IMAGE_DEBUG_DIRECTORY[] // DEBUG IMAGE_DEBUG_DIRECTORY[]
// ARCHITECTURE /IMAGE_ARCHITECTURE_HEADER/ ----- import thunks! // ARCHITECTURE /IMAGE_ARCHITECTURE_HEADER/ ----- import thunks!
// TLS IMAGE_TLS_DIRECTORY // TLS IMAGE_TLS_DIRECTORY
// IAT Import Address Table ptr // IAT Import Address Table ptr
// opthdr->DataDirectory[IMAGE_DIRECTORY_ENTRY_X].VirtualAddress / .Size // opthdr->DataDirectory[IMAGE_DIRECTORY_ENTRY_X].VirtualAddress / .Size
// The macros in pe_image.h don't work with clang, for some reason. // The macros in pe_image.h don't work with clang, for some reason.
// offsetof seems to be unable to find OptionalHeader. // offsetof seems to be unable to find OptionalHeader.

2
src/xenia/kernel/xboxkrnl/xboxkrnl_audio.cc
View File

@ -7,13 +7,13 @@
****************************************************************************** ******************************************************************************
*/ */
#include "xenia/xbox.h"
#include "xenia/apu/audio_system.h" #include "xenia/apu/audio_system.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/emulator.h" #include "xenia/emulator.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/xboxkrnl/xboxkrnl_private.h" #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
#include "xenia/xbox.h"
namespace xe { namespace xe {
namespace kernel { namespace kernel {

2
src/xenia/kernel/xboxkrnl/xboxkrnl_crypt.cc
View File

@ -7,11 +7,11 @@
****************************************************************************** ******************************************************************************
*/ */
#include "xenia/xbox.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/xboxkrnl/xboxkrnl_private.h" #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
#include "xenia/xbox.h"
#include "third_party/crypto/TinySHA1.hpp" #include "third_party/crypto/TinySHA1.hpp"

2
src/xenia/kernel/xboxkrnl/xboxkrnl_debug.cc
View File

@ -7,13 +7,13 @@
****************************************************************************** ******************************************************************************
*/ */
#include "xenia/xbox.h"
#include "xenia/base/debugging.h" #include "xenia/base/debugging.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/xboxkrnl/xboxkrnl_private.h" #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
#include "xenia/kernel/xthread.h" #include "xenia/kernel/xthread.h"
#include "xenia/xbox.h"
namespace xe { namespace xe {
namespace kernel { namespace kernel {

2
src/xenia/kernel/xboxkrnl/xboxkrnl_hal.cc
View File

@ -7,11 +7,11 @@
****************************************************************************** ******************************************************************************
*/ */
#include "xenia/xbox.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/xboxkrnl/xboxkrnl_private.h" #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
#include "xenia/xbox.h"
namespace xe { namespace xe {
namespace kernel { namespace kernel {

2
src/xenia/kernel/xboxkrnl/xboxkrnl_io.cc
View File

@ -7,6 +7,7 @@
****************************************************************************** ******************************************************************************
*/ */
#include "xenia/xbox.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/base/memory.h" #include "xenia/base/memory.h"
#include "xenia/cpu/processor.h" #include "xenia/cpu/processor.h"
@ -18,7 +19,6 @@
#include "xenia/kernel/xiocompletion.h" #include "xenia/kernel/xiocompletion.h"
#include "xenia/kernel/xthread.h" #include "xenia/kernel/xthread.h"
#include "xenia/vfs/device.h" #include "xenia/vfs/device.h"
#include "xenia/xbox.h"
namespace xe { namespace xe {
namespace kernel { namespace kernel {

2
src/xenia/kernel/xboxkrnl/xboxkrnl_misc.cc
View File

@ -7,12 +7,12 @@
****************************************************************************** ******************************************************************************
*/ */
#include "xenia/xbox.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/xboxkrnl/xboxkrnl_private.h" #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
#include "xenia/kernel/xthread.h" #include "xenia/kernel/xthread.h"
#include "xenia/xbox.h"
namespace xe { namespace xe {
namespace kernel { namespace kernel {

2
src/xenia/kernel/xboxkrnl/xboxkrnl_modules.cc
View File

@ -7,6 +7,7 @@
****************************************************************************** ******************************************************************************
*/ */
#include "xenia/xbox.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/cpu/processor.h" #include "xenia/cpu/processor.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
@ -14,7 +15,6 @@
#include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/util/xex2.h" #include "xenia/kernel/util/xex2.h"
#include "xenia/kernel/xboxkrnl/xboxkrnl_private.h" #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
#include "xenia/xbox.h"
namespace xe { namespace xe {
namespace kernel { namespace kernel {

2
src/xenia/kernel/xboxkrnl/xboxkrnl_ob.cc
View File

@ -7,6 +7,7 @@
****************************************************************************** ******************************************************************************
*/ */
#include "xenia/xbox.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/shim_utils.h"
@ -14,7 +15,6 @@
#include "xenia/kernel/xobject.h" #include "xenia/kernel/xobject.h"
#include "xenia/kernel/xsemaphore.h" #include "xenia/kernel/xsemaphore.h"
#include "xenia/kernel/xthread.h" #include "xenia/kernel/xthread.h"
#include "xenia/xbox.h"
namespace xe { namespace xe {
namespace kernel { namespace kernel {

2
src/xenia/kernel/xboxkrnl/xboxkrnl_usbcam.cc
View File

@ -7,11 +7,11 @@
****************************************************************************** ******************************************************************************
*/ */
#include "xenia/xbox.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/xboxkrnl/xboxkrnl_private.h" #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
#include "xenia/xbox.h"
namespace xe { namespace xe {
namespace kernel { namespace kernel {