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

Merge pull request #4116 from leoetlino/lint-real-fix 

Tools: Fix the lint script (for real, this time -- and the last time)
This commit is contained in:
Pierre Bourdon 2016-08-11 21:27:16 +02:00 committed by GitHub
parent cef71afc27 c1184957a5
commit 4c9c456846
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Core.cpp
View File

@ -905,8 +905,8 @@ void UpdateTitle()
(u32)Movie::GetCurrentFrame(), FPS, VPS, Speed); (u32)Movie::GetCurrentFrame(), FPS, VPS, Speed);
else if (Movie::IsRecordingInput()) else if (Movie::IsRecordingInput())
SFPS = StringFromFormat("Input: %u - VI: %u - FPS: %.0f - VPS: %.0f - %.0f%%", SFPS = StringFromFormat("Input: %u - VI: %u - FPS: %.0f - VPS: %.0f - %.0f%%",
(u32)Movie::GetCurrentInputCount(), (u32)Movie::GetCurrentFrame(), FPS, VPS, (u32)Movie::GetCurrentInputCount(), (u32)Movie::GetCurrentFrame(), FPS,
Speed); VPS, Speed);
else else
{ {
SFPS = StringFromFormat("FPS: %.0f - VPS: %.0f - %.0f%%", FPS, VPS, Speed); SFPS = StringFromFormat("FPS: %.0f - VPS: %.0f - %.0f%%", FPS, VPS, Speed);

4
Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
View File

@ -53,7 +53,7 @@ void JitArm64::GenerateAsm()
{ {
// set the mem_base based on MSR flags // set the mem_base based on MSR flags
LDR(INDEX_UNSIGNED, ARM64Reg::W28, PPC_REG, PPCSTATE_OFF(msr)); LDR(INDEX_UNSIGNED, ARM64Reg::W28, PPC_REG, PPCSTATE_OFF(msr));
FixupBranch physmem = TBNZ(ARM64Reg::W28, 31-27); FixupBranch physmem = TBNZ(ARM64Reg::W28, 31 - 27);
MOVI2R(MEM_REG, (u64)Memory::physical_base); MOVI2R(MEM_REG, (u64)Memory::physical_base);
FixupBranch membaseend = B(); FixupBranch membaseend = B();
SetJumpTarget(physmem); SetJumpTarget(physmem);
@ -103,7 +103,7 @@ void JitArm64::GenerateAsm()
// set the mem_base based on MSR flags // set the mem_base based on MSR flags
LDR(INDEX_UNSIGNED, ARM64Reg::W28, PPC_REG, PPCSTATE_OFF(msr)); LDR(INDEX_UNSIGNED, ARM64Reg::W28, PPC_REG, PPCSTATE_OFF(msr));
FixupBranch physmem = TBNZ(ARM64Reg::W28, 31-27); FixupBranch physmem = TBNZ(ARM64Reg::W28, 31 - 27);
MOVI2R(MEM_REG, (u64)Memory::physical_base); MOVI2R(MEM_REG, (u64)Memory::physical_base);
FixupBranch membaseend = B(); FixupBranch membaseend = B();
SetJumpTarget(physmem); SetJumpTarget(physmem);

2
Source/Core/DiscIO/Enums.cpp
View File

@ -5,9 +5,9 @@
#include <map> #include <map>
#include <string> #include <string>
#include "DiscIO/Enums.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "DiscIO/Enums.h"
namespace DiscIO namespace DiscIO
{ {

6
Source/Core/VideoCommon/PixelEngine.cpp
View File

@ -148,7 +148,8 @@ void Init()
s_signal_token_interrupt = false; s_signal_token_interrupt = false;
s_signal_finish_interrupt = false; s_signal_finish_interrupt = false;
et_SetTokenFinishOnMainThread = CoreTiming::RegisterEvent("SetTokenFinish", SetTokenFinish_OnMainThread); et_SetTokenFinishOnMainThread =
CoreTiming::RegisterEvent("SetTokenFinish", SetTokenFinish_OnMainThread);
} }
void RegisterMMIO(MMIO::Mapping* mmio, u32 base) void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
@ -218,8 +219,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
})); }));
// Token register, readonly. // Token register, readonly.
mmio->Register(base | PE_TOKEN_REG, mmio->Register(base | PE_TOKEN_REG, MMIO::ComplexRead<u16>([](u32) { return s_token; }),
MMIO::ComplexRead<u16>([](u32) { return s_token; }),
MMIO::InvalidWrite<u16>()); MMIO::InvalidWrite<u16>());
// BBOX registers, readonly and need to update a flag. // BBOX registers, readonly and need to update a flag.

6
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -312,9 +312,9 @@ void Renderer::DrawDebugText()
{ {
final_cyan += StringFromFormat("Frame: %llu", (unsigned long long)Movie::GetCurrentFrame()); final_cyan += StringFromFormat("Frame: %llu", (unsigned long long)Movie::GetCurrentFrame());
if (Movie::IsPlayingInput()) if (Movie::IsPlayingInput())
final_cyan += final_cyan += StringFromFormat("\nInput: %llu / %llu",
StringFromFormat("\nInput: %llu / %llu", (unsigned long long)Movie::GetCurrentInputCount(), (unsigned long long)Movie::GetCurrentInputCount(),
(unsigned long long)Movie::GetTotalInputCount()); (unsigned long long)Movie::GetTotalInputCount());
} }
final_cyan += "\n"; final_cyan += "\n";

2
Tools/lint.sh
View File

@ -5,7 +5,7 @@
fail=0 fail=0
# Check for clang-format issues. # Check for clang-format issues.
for f in $(git diff --name-only --diff-filter=ACMRTUXB); do for f in $(git diff --name-only --diff-filter=ACMRTUXB --cached); do
if ! echo "${f}" | egrep -q "[.](cpp|h|mm)$"; then if ! echo "${f}" | egrep -q "[.](cpp|h|mm)$"; then
continue continue
fi fi