ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debugger: fix static/extern issue which broke compilation 

Previously (on gcc) compilation would fail with:
pcsx2/DebugTools/DisR5900asm.cpp:58:37: error: ‘R5900::GPR_REG’ was
declared ‘extern’ and later ‘static’ [-fpermissive]
This commit is contained in:
Tobias Jakobi 2014-08-17 14:44:05 +02:00
parent 05b33012b7
commit 6eb0ecbe7c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcsx2/DebugTools/DisR5900asm.cpp
View File

@ -55,28 +55,31 @@ namespace R5900
#define DECODE_C2BC ((disasmOpcode >> 16) & 0x03) #define DECODE_C2BC ((disasmOpcode >> 16) & 0x03)
*/ */
/*************************CPUS REGISTERS**************************/ /*************************CPUS REGISTERS**************************/
static const char * const GPR_REG[32] = { const char * const GPR_REG[32] = {
"zero", "at", "v0", "v1", "a0", "a1", "a2", "a3", "zero", "at", "v0", "v1", "a0", "a1", "a2", "a3",
"t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7",
"s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7",
"t8", "t9", "k0", "k1", "gp", "sp", "fp", "ra" "t8", "t9", "k0", "k1", "gp", "sp", "fp", "ra"
}; };
static const char * const COP0_REG[32] ={
const char * const COP0_REG[32] ={
"Index","Random","EntryLo0","EntryLo1","Context","PageMask", "Index","Random","EntryLo0","EntryLo1","Context","PageMask",
"Wired","C0r7","BadVaddr","Count","EntryHi","Compare","Status", "Wired","C0r7","BadVaddr","Count","EntryHi","Compare","Status",
"Cause","EPC","PRId","Config","C0r17","C0r18","C0r19","C0r20", "Cause","EPC","PRId","Config","C0r17","C0r18","C0r19","C0r20",
"C0r21","C0r22","C0r23","Debug","Perf","C0r26","C0r27","TagLo", "C0r21","C0r22","C0r23","Debug","Perf","C0r26","C0r27","TagLo",
"TagHi","ErrorPC","C0r31" "TagHi","ErrorPC","C0r31"
}; };
//floating point cop1 Floating point reg //floating point cop1 Floating point reg
static const char * const COP1_REG_FP[32] ={ const char * const COP1_REG_FP[32] ={
"f00","f01","f02","f03","f04","f05","f06","f07", "f00","f01","f02","f03","f04","f05","f06","f07",
"f08","f09","f10","f11","f12","f13","f14","f15", "f08","f09","f10","f11","f12","f13","f14","f15",
"f16","f17","f18","f19","f20","f21","f21","f23", "f16","f17","f18","f19","f20","f21","f21","f23",
"f24","f25","f26","f27","f28","f29","f30","f31" "f24","f25","f26","f27","f28","f29","f30","f31"
}; };
//floating point cop1 control registers //floating point cop1 control registers
static const char * const COP1_REG_FCR[32] ={ const char * const COP1_REG_FCR[32] ={
"fcr00","fcr01","fcr02","fcr03","fcr04","fcr05","fcr06","fcr07", "fcr00","fcr01","fcr02","fcr03","fcr04","fcr05","fcr06","fcr07",
"fcr08","fcr09","fcr10","fcr11","fcr12","fcr13","fcr14","fcr15", "fcr08","fcr09","fcr10","fcr11","fcr12","fcr13","fcr14","fcr15",
"fcr16","fcr17","fcr18","fcr19","fcr20","fcr21","fcr21","fcr23", "fcr16","fcr17","fcr18","fcr19","fcr20","fcr21","fcr21","fcr23",
@ -84,22 +87,22 @@ static const char * const COP1_REG_FCR[32] ={
}; };
//floating point cop2 reg //floating point cop2 reg
static const char * const COP2_REG_FP[32] ={ const char * const COP2_REG_FP[32] ={
"vf00","vf01","vf02","vf03","vf04","vf05","vf06","vf07", "vf00","vf01","vf02","vf03","vf04","vf05","vf06","vf07",
"vf08","vf09","vf10","vf11","vf12","vf13","vf14","vf15", "vf08","vf09","vf10","vf11","vf12","vf13","vf14","vf15",
"vf16","vf17","vf18","vf19","vf20","vf21","vf21","vf23", "vf16","vf17","vf18","vf19","vf20","vf21","vf21","vf23",
"vf24","vf25","vf26","vf27","vf28","vf29","vf30","vf31" "vf24","vf25","vf26","vf27","vf28","vf29","vf30","vf31"
}; };
//cop2 control registers
static const char * const COP2_REG_CTL[32] ={ //cop2 control registers
const char * const COP2_REG_CTL[32] ={
"vi00","vi01","vi02","vi03","vi04","vi05","vi06","vi07", "vi00","vi01","vi02","vi03","vi04","vi05","vi06","vi07",
"vi08","vi09","vi10","vi11","vi12","vi13","vi14","vi15", "vi08","vi09","vi10","vi11","vi12","vi13","vi14","vi15",
"Status","MACflag","ClipFlag","c2c19","R","I","Q","c2c23", "Status","MACflag","ClipFlag","c2c19","R","I","Q","c2c23",
"c2c24","c2c25","TPC","CMSAR0","FBRST","VPU-STAT","c2c30","CMSAR1" "c2c24","c2c25","TPC","CMSAR0","FBRST","VPU-STAT","c2c30","CMSAR1"
}; };
const char * const R5900::COP2_VFnames[4] = { "x", "y", "z", "w" }; const char * const COP2_VFnames[4] = { "x", "y", "z", "w" };
void P_COP2_Unknown( std::string& output ); void P_COP2_Unknown( std::string& output );
void P_COP2_SPECIAL2( std::string& output ); void P_COP2_SPECIAL2( std::string& output );