From 6952be5ce495ee4887a9b1bdcba3cd3c5e992e26 Mon Sep 17 00:00:00 2001 From: Eladash Date: Fri, 28 Aug 2020 09:52:05 +0300 Subject: [PATCH] Debugger: Replace SPU register perefix '$' with 'r' --- rpcs3/Emu/Cell/SPUDisAsm.h | 108 ++++++++++++++++++------------------- rpcs3/Emu/System.cpp | 2 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/rpcs3/Emu/Cell/SPUDisAsm.h b/rpcs3/Emu/Cell/SPUDisAsm.h index ee801aedef..b35317fdb6 100644 --- a/rpcs3/Emu/Cell/SPUDisAsm.h +++ b/rpcs3/Emu/Cell/SPUDisAsm.h @@ -3,67 +3,67 @@ #include "PPCDisAsm.h" #include "SPUOpcodes.h" -static const char* spu_reg_name[128] = +static constexpr const char* spu_reg_name[128] = { - "$LR", "$SP", "$2", "$3", "$4", "$5", "$6", "$7", - "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", - "$16", "$17", "$18", "$19", "$20", "$21", "$22", "$23", - "$24", "$25", "$26", "$27", "$28", "$29", "$30", "$31", - "$32", "$33", "$34", "$35", "$36", "$37", "$38", "$39", - "$40", "$41", "$42", "$43", "$44", "$45", "$46", "$47", - "$48", "$49", "$50", "$51", "$52", "$53", "$54", "$55", - "$56", "$57", "$58", "$59", "$60", "$61", "$62", "$63", - "$64", "$65", "$66", "$67", "$68", "$69", "$70", "$71", - "$72", "$73", "$74", "$75", "$76", "$77", "$78", "$79", - "$80", "$81", "$82", "$83", "$84", "$85", "$86", "$87", - "$88", "$89", "$90", "$91", "$92", "$93", "$94", "$95", - "$96", "$97", "$98", "$99", "$100", "$101", "$102", "$103", - "$104", "$105", "$106", "$107", "$108", "$109", "$110", "$111", - "$112", "$113", "$114", "$115", "$116", "$117", "$118", "$119", - "$120", "$121", "$122", "$123", "$124", "$125", "$126", "$127", + "lr", "sp", "r2", "r3", "r4", "r5", "r6", "r7", + "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", + "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23", + "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31", + "r32", "r33", "r34", "r35", "r36", "r37", "r38", "r39", + "r40", "r41", "r42", "r43", "r44", "r45", "r46", "r47", + "r48", "r49", "r50", "r51", "r52", "r53", "r54", "r55", + "r56", "r57", "r58", "r59", "r60", "r61", "r62", "r63", + "r64", "r65", "r66", "r67", "r68", "r69", "r70", "r71", + "r72", "r73", "r74", "r75", "r76", "r77", "r78", "r79", + "r80", "r81", "r82", "r83", "r84", "r85", "r86", "r87", + "r88", "r89", "r90", "r91", "r92", "r93", "r94", "r95", + "r96", "r97", "r98", "r99", "r100", "r101", "r102", "r103", + "r104", "r105", "r106", "r107", "r108", "r109", "r110", "r111", + "r112", "r113", "r114", "r115", "r116", "r117", "r118", "r119", + "r120", "r121", "r122", "r123", "r124", "r125", "r126", "r127", }; -static const char* spu_spreg_name[128] = +static constexpr const char* spu_spreg_name[128] = { - "$sp0", "$sp1", "$sp2", "$sp3", "$sp4", "$sp5", "$sp6", "$sp7", - "$sp8", "$sp9", "$sp10", "$sp11", "$sp12", "$sp13", "$sp14", "$sp15", - "$sp16", "$sp17", "$sp18", "$sp19", "$sp20", "$sp21", "$sp22", "$sp23", - "$sp24", "$sp25", "$sp26", "$sp27", "$sp28", "$sp29", "$sp30", "$sp31", - "$sp32", "$sp33", "$sp34", "$sp35", "$sp36", "$sp37", "$sp38", "$sp39", - "$sp40", "$sp41", "$sp42", "$sp43", "$sp44", "$sp45", "$sp46", "$sp47", - "$sp48", "$sp49", "$sp50", "$sp51", "$sp52", "$sp53", "$sp54", "$sp55", - "$sp56", "$sp57", "$sp58", "$sp59", "$sp60", "$sp61", "$sp62", "$sp63", - "$sp64", "$sp65", "$sp66", "$sp67", "$sp68", "$sp69", "$sp70", "$sp71", - "$sp72", "$sp73", "$sp74", "$sp75", "$sp76", "$sp77", "$sp78", "$sp79", - "$sp80", "$sp81", "$sp82", "$sp83", "$sp84", "$sp85", "$sp86", "$sp87", - "$sp88", "$sp89", "$sp90", "$sp91", "$sp92", "$sp93", "$sp94", "$sp95", - "$sp96", "$sp97", "$sp98", "$sp99", "$sp100", "$sp101", "$sp102", "$sp103", - "$sp104", "$sp105", "$sp106", "$sp107", "$sp108", "$sp109", "$sp110", "$sp111", - "$sp112", "$sp113", "$sp114", "$sp115", "$sp116", "$sp117", "$sp118", "$sp119", - "$sp120", "$sp121", "$sp122", "$sp123", "$sp124", "$sp125", "$sp126", "$sp127", + "spr0", "spr1", "spr2", "spr3", "spr4", "spr5", "spr6", "spr7", + "spr8", "spr9", "spr10", "spr11", "spr12", "spr13", "spr14", "spr15", + "spr16", "spr17", "spr18", "spr19", "spr20", "spr21", "spr22", "spr23", + "spr24", "spr25", "spr26", "spr27", "spr28", "spr29", "spr30", "spr31", + "spr32", "spr33", "spr34", "spr35", "spr36", "spr37", "spr38", "spr39", + "spr40", "spr41", "spr42", "spr43", "spr44", "spr45", "spr46", "spr47", + "spr48", "spr49", "spr50", "spr51", "spr52", "spr53", "spr54", "spr55", + "spr56", "spr57", "spr58", "spr59", "spr60", "spr61", "spr62", "spr63", + "spr64", "spr65", "spr66", "spr67", "spr68", "spr69", "spr70", "spr71", + "spr72", "spr73", "spr74", "spr75", "spr76", "spr77", "spr78", "spr79", + "spr80", "spr81", "spr82", "spr83", "spr84", "spr85", "spr86", "spr87", + "spr88", "spr89", "spr90", "spr91", "spr92", "spr93", "spr94", "spr95", + "spr96", "spr97", "spr98", "spr99", "spr100", "spr101", "spr102", "spr103", + "spr104", "spr105", "spr106", "spr107", "spr108", "spr109", "spr110", "spr111", + "spr112", "spr113", "spr114", "spr115", "spr116", "spr117", "spr118", "spr119", + "spr120", "spr121", "spr122", "spr123", "spr124", "spr125", "spr126", "spr127", }; -static const char* spu_ch_name[128] = +static constexpr const char* spu_ch_name[128] = { - "$SPU_RdEventStat", "$SPU_WrEventMask", "$SPU_WrEventAck", "$SPU_RdSigNotify1", - "$SPU_RdSigNotify2", "$ch5", "$ch6", "$SPU_WrDec", "$SPU_RdDec", - "$MFC_WrMSSyncReq", "$ch10", "$SPU_RdEventMask", "$MFC_RdTagMask", "$SPU_RdMachStat", - "$SPU_WrSRR0", "$SPU_RdSRR0", "$MFC_LSA", "$MFC_EAH", "$MFC_EAL", "$MFC_Size", - "$MFC_TagID", "$MFC_Cmd", "$MFC_WrTagMask", "$MFC_WrTagUpdate", "$MFC_RdTagStat", - "$MFC_RdListStallStat", "$MFC_WrListStallAck", "$MFC_RdAtomicStat", - "$SPU_WrOutMbox", "$SPU_RdInMbox", "$SPU_WrOutIntrMbox", "$ch31", "$ch32", - "$ch33", "$ch34", "$ch35", "$ch36", "$ch37", "$ch38", "$ch39", "$ch40", - "$ch41", "$ch42", "$ch43", "$ch44", "$ch45", "$ch46", "$ch47", "$ch48", - "$ch49", "$ch50", "$ch51", "$ch52", "$ch53", "$ch54", "$ch55", "$ch56", - "$ch57", "$ch58", "$ch59", "$ch60", "$ch61", "$ch62", "$ch63", "$ch64", - "$ch65", "$ch66", "$ch67", "$ch68", "$ch69", "$ch70", "$ch71", "$ch72", - "$ch73", "$ch74", "$ch75", "$ch76", "$ch77", "$ch78", "$ch79", "$ch80", - "$ch81", "$ch82", "$ch83", "$ch84", "$ch85", "$ch86", "$ch87", "$ch88", - "$ch89", "$ch90", "$ch91", "$ch92", "$ch93", "$ch94", "$ch95", "$ch96", - "$ch97", "$ch98", "$ch99", "$ch100", "$ch101", "$ch102", "$ch103", "$ch104", - "$ch105", "$ch106", "$ch107", "$ch108", "$ch109", "$ch110", "$ch111", "$ch112", - "$ch113", "$ch114", "$ch115", "$ch116", "$ch117", "$ch118", "$ch119", "$ch120", - "$ch121", "$ch122", "$ch123", "$ch124", "$ch125", "$ch126", "$ch127", + "SPU_RdEventStat", "SPU_WrEventMask", "SPU_WrEventAck", "SPU_RdSigNotify1", + "SPU_RdSigNotify2", "ch5", "ch6", "SPU_WrDec", "SPU_RdDec", + "MFC_WrMSSyncReq", "ch10", "SPU_RdEventMask", "MFC_RdTagMask", "SPU_RdMachStat", + "SPU_WrSRR0", "SPU_RdSRR0", "MFC_LSA", "MFC_EAH", "MFC_EAL", "MFC_Size", + "MFC_TagID", "MFC_Cmd", "MFC_WrTagMask", "MFC_WrTagUpdate", "MFC_RdTagStat", + "MFC_RdListStallStat", "MFC_WrListStallAck", "MFC_RdAtomicStat", + "SPU_WrOutMbox", "SPU_RdInMbox", "SPU_WrOutIntrMbox", "ch31", "ch32", + "ch33", "ch34", "ch35", "ch36", "ch37", "ch38", "ch39", "ch40", + "ch41", "ch42", "ch43", "ch44", "ch45", "ch46", "ch47", "ch48", + "ch49", "ch50", "ch51", "ch52", "ch53", "ch54", "ch55", "ch56", + "ch57", "ch58", "ch59", "ch60", "ch61", "ch62", "ch63", "ch64", + "ch65", "ch66", "ch67", "ch68", "ch69", "ch70", "ch71", "ch72", + "ch73", "ch74", "ch75", "ch76", "ch77", "ch78", "ch79", "ch80", + "ch81", "ch82", "ch83", "ch84", "ch85", "ch86", "ch87", "ch88", + "ch89", "ch90", "ch91", "ch92", "ch93", "ch94", "ch95", "ch96", + "ch97", "ch98", "ch99", "ch100", "ch101", "ch102", "ch103", "ch104", + "ch105", "ch106", "ch107", "ch108", "ch109", "ch110", "ch111", "ch112", + "ch113", "ch114", "ch115", "ch116", "ch117", "ch118", "ch119", "ch120", + "ch121", "ch122", "ch123", "ch124", "ch125", "ch126", "ch127", }; class SPUDisAsm final : public PPCDisAsm diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 50dec90191..a844bd4b23 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -766,7 +766,7 @@ std::string Emulator::GetSfoDirFromGamePath(const std::string& game_path, const if (entry.is_directory && fs::is_file(sfo_path)) { - const auto psf = psf::load_object(fs::file(sfo_path)); + const auto psf = psf::load_object(fs::file(sfo_path)); const auto serial = psf::get_string(psf, "TITLE_ID"); if (serial == title_id) {