fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Satisfy linter

Browse Source 
Apply changes suggested by clang-format-12
This commit is contained in:
Joel Linn
2021-06-20 20:42:57 +02:00
committed by Rick Gibbed
parent ecfba56090
commit d87bf995e1
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/cpu/hir/value.cc
View File

@@ -2,7 +2,7 @@
****************************************************************************** ******************************************************************************
* Xenia : Xbox 360 Emulator Research Project * * Xenia : Xbox 360 Emulator Research Project *
****************************************************************************** ******************************************************************************
* Copyright 2013 Ben Vanik. All rights reserved. * * Copyright 2021 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. * * Released under the BSD license - see LICENSE in the root for more details. *
****************************************************************************** ******************************************************************************
*/ */
@@ -426,8 +426,9 @@ void Value::MulHi(Value* other, bool is_unsigned) {
(uint32_t)other->constant.i32) >> (uint32_t)other->constant.i32) >>
32); 32);
} else { } else {
constant.i32 = (int32_t)( constant.i32 =
((int64_t)constant.i32 * (int64_t)other->constant.i32) >> 32); (int32_t)(((int64_t)constant.i32 * (int64_t)other->constant.i32) >>
32);
} }
break; break;
case INT64_TYPE: case INT64_TYPE:

4
src/xenia/cpu/ppc/ppc_emit_control.cc
View File

@@ -2,7 +2,7 @@
****************************************************************************** ******************************************************************************
* Xenia : Xbox 360 Emulator Research Project * * Xenia : Xbox 360 Emulator Research Project *
****************************************************************************** ******************************************************************************
* Copyright 2013 Ben Vanik. All rights reserved. * * Copyright 2021 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. * * Released under the BSD license - see LICENSE in the root for more details. *
****************************************************************************** ******************************************************************************
*/ */
@@ -806,6 +806,6 @@ void RegisterEmitCategoryControl() {
XEREGISTERINSTR(mtmsrd); XEREGISTERINSTR(mtmsrd);
} }
} // namespace ppc
} // namespace cpu } // namespace cpu
} // namespace xe } // namespace xe
} // namespace xe

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

@@ -2,7 +2,7 @@
****************************************************************************** ******************************************************************************
* Xenia : Xbox 360 Emulator Research Project * * Xenia : Xbox 360 Emulator Research Project *
****************************************************************************** ******************************************************************************
* Copyright 2020 Ben Vanik. All rights reserved. * * Copyright 2021 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. * * Released under the BSD license - see LICENSE in the root for more details. *
****************************************************************************** ******************************************************************************
*/ */
@@ -832,9 +832,10 @@ int XexModule::ReadPEHeaders() {
// offsetof seems to be unable to find OptionalHeader. // offsetof seems to be unable to find OptionalHeader.
#define offsetof1(type, member) ((std::size_t) & (((type*)0)->member)) #define offsetof1(type, member) ((std::size_t) & (((type*)0)->member))
#define IMAGE_FIRST_SECTION1(ntheader) \ #define IMAGE_FIRST_SECTION1(ntheader) \
((PIMAGE_SECTION_HEADER)( \ ((PIMAGE_SECTION_HEADER)((uint8_t*)ntheader + \
(uint8_t*)ntheader + offsetof1(IMAGE_NT_HEADERS, OptionalHeader) + \ offsetof1(IMAGE_NT_HEADERS, OptionalHeader) + \
((PIMAGE_NT_HEADERS)(ntheader))->FileHeader.SizeOfOptionalHeader)) ((PIMAGE_NT_HEADERS)(ntheader)) \
->FileHeader.SizeOfOptionalHeader))
// Quick scan to determine bounds of sections. // Quick scan to determine bounds of sections.
size_t upper_address = 0; size_t upper_address = 0;

5
src/xenia/kernel/xam/xam_user.cc
View File

@@ -277,8 +277,9 @@ uint32_t xeXamUserReadProfileSettingsEx(uint32_t title_id, uint32_t user_index,
auto setting = user_profile->GetSetting(setting_id); auto setting = user_profile->GetSetting(setting_id);
std::memset(out_setting, 0, sizeof(X_USER_READ_PROFILE_SETTING)); std::memset(out_setting, 0, sizeof(X_USER_READ_PROFILE_SETTING));
out_setting->from = out_setting->from = !setting || !setting->is_set ? 0
!setting || !setting->is_set ? 0 : setting->is_title_specific() ? 2 : 1; : setting->is_title_specific() ? 2
: 1;
out_setting->user_index = static_cast<uint32_t>(user_index); out_setting->user_index = static_cast<uint32_t>(user_index);
out_setting->setting_id = setting_id; out_setting->setting_id = setting_id;