archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 16:31:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace all instances of wxString with std::string in all cases not

Browse source 
directly involved in either the GUI or other wxWidget classes like wxFile
This commit is contained in:
Peter Tissen 2014-04-01 02:33:55 +02:00
parent b1894ac6cb
commit 8ac226ae69
124 changed files with 1716 additions and 1502 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/Emu/ARMv7/ARMv7Thread.cpp
View file

@ -37,25 +37,31 @@ void ARMv7Thread::SetArg(const uint pos, const u64 arg)
assert(0);
}
wxString ARMv7Thread::RegsToString()
std::string ARMv7Thread::RegsToString()
{
wxString result = "Registers:\n=========\n";
std::string result = "Registers:\n=========\n";
for(int i=0; i<15; ++i)
{
result += wxString::Format("%s\t= 0x%08x\n", wxString(g_arm_reg_name[i]).wx_str(), GPR[i]);
result += fmt::Format("%s\t= 0x%08x\n", g_arm_reg_name[i], GPR[i]);
}
result += wxString::Format("APSR\t= 0x%08x [N: %d, Z: %d, C: %d, V: %d, Q: %d]\n", APSR.APSR, APSR.N, APSR.Z, APSR.C, APSR.V, APSR.Q);
result += fmt::Format("APSR\t= 0x%08x [N: %d, Z: %d, C: %d, V: %d, Q: %d]\n",
APSR.APSR,
fmt::by_value(APSR.N),
fmt::by_value(APSR.Z),
fmt::by_value(APSR.C),
fmt::by_value(APSR.V),
fmt::by_value(APSR.Q));
return result;
}
wxString ARMv7Thread::ReadRegString(wxString reg)
std::string ARMv7Thread::ReadRegString(const std::string& reg)
{
return wxEmptyString;
return "";
}
bool ARMv7Thread::WriteRegString(wxString reg, wxString value)
bool ARMv7Thread::WriteRegString(const std::string& reg, std::string value)
{
return true;
}