Change to pass some arguments by reference

This commit is contained in:
Chin 2014-12-24 21:42:41 -05:00 committed by Henrik Rydgard
parent ff5d408c81
commit 37f50a3792
18 changed files with 25 additions and 25 deletions

View File

@ -131,7 +131,7 @@ void CWCheatEngine::Exit() {
exit2 = true; exit2 = true;
} }
static inline std::vector<std::string> makeCodeParts(const std::vector<std::string> CodesList) { //Takes a single code line and creates a two-part vector for each code. Feeds to CreateCodeList static inline std::vector<std::string> makeCodeParts(const std::vector<std::string>& CodesList) { //Takes a single code line and creates a two-part vector for each code. Feeds to CreateCodeList
std::string currentcode; std::string currentcode;
std::vector<std::string> finalList; std::vector<std::string> finalList;
char split_char = '\n'; char split_char = '\n';

View File

@ -152,7 +152,7 @@ PSPOskDialog::PSPOskDialog() : PSPDialog() {
PSPOskDialog::~PSPOskDialog() { PSPOskDialog::~PSPOskDialog() {
} }
void PSPOskDialog::ConvertUCS2ToUTF8(std::string& _string, const PSPPointer<u16_le> em_address) void PSPOskDialog::ConvertUCS2ToUTF8(std::string& _string, const PSPPointer<u16_le>& em_address)
{ {
if (!em_address.IsValid()) if (!em_address.IsValid())
{ {
@ -182,7 +182,7 @@ void PSPOskDialog::ConvertUCS2ToUTF8(std::string& _string, const PSPPointer<u16_
_string = stringBuffer; _string = stringBuffer;
} }
void GetWideStringFromPSPPointer(std::wstring& _string, const PSPPointer<u16_le> em_address) void GetWideStringFromPSPPointer(std::wstring& _string, const PSPPointer<u16_le>& em_address)
{ {
if (!em_address.IsValid()) if (!em_address.IsValid())
{ {

View File

@ -217,7 +217,7 @@ protected:
} }
private: private:
void ConvertUCS2ToUTF8(std::string& _string, const PSPPointer<u16_le> em_address); void ConvertUCS2ToUTF8(std::string& _string, const PSPPointer<u16_le>& em_address);
void ConvertUCS2ToUTF8(std::string& _string, const wchar_t *input); void ConvertUCS2ToUTF8(std::string& _string, const wchar_t *input);
void RenderKeyboard(); void RenderKeyboard();
#if defined(USING_WIN_UI) #if defined(USING_WIN_UI)

View File

@ -579,7 +579,7 @@ bool SavedataParam::Load(SceUtilitySavedataParam *param, const std::string &save
return true; return true;
} }
bool SavedataParam::LoadSaveData(SceUtilitySavedataParam *param, const std::string &saveDirName, const std::string dirPath, bool secureMode) { bool SavedataParam::LoadSaveData(SceUtilitySavedataParam *param, const std::string &saveDirName, const std::string& dirPath, bool secureMode) {
u8 *data_ = param->dataBuf; u8 *data_ = param->dataBuf;
std::string filePath = dirPath+"/"+GetFileName(param); std::string filePath = dirPath+"/"+GetFileName(param);
s64 readSize; s64 readSize;
@ -668,7 +668,7 @@ void SavedataParam::LoadNotCryptedSave(SceUtilitySavedataParam *param, u8 *data,
memcpy(data, saveData, std::min((u32)saveSize, (u32)param->dataBufSize)); memcpy(data, saveData, std::min((u32)saveSize, (u32)param->dataBufSize));
} }
void SavedataParam::LoadSFO(SceUtilitySavedataParam *param, const std::string dirPath) { void SavedataParam::LoadSFO(SceUtilitySavedataParam *param, const std::string& dirPath) {
ParamSFOData sfoFile; ParamSFOData sfoFile;
std::string sfopath = dirPath+"/" + SFO_FILENAME; std::string sfopath = dirPath+"/" + SFO_FILENAME;
PSPFileInfo sfoInfo = pspFileSystem.GetFileInfo(sfopath); PSPFileInfo sfoInfo = pspFileSystem.GetFileInfo(sfopath);
@ -720,7 +720,7 @@ std::set<std::string> SavedataParam::getSecureFileNames(std::string dirPath) {
return secureFileNames; return secureFileNames;
} }
void SavedataParam::LoadFile(const std::string dirPath, const std::string filename, PspUtilitySavedataFileData *fileData) { void SavedataParam::LoadFile(const std::string& dirPath, const std::string& filename, PspUtilitySavedataFileData *fileData) {
std::string filePath = dirPath + "/" + filename; std::string filePath = dirPath + "/" + filename;
s64 readSize = -1; s64 readSize = -1;
if(!fileData->buf.IsValid()) if(!fileData->buf.IsValid())

View File

@ -354,11 +354,11 @@ private:
void SetFileInfo(SaveFileInfo &saveInfo, PSPFileInfo &info, std::string saveName); void SetFileInfo(SaveFileInfo &saveInfo, PSPFileInfo &info, std::string saveName);
void ClearFileInfo(SaveFileInfo &saveInfo, std::string saveName); void ClearFileInfo(SaveFileInfo &saveInfo, std::string saveName);
bool LoadSaveData(SceUtilitySavedataParam *param, const std::string &saveDirName, const std::string dirPath, bool secureMode); bool LoadSaveData(SceUtilitySavedataParam *param, const std::string &saveDirName, const std::string& dirPath, bool secureMode);
void LoadCryptedSave(SceUtilitySavedataParam *param, u8 *data, u8 *saveData, int &saveSize, int prevCryptMode, bool &saveDone); void LoadCryptedSave(SceUtilitySavedataParam *param, u8 *data, u8 *saveData, int &saveSize, int prevCryptMode, bool &saveDone);
void LoadNotCryptedSave(SceUtilitySavedataParam *param, u8 *data, u8 *saveData, int &saveSize); void LoadNotCryptedSave(SceUtilitySavedataParam *param, u8 *data, u8 *saveData, int &saveSize);
void LoadSFO(SceUtilitySavedataParam *param, const std::string dirPath); void LoadSFO(SceUtilitySavedataParam *param, const std::string& dirPath);
void LoadFile(const std::string dirPath, const std::string filename, PspUtilitySavedataFileData *fileData); void LoadFile(const std::string& dirPath, const std::string& filename, PspUtilitySavedataFileData *fileData);
int DecryptSave(unsigned int mode, unsigned char *data, int *dataLen, int *alignedLen, unsigned char *cryptkey); int DecryptSave(unsigned int mode, unsigned char *data, int *dataLen, int *alignedLen, unsigned char *cryptkey);
int EncryptData(unsigned int mode, unsigned char *data, int *dataLen, int *alignedLen, unsigned char *hash, unsigned char *cryptkey); int EncryptData(unsigned int mode, unsigned char *data, int *dataLen, int *alignedLen, unsigned char *hash, unsigned char *cryptkey);

View File

@ -183,7 +183,7 @@ void Jit::GetStateAndFlushAll(RegCacheState &state)
FlushAll(); FlushAll();
} }
void Jit::RestoreState(const RegCacheState state) void Jit::RestoreState(const RegCacheState& state)
{ {
gpr.RestoreState(state.gpr); gpr.RestoreState(state.gpr);
fpr.RestoreState(state.fpr); fpr.RestoreState(state.fpr);

View File

@ -187,7 +187,7 @@ public:
private: private:
void GetStateAndFlushAll(RegCacheState &state); void GetStateAndFlushAll(RegCacheState &state);
void RestoreState(const RegCacheState state); void RestoreState(const RegCacheState& state);
void FlushAll(); void FlushAll();
void FlushPrefixV(); void FlushPrefixV();
void WriteDowncount(int offset = 0); void WriteDowncount(int offset = 0);

View File

@ -234,7 +234,7 @@ bool JitSafeMem::PrepareSlowWrite()
return false; return false;
} }
void JitSafeMem::DoSlowWrite(const void *safeFunc, const OpArg src, int suboffset) void JitSafeMem::DoSlowWrite(const void *safeFunc, const OpArg& src, int suboffset)
{ {
if (iaddr_ != (u32) -1) if (iaddr_ != (u32) -1)
jit_->MOV(32, R(EAX), Imm32((iaddr_ + suboffset) & alignMask_)); jit_->MOV(32, R(EAX), Imm32((iaddr_ + suboffset) & alignMask_));

View File

@ -36,9 +36,9 @@ public:
// Emit code proceeding a slow write call, returns true if slow write is needed. // Emit code proceeding a slow write call, returns true if slow write is needed.
bool PrepareSlowWrite(); bool PrepareSlowWrite();
// Emit a slow write from src. // Emit a slow write from src.
void DoSlowWrite(const void *safeFunc, const Gen::OpArg src, int suboffset = 0); void DoSlowWrite(const void *safeFunc, const Gen::OpArg& src, int suboffset = 0);
template <typename T> template <typename T>
void DoSlowWrite(void (*safeFunc)(T val, u32 addr), const Gen::OpArg src, int suboffset = 0) { void DoSlowWrite(void (*safeFunc)(T val, u32 addr), const Gen::OpArg& src, int suboffset = 0) {
DoSlowWrite((const void *)safeFunc, src, suboffset); DoSlowWrite((const void *)safeFunc, src, suboffset);
} }

View File

@ -396,7 +396,7 @@ void GPRRegCache::GetState(GPRRegCacheState &state) const {
memcpy(state.xregs, xregs, sizeof(xregs)); memcpy(state.xregs, xregs, sizeof(xregs));
} }
void GPRRegCache::RestoreState(const GPRRegCacheState state) { void GPRRegCache::RestoreState(const GPRRegCacheState& state) {
memcpy(regs, state.regs, sizeof(regs)); memcpy(regs, state.regs, sizeof(regs));
memcpy(xregs, state.xregs, sizeof(xregs)); memcpy(xregs, state.xregs, sizeof(xregs));
} }

View File

@ -112,7 +112,7 @@ public:
u32 GetImm(MIPSGPReg preg) const; u32 GetImm(MIPSGPReg preg) const;
void GetState(GPRRegCacheState &state) const; void GetState(GPRRegCacheState &state) const;
void RestoreState(const GPRRegCacheState state); void RestoreState(const GPRRegCacheState& state);
MIPSState *mips; MIPSState *mips;

View File

@ -1066,7 +1066,7 @@ void FPURegCache::GetState(FPURegCacheState &state) const {
memcpy(state.xregs, xregs, sizeof(xregs)); memcpy(state.xregs, xregs, sizeof(xregs));
} }
void FPURegCache::RestoreState(const FPURegCacheState state) { void FPURegCache::RestoreState(const FPURegCacheState& state) {
memcpy(regs, state.regs, sizeof(regs)); memcpy(regs, state.regs, sizeof(regs));
memcpy(xregs, state.xregs, sizeof(xregs)); memcpy(xregs, state.xregs, sizeof(xregs));
pendingFlush = true; pendingFlush = true;

View File

@ -206,7 +206,7 @@ public:
void SimpleRegV(const u8 v, int flags); void SimpleRegV(const u8 v, int flags);
void GetState(FPURegCacheState &state) const; void GetState(FPURegCacheState &state) const;
void RestoreState(const FPURegCacheState state); void RestoreState(const FPURegCacheState& state);
MIPSState *mips; MIPSState *mips;

View File

@ -480,7 +480,7 @@ Opcode Read_Opcode_JIT(u32 address)
// WARNING! No checks! // WARNING! No checks!
// We assume that _Address is cached // We assume that _Address is cached
void Write_Opcode_JIT(const u32 _Address, const Opcode _Value) void Write_Opcode_JIT(const u32 _Address, const Opcode& _Value)
{ {
Memory::WriteUnchecked_U32(_Value.encoding, _Address); Memory::WriteUnchecked_U32(_Value.encoding, _Address);
} }

View File

@ -141,7 +141,7 @@ MemoryInitedLock Lock();
// used by JIT to read instructions. Does not resolve replacements. // used by JIT to read instructions. Does not resolve replacements.
Opcode Read_Opcode_JIT(const u32 _Address); Opcode Read_Opcode_JIT(const u32 _Address);
// used by JIT. Reads in the "Locked cache" mode // used by JIT. Reads in the "Locked cache" mode
void Write_Opcode_JIT(const u32 _Address, const Opcode _Value); void Write_Opcode_JIT(const u32 _Address, const Opcode& _Value);
// Should be used by analyzers, disassemblers etc. Does resolve replacements. // Should be used by analyzers, disassemblers etc. Does resolve replacements.
Opcode Read_Instruction(const u32 _Address, bool resolveReplacements = false); Opcode Read_Instruction(const u32 _Address, bool resolveReplacements = false);

View File

@ -121,13 +121,13 @@ inline float bern2deriv(float x) { return 3 * (2 - 3 * x) * x; }
inline float bern3deriv(float x) { return 3 * x * x; } inline float bern3deriv(float x) { return 3 * x * x; }
// http://en.wikipedia.org/wiki/Bernstein_polynomial // http://en.wikipedia.org/wiki/Bernstein_polynomial
static Vec3Packedf Bernstein3D(const Vec3Packedf p0, const Vec3Packedf p1, const Vec3Packedf p2, const Vec3Packedf p3, float x) { static Vec3Packedf Bernstein3D(const Vec3Packedf& p0, const Vec3Packedf& p1, const Vec3Packedf& p2, const Vec3Packedf& p3, float x) {
if (x == 0) return p0; if (x == 0) return p0;
else if (x == 1) return p3; else if (x == 1) return p3;
return p0 * bern0(x) + p1 * bern1(x) + p2 * bern2(x) + p3 * bern3(x); return p0 * bern0(x) + p1 * bern1(x) + p2 * bern2(x) + p3 * bern3(x);
} }
static Vec3Packedf Bernstein3DDerivative(const Vec3Packedf p0, const Vec3Packedf p1, const Vec3Packedf p2, const Vec3Packedf p3, float x) { static Vec3Packedf Bernstein3DDerivative(const Vec3Packedf& p0, const Vec3Packedf& p1, const Vec3Packedf& p2, const Vec3Packedf& p3, float x) {
return p0 * bern0deriv(x) + p1 * bern1deriv(x) + p2 * bern2deriv(x) + p3 * bern3deriv(x); return p0 * bern0deriv(x) + p1 * bern1deriv(x) + p2 * bern2deriv(x) + p3 * bern3deriv(x);
} }

View File

@ -322,7 +322,7 @@ std::vector<u32> TranslateDebugBufferToCompare(const GPUDebugBuffer *buffer, u32
return data; return data;
} }
double CompareScreenshot(const std::vector<u32> &pixels, u32 stride, u32 w, u32 h, const std::string screenshotFilename, std::string &error) double CompareScreenshot(const std::vector<u32> &pixels, u32 stride, u32 w, u32 h, const std::string& screenshotFilename, std::string &error)
{ {
if (pixels.size() < stride * h) if (pixels.size() < stride * h)
{ {

View File

@ -32,4 +32,4 @@ std::string GetTestName(const std::string &bootFilename);
bool CompareOutput(const std::string &bootFilename, const std::string &output, bool verbose); bool CompareOutput(const std::string &bootFilename, const std::string &output, bool verbose);
std::vector<u32> TranslateDebugBufferToCompare(const GPUDebugBuffer *buffer, u32 stride, u32 h); std::vector<u32> TranslateDebugBufferToCompare(const GPUDebugBuffer *buffer, u32 stride, u32 h);
double CompareScreenshot(const std::vector<u32> &pixels, u32 stride, u32 w, u32 h, const std::string screenshotFilename, std::string &error); double CompareScreenshot(const std::vector<u32> &pixels, u32 stride, u32 w, u32 h, const std::string& screenshotFilename, std::string &error);