archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor simplifications to PPUProgramCompiler

Browse source
This commit is contained in:
Lioncash 2014-04-02 08:31:32 -04:00
parent b3e0441940
commit 990fca3e7b
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rpcs3/Emu/Cell/PPUProgramCompiler.cpp
View file

@ -12,7 +12,7 @@ InstrBase<TO>* GetInstruction(T* list, const std::string& str)
if(instr) if(instr)
{ {
if(instr->GetName().compare(str) == 0) if(instr->GetName() == str)
{ {
return instr; return instr;
} }
@ -393,7 +393,7 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg)
return; return;
} }
if(str.compare("rtoc") == 0) if(str == "rtoc")
{ {
arg.type = ARG_REG_R; arg.type = ARG_REG_R;
arg.value = 2; arg.value = 2;
@ -409,8 +409,7 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg)
} }
} }
u32 reg; u32 reg = std::stoul(str.substr(1, str.length() - 1));
sscanf(str.substr(1, str.length() - 1).c_str(), "%d", &reg);
if(reg >= 32) if(reg >= 32)
{ {
@ -418,7 +417,7 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg)
return; return;
} }
switch((char)str[0]) switch(str[0])
{ {
case 'r': arg.type = ARG_REG_R; break; case 'r': arg.type = ARG_REG_R; break;
case 'f': arg.type = ARG_REG_F; break; case 'f': arg.type = ARG_REG_F; break;
@ -476,7 +475,8 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg)
return; return;
} }
if(str.length() > 2 && str.substr(0, 2).compare("0x") == 0) // Hex numbers
if(str.length() > 2 && str.substr(0, 2) == "0x")
{ {
for(u32 i=2; i<str.length(); ++i) for(u32 i=2; i<str.length(); ++i)
{ {
@ -490,11 +490,8 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg)
return; return;
} }
u32 val;
sscanf(str.c_str(), "0x%x", &val);
arg.type = ARG_NUM16; arg.type = ARG_NUM16;
arg.value = val; arg.value = std::stoul(str, nullptr, 16);
return; return;
} }
@ -507,11 +504,8 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg)
} }
} }
u32 val;
sscanf(str.c_str(), "%d", &val);
arg.type = ARG_NUM; arg.type = ARG_NUM;
arg.value = val; arg.value = std::stoul(str);
} }
void CompilePPUProgram::LoadArgs() void CompilePPUProgram::LoadArgs()