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

Formatting: force pointers to the left side.

This commit is contained in:
Ben Vanik 2015-06-30 16:16:33 -07:00
parent 90e86d0172
commit d7a5c74bf3
12 changed files with 478 additions and 481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -1,2 +1,4 @@
--- ---
BasedOnStyle: Google BasedOnStyle: Google
DerivePointerAlignment: false
PointerAlignment: Left

16
src/xenia/debug/proto/breakpoints_generated.h
View File

@ -85,8 +85,8 @@ struct ListBreakpointsResponse FLATBUFFERS_FINAL_CLASS
struct ListBreakpointsResponseBuilder { struct ListBreakpointsResponseBuilder {
flatbuffers::FlatBufferBuilder& fbb_; flatbuffers::FlatBufferBuilder& fbb_;
flatbuffers::uoffset_t start_; flatbuffers::uoffset_t start_;
void add_breakpoints(flatbuffers::Offset< void add_breakpoints(
flatbuffers::Vector<const Breakpoint *>> breakpoints) { flatbuffers::Offset<flatbuffers::Vector<const Breakpoint*>> breakpoints) {
fbb_.AddOffset(4, breakpoints); fbb_.AddOffset(4, breakpoints);
} }
ListBreakpointsResponseBuilder(flatbuffers::FlatBufferBuilder& _fbb) ListBreakpointsResponseBuilder(flatbuffers::FlatBufferBuilder& _fbb)
@ -127,8 +127,8 @@ struct AddBreakpointsRequest FLATBUFFERS_FINAL_CLASS
struct AddBreakpointsRequestBuilder { struct AddBreakpointsRequestBuilder {
flatbuffers::FlatBufferBuilder& fbb_; flatbuffers::FlatBufferBuilder& fbb_;
flatbuffers::uoffset_t start_; flatbuffers::uoffset_t start_;
void add_breakpoints(flatbuffers::Offset< void add_breakpoints(
flatbuffers::Vector<const Breakpoint *>> breakpoints) { flatbuffers::Offset<flatbuffers::Vector<const Breakpoint*>> breakpoints) {
fbb_.AddOffset(4, breakpoints); fbb_.AddOffset(4, breakpoints);
} }
AddBreakpointsRequestBuilder(flatbuffers::FlatBufferBuilder& _fbb) AddBreakpointsRequestBuilder(flatbuffers::FlatBufferBuilder& _fbb)
@ -196,8 +196,8 @@ struct UpdateBreakpointsRequest FLATBUFFERS_FINAL_CLASS
struct UpdateBreakpointsRequestBuilder { struct UpdateBreakpointsRequestBuilder {
flatbuffers::FlatBufferBuilder& fbb_; flatbuffers::FlatBufferBuilder& fbb_;
flatbuffers::uoffset_t start_; flatbuffers::uoffset_t start_;
void add_breakpoints(flatbuffers::Offset< void add_breakpoints(
flatbuffers::Vector<const Breakpoint *>> breakpoints) { flatbuffers::Offset<flatbuffers::Vector<const Breakpoint*>> breakpoints) {
fbb_.AddOffset(4, breakpoints); fbb_.AddOffset(4, breakpoints);
} }
UpdateBreakpointsRequestBuilder(flatbuffers::FlatBufferBuilder& _fbb) UpdateBreakpointsRequestBuilder(flatbuffers::FlatBufferBuilder& _fbb)
@ -267,8 +267,8 @@ struct RemoveBreakpointsRequest FLATBUFFERS_FINAL_CLASS
struct RemoveBreakpointsRequestBuilder { struct RemoveBreakpointsRequestBuilder {
flatbuffers::FlatBufferBuilder& fbb_; flatbuffers::FlatBufferBuilder& fbb_;
flatbuffers::uoffset_t start_; flatbuffers::uoffset_t start_;
void add_breakpoints(flatbuffers::Offset< void add_breakpoints(
flatbuffers::Vector<const Breakpoint *>> breakpoints) { flatbuffers::Offset<flatbuffers::Vector<const Breakpoint*>> breakpoints) {
fbb_.AddOffset(4, breakpoints); fbb_.AddOffset(4, breakpoints);
} }
RemoveBreakpointsRequestBuilder(flatbuffers::FlatBufferBuilder& _fbb) RemoveBreakpointsRequestBuilder(flatbuffers::FlatBufferBuilder& _fbb)

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

@ -76,8 +76,7 @@ xe_xex2_ref xe_xex2_load(xe::Memory *memory, const void *addr,
xex->memory = memory; xex->memory = memory;
xex->sections = new std::vector<PESection*>(); xex->sections = new std::vector<PESection*>();
XEEXPECTZERO( XEEXPECTZERO(xe_xex2_read_header((const uint8_t*)addr, length, &xex->header));
xe_xex2_read_header((const uint8_t *)addr, length, &xex->header));
XEEXPECTZERO(xe_xex2_decrypt_key(&xex->header)); XEEXPECTZERO(xe_xex2_decrypt_key(&xex->header));
@ -344,8 +343,7 @@ int xe_xex2_read_header(const uint8_t *addr, const size_t length,
&fmt->compression_info.basic; &fmt->compression_info.basic;
uint32_t info_size = xe::load_and_swap<uint32_t>(pp + 0x00); uint32_t info_size = xe::load_and_swap<uint32_t>(pp + 0x00);
comp_info->block_count = (info_size - 8) / 8; comp_info->block_count = (info_size - 8) / 8;
comp_info->blocks = comp_info->blocks = (xe_xex2_file_basic_compression_block_t*)calloc(
(xe_xex2_file_basic_compression_block_t *)calloc(
comp_info->block_count, comp_info->block_count,
sizeof(xe_xex2_file_basic_compression_block_t)); sizeof(xe_xex2_file_basic_compression_block_t));
XEEXPECTNOTNULL(comp_info->blocks); XEEXPECTNOTNULL(comp_info->blocks);
@ -766,8 +764,7 @@ int xe_xex2_read_image_compressed(const xe_xex2_header_t *header,
// Setup decompressor and decompress. // Setup decompressor and decompress.
sys = mspack_memory_sys_create(); sys = mspack_memory_sys_create();
XEEXPECTNOTNULL(sys); XEEXPECTNOTNULL(sys);
lzxsrc = lzxsrc = mspack_memory_open(sys, (void*)compress_buffer, d - compress_buffer);
mspack_memory_open(sys, (void *)compress_buffer, d - compress_buffer);
XEEXPECTNOTNULL(lzxsrc); XEEXPECTNOTNULL(lzxsrc);
lzxdst = mspack_memory_open(sys, buffer, uncompressed_size); lzxdst = mspack_memory_open(sys, buffer, uncompressed_size);
XEEXPECTNOTNULL(lzxdst); XEEXPECTNOTNULL(lzxdst);
@ -954,8 +951,8 @@ int xe_xex2_find_import_infos(xe_xex2_ref xex,
} }
// Allocate storage. // Allocate storage.
xe_xex2_import_info_t *infos = (xe_xex2_import_info_t *)calloc( xe_xex2_import_info_t* infos =
info_count, sizeof(xe_xex2_import_info_t)); (xe_xex2_import_info_t*)calloc(info_count, sizeof(xe_xex2_import_info_t));
assert_not_null(infos); assert_not_null(infos);
assert_not_zero(info_count); assert_not_zero(info_count);
@ -1037,8 +1034,7 @@ uint32_t xe_xex2_lookup_export(xe_xex2_ref xex, const char *name) {
uint32_t* name_table = (uint32_t*)((uint64_t)e + e->AddressOfNames); uint32_t* name_table = (uint32_t*)((uint64_t)e + e->AddressOfNames);
// Table of ordinals (by name) // Table of ordinals (by name)
uint16_t *ordinal_table = uint16_t* ordinal_table = (uint16_t*)((uint64_t)e + e->AddressOfNameOrdinals);
(uint16_t *)((uint64_t)e + e->AddressOfNameOrdinals);
const char* mod_name = (const char*)((uint64_t)e + e->Name); const char* mod_name = (const char*)((uint64_t)e + e->Name);
@ -1094,8 +1090,7 @@ uint32_t xe_xex2_lookup_export(xe_xex2_ref xex, uint16_t ordinal) {
uint32_t* name_table = (uint32_t*)((uint64_t)e + e->AddressOfNames); uint32_t* name_table = (uint32_t*)((uint64_t)e + e->AddressOfNames);
// Table of ordinals (by name) // Table of ordinals (by name)
uint16_t *ordinal_table = uint16_t* ordinal_table = (uint16_t*)((uint64_t)e + e->AddressOfNameOrdinals);
(uint16_t *)((uint64_t)e + e->AddressOfNameOrdinals);
const char* mod_name = (const char*)((uint64_t)e + e->Name); const char* mod_name = (const char*)((uint64_t)e + e->Name);