From 82840282fb3ea68e2c4ecc7fb37bac444ea2b3f4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 31 Aug 2014 16:12:09 -0400 Subject: [PATCH] Core: Apply const to some functions --- rpcs3/Crypto/key_vault.cpp | 16 ++++++++-------- rpcs3/Crypto/key_vault.h | 16 ++++++++-------- rpcs3/Emu/ARMv7/ARMv7Interpreter.h | 2 +- rpcs3/Emu/Cell/PPUProgramCompiler.cpp | 2 +- rpcs3/Emu/Cell/PPUProgramCompiler.h | 2 +- rpcs3/Emu/Cell/SPURSManager.h | 4 ++-- rpcs3/Emu/Cell/SPUThread.h | 2 +- rpcs3/Emu/SysCalls/ModuleManager.cpp | 2 +- rpcs3/Emu/SysCalls/ModuleManager.h | 2 +- rpcs3/Emu/SysCalls/SysCalls.h | 3 ++- rpcs3/Ini.h | 2 +- 11 files changed, 27 insertions(+), 26 deletions(-) diff --git a/rpcs3/Crypto/key_vault.cpp b/rpcs3/Crypto/key_vault.cpp index 90bd043a09..5cbc04ac02 100644 --- a/rpcs3/Crypto/key_vault.cpp +++ b/rpcs3/Crypto/key_vault.cpp @@ -593,17 +593,17 @@ void KeyVault::LoadSelfUNK7Keys() 0x0F); } -SELF_KEY KeyVault::GetSelfLV0Key() +SELF_KEY KeyVault::GetSelfLV0Key() const { return sk_LV0_arr[0]; } -SELF_KEY KeyVault::GetSelfLDRKey() +SELF_KEY KeyVault::GetSelfLDRKey() const { return sk_LDR_arr[0]; } -SELF_KEY KeyVault::GetSelfLV1Key(u64 version) +SELF_KEY KeyVault::GetSelfLV1Key(u64 version) const { SELF_KEY key(0, 0, 0, "", "", "", "", 0); @@ -619,7 +619,7 @@ SELF_KEY KeyVault::GetSelfLV1Key(u64 version) return key; } -SELF_KEY KeyVault::GetSelfLV2Key(u64 version) +SELF_KEY KeyVault::GetSelfLV2Key(u64 version) const { SELF_KEY key(0, 0, 0, "", "", "", "", 0); @@ -635,7 +635,7 @@ SELF_KEY KeyVault::GetSelfLV2Key(u64 version) return key; } -SELF_KEY KeyVault::GetSelfISOKey(u16 revision, u64 version) +SELF_KEY KeyVault::GetSelfISOKey(u16 revision, u64 version) const { SELF_KEY key(0, 0, 0, "", "", "", "", 0); @@ -652,7 +652,7 @@ SELF_KEY KeyVault::GetSelfISOKey(u16 revision, u64 version) return key; } -SELF_KEY KeyVault::GetSelfAPPKey(u16 revision) +SELF_KEY KeyVault::GetSelfAPPKey(u16 revision) const { SELF_KEY key(0, 0, 0, "", "", "", "", 0); @@ -668,7 +668,7 @@ SELF_KEY KeyVault::GetSelfAPPKey(u16 revision) return key; } -SELF_KEY KeyVault::GetSelfUNK7Key(u64 version) +SELF_KEY KeyVault::GetSelfUNK7Key(u64 version) const { SELF_KEY key(0, 0, 0, "", "", "", "", 0); @@ -684,7 +684,7 @@ SELF_KEY KeyVault::GetSelfUNK7Key(u64 version) return key; } -SELF_KEY KeyVault::GetSelfNPDRMKey(u16 revision) +SELF_KEY KeyVault::GetSelfNPDRMKey(u16 revision) const { SELF_KEY key(0, 0, 0, "", "", "", "", 0); diff --git a/rpcs3/Crypto/key_vault.h b/rpcs3/Crypto/key_vault.h index d5fabaf829..e57cfe5b90 100644 --- a/rpcs3/Crypto/key_vault.h +++ b/rpcs3/Crypto/key_vault.h @@ -131,14 +131,14 @@ private: void LoadSelfAPPKeys(); void LoadSelfUNK7Keys(); void LoadSelfNPDRMKeys(); - SELF_KEY GetSelfLV0Key(); - SELF_KEY GetSelfLDRKey(); - SELF_KEY GetSelfLV1Key(u64 version); - SELF_KEY GetSelfLV2Key(u64 version); - SELF_KEY GetSelfISOKey(u16 revision, u64 version); - SELF_KEY GetSelfAPPKey(u16 revision); - SELF_KEY GetSelfUNK7Key(u64 version); - SELF_KEY GetSelfNPDRMKey(u16 revision); + SELF_KEY GetSelfLV0Key() const; + SELF_KEY GetSelfLDRKey() const; + SELF_KEY GetSelfLV1Key(u64 version) const; + SELF_KEY GetSelfLV2Key(u64 version) const; + SELF_KEY GetSelfISOKey(u16 revision, u64 version) const; + SELF_KEY GetSelfAPPKey(u16 revision) const; + SELF_KEY GetSelfUNK7Key(u64 version) const; + SELF_KEY GetSelfNPDRMKey(u16 revision) const; }; // RAP to RIF function. diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h index 477f09b18f..623d8e4c2a 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h +++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h @@ -233,7 +233,7 @@ public: return result; } - bool ConditionPassed(u8 cond) + bool ConditionPassed(u8 cond) const { bool result = false; diff --git a/rpcs3/Emu/Cell/PPUProgramCompiler.cpp b/rpcs3/Emu/Cell/PPUProgramCompiler.cpp index fcc47c1bec..9c3b760ea7 100644 --- a/rpcs3/Emu/Cell/PPUProgramCompiler.cpp +++ b/rpcs3/Emu/Cell/PPUProgramCompiler.cpp @@ -528,7 +528,7 @@ void CompilePPUProgram::LoadArgs() m_end_args = m_args.size() > 0; } -u32 CompilePPUProgram::GetBranchValue(const std::string& branch_name) +u32 CompilePPUProgram::GetBranchValue(const std::string& branch_name) const { for(const Branch& branch : m_branches) { diff --git a/rpcs3/Emu/Cell/PPUProgramCompiler.h b/rpcs3/Emu/Cell/PPUProgramCompiler.h index 70c46b9952..608fbc4c1e 100644 --- a/rpcs3/Emu/Cell/PPUProgramCompiler.h +++ b/rpcs3/Emu/Cell/PPUProgramCompiler.h @@ -147,7 +147,7 @@ protected: void DetectArgInfo(Arg& arg); void LoadArgs(); - u32 GetBranchValue(const std::string& branch); + u32 GetBranchValue(const std::string& branch) const; bool SetNextArgType(u32 types, bool show_err = true); bool SetNextArgBranch(u8 aa, bool show_err = true); diff --git a/rpcs3/Emu/Cell/SPURSManager.h b/rpcs3/Emu/Cell/SPURSManager.h index 210eda74cc..bcf8badde0 100644 --- a/rpcs3/Emu/Cell/SPURSManager.h +++ b/rpcs3/Emu/Cell/SPURSManager.h @@ -29,12 +29,12 @@ class SPURSManagerEventFlag public: SPURSManagerEventFlag(u32 flagClearMode, u32 flagDirection); - u32 _getDirection() + u32 _getDirection() const { return this->flagDirection; } - u32 _getClearMode () + u32 _getClearMode() const { return this->flagClearMode; } diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h index 7736d821b8..817d7dde82 100644 --- a/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/Emu/Cell/SPUThread.h @@ -145,7 +145,7 @@ public: this->low = this->low & mask; } //Slice 0 or 1 - u8 checkSliceRounding(u8 slice) + u8 checkSliceRounding(u8 slice) const { switch(slice) { diff --git a/rpcs3/Emu/SysCalls/ModuleManager.cpp b/rpcs3/Emu/SysCalls/ModuleManager.cpp index 89db1b531a..1bcb6e7466 100644 --- a/rpcs3/Emu/SysCalls/ModuleManager.cpp +++ b/rpcs3/Emu/SysCalls/ModuleManager.cpp @@ -316,7 +316,7 @@ ModuleManager::~ModuleManager() UnloadModules(); } -bool ModuleManager::IsLoadedFunc(u32 id) +bool ModuleManager::IsLoadedFunc(u32 id) const { for (u32 i = 0; i bool CheckId(u32 id, T*& data) + template + bool CheckId(u32 id, T*& data) const { return detail::CheckId(id,data,GetName()); } diff --git a/rpcs3/Ini.h b/rpcs3/Ini.h index 967ed92124..efb7813cde 100644 --- a/rpcs3/Ini.h +++ b/rpcs3/Ini.h @@ -64,7 +64,7 @@ template struct IniEntry : public Ini m_value = value; } - T GetValue() + T GetValue() const { return m_value; }