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

Update the Linux gui to be in sync with recent changes. Make some chars const, to match what they are used for, and get rid of some annoying warnings. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@452 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-12-19 01:50:09 +00:00 committed by Gregory Hainaut
parent 6ce0909c3a
commit 7ade42c90c
24 changed files with 60 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/CDVD.c
View File

@ -36,16 +36,16 @@ static cdvdStruct cdvd;
static int cdCaseopen; static int cdCaseopen;
char *mg_zones[8] = {"Japan", "USA", "Europe", "Oceania", "Asia", "Russia", "China", "Mexico"}; const char *mg_zones[8] = {"Japan", "USA", "Europe", "Oceania", "Asia", "Russia", "China", "Mexico"};
char *nCmdName[0x100]= { const char *nCmdName[0x100]= {
"CdSync", "CdNop", "CdStandby", "CdStop", "CdSync", "CdNop", "CdStandby", "CdStop",
"CdPause", "CdSeek", "CdRead", "CdReadCDDA", "CdPause", "CdSeek", "CdRead", "CdReadCDDA",
"CdReadDVDV", "CdGetToc", "", "NCMD_B", "CdReadDVDV", "CdGetToc", "", "NCMD_B",
"CdReadKey", "", "sceCdReadXCDDA", "sceCdChgSpdlCtrl", "CdReadKey", "", "sceCdReadXCDDA", "sceCdChgSpdlCtrl",
}; };
char *sCmdName[0x100]= { const char *sCmdName[0x100]= {
"", "sceCdGetDiscType", "sceCdReadSubQ", "subcommands",//sceCdGetMecaconVersion, read/write console id, read renewal date "", "sceCdGetDiscType", "sceCdReadSubQ", "subcommands",//sceCdGetMecaconVersion, read/write console id, read renewal date
"", "sceCdTrayState", "sceCdTrayCtrl", "", "", "sceCdTrayState", "sceCdTrayCtrl", "",
"sceCdReadClock", "sceCdWriteClock", "sceCdReadNVM", "sceCdWriteNVM", "sceCdReadClock", "sceCdWriteClock", "sceCdReadNVM", "sceCdWriteNVM",

2
pcsx2/CdRom.c
View File

@ -59,7 +59,7 @@
#define ASYNC 254 #define ASYNC 254
/* don't set 255, it's reserved */ /* don't set 255, it's reserved */
char *CmdName[0x100]= { const char *CmdName[0x100]= {
"CdlSync", "CdlNop", "CdlSetloc", "CdlPlay", "CdlSync", "CdlNop", "CdlSetloc", "CdlPlay",
"CdlForward", "CdlBackward", "CdlReadN", "CdlStandby", "CdlForward", "CdlBackward", "CdlReadN", "CdlStandby",
"CdlStop", "CdlPause", "CdlInit", "CdlMute", "CdlStop", "CdlPause", "CdlInit", "CdlMute",

6
pcsx2/DebugTools/Debug.h
View File

@ -43,9 +43,9 @@ char* disVU1MicroLF(u32 code, u32 pc);
char* disR3000AF(u32 code, u32 pc); char* disR3000AF(u32 code, u32 pc);
extern char *CP2VFnames[]; extern const char *CP2VFnames[];
extern char *disRNameCP2f[]; extern const char *disRNameCP2f[];
extern char *disRNameCP2i[]; extern const char *disRNameCP2i[];
//that way is slower but you now not need to compile every time ;P //that way is slower but you now not need to compile every time ;P
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD

6
pcsx2/DebugTools/DisR3000A.c
View File

@ -21,20 +21,20 @@
static char ostr[1024]; static char ostr[1024];
// Names of registers // Names of registers
static char *disRNameGPR[] = { static const char *disRNameGPR[] = {
"r0", "at", "v0", "v1", "a0", "a1","a2", "a3", "r0", "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 char *disRNameCP0[] = { static const char *disRNameCP0[] = {
"Index" , "Random" , "EntryLo0", "EntryLo1", "Context" , "PageMask" , "Wired" , "*Check me*", "Index" , "Random" , "EntryLo0", "EntryLo1", "Context" , "PageMask" , "Wired" , "*Check me*",
"BadVAddr" , "Count" , "EntryHi" , "Compare" , "Status" , "Cause" , "ExceptPC" , "PRevID" , "BadVAddr" , "Count" , "EntryHi" , "Compare" , "Status" , "Cause" , "ExceptPC" , "PRevID" ,
"Config" , "LLAddr" , "WatchLo" , "WatchHi" , "XContext", "*RES*" , "*RES*" , "*RES*" , "Config" , "LLAddr" , "WatchLo" , "WatchHi" , "XContext", "*RES*" , "*RES*" , "*RES*" ,
"*RES*" , "*RES* " , "PErr" , "CacheErr", "TagLo" , "TagHi" , "ErrorEPC" , "*RES*" }; "*RES*" , "*RES* " , "PErr" , "CacheErr", "TagLo" , "TagHi" , "ErrorEPC" , "*RES*" };
// Type deffinition of our functions // Type definition of our functions
typedef char* (*TdisR3000AF)(u32 code, u32 pc); typedef char* (*TdisR3000AF)(u32 code, u32 pc);

4
pcsx2/DebugTools/DisR3000asm.c
View File

@ -26,13 +26,13 @@
unsigned long IOP_opcode_addr; unsigned long IOP_opcode_addr;
char *GPR_IOP_REG[32] = { const char *GPR_IOP_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"
}; };
char *COP0_IOP_REG[32] ={ const char *COP0_IOP_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",

16
pcsx2/DebugTools/DisR5900.c
View File

@ -27,45 +27,45 @@
static char ostr[1024]; static char ostr[1024];
// Names of registers // Names of registers
char *disRNameGPR[] = { const char *disRNameGPR[] = {
"r0", "at", "v0", "v1", "a0", "a1","a2", "a3", "r0", "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", "hi", "lo"}; // lo,hi used in rec "t8", "t9", "k0", "k1", "gp", "sp","fp", "ra", "hi", "lo"}; // lo,hi used in rec
char *disRNameCP0[] = { const char *disRNameCP0[] = {
"Index" , "Random" , "EntryLo0" , "EntryLo1", "Context" , "PageMask" , "Wired" , "*RES*", "Index" , "Random" , "EntryLo0" , "EntryLo1", "Context" , "PageMask" , "Wired" , "*RES*",
"BadVAddr" , "Count" , "EntryHi" , "Compare" , "Status" , "Cause" , "ExceptPC" , "PRevID", "BadVAddr" , "Count" , "EntryHi" , "Compare" , "Status" , "Cause" , "ExceptPC" , "PRevID",
"Config" , "LLAddr" , "WatchLo" , "WatchHi" , "*RES*" , "*RES*" , "*RES*" , "Debug", "Config" , "LLAddr" , "WatchLo" , "WatchHi" , "*RES*" , "*RES*" , "*RES*" , "Debug",
"DEPC" , "PerfCnt" , "ErrCtl" , "CacheErr", "TagLo" , "TagHi" , "ErrorEPC" , "DESAVE"}; "DEPC" , "PerfCnt" , "ErrCtl" , "CacheErr", "TagLo" , "TagHi" , "ErrorEPC" , "DESAVE"};
char *disRNameCP1[] = { const char *disRNameCP1[] = {
"FPR0" , "FPR1" , "FPR2" , "FPR3" , "FPR4" , "FPR5" , "FPR6" , "FPR7", "FPR0" , "FPR1" , "FPR2" , "FPR3" , "FPR4" , "FPR5" , "FPR6" , "FPR7",
"FPR8" , "FPR9" , "FPR10", "FPR11", "FPR12", "FPR13", "FPR14", "FPR15", "FPR8" , "FPR9" , "FPR10", "FPR11", "FPR12", "FPR13", "FPR14", "FPR15",
"FPR16", "FPR17", "FPR18", "FPR19", "FPR20", "FPR21", "FPR22", "FPR23", "FPR16", "FPR17", "FPR18", "FPR19", "FPR20", "FPR21", "FPR22", "FPR23",
"FPR24", "FPR25", "FPR26", "FPR27", "FPR28", "FPR29", "FPR30", "FPR31"}; "FPR24", "FPR25", "FPR26", "FPR27", "FPR28", "FPR29", "FPR30", "FPR31"};
char *disRNameCP1c[] = { const char *disRNameCP1c[] = {
"FRevID", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "FRevID", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*",
"*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*",
"*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*",
"*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "FStatus"}; "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "FStatus"};
char *disRNameCP2f[] = { const char *disRNameCP2f[] = {
"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", "VF22", "VF23", "VF16", "VF17", "VF18", "VF19", "VF20", "VF21", "VF22", "VF23",
"VF24", "VF25", "VF26", "VF27", "VF28", "VF29", "VF30", "VF31"}; "VF24", "VF25", "VF26", "VF27", "VF28", "VF29", "VF30", "VF31"};
char *disRNameCP2i[] = { const char *disRNameCP2i[] = {
"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", "MAC", "Clip", "*RES*", "R", "I", "Q", "*RES*", "Status", "MAC", "Clip", "*RES*", "R", "I", "Q", "*RES*",
"*RES*", "*RES*", "TPC", "CMSAR0", "FBRST", "VPU-STAT", "*RES*", "CMSAR1"}; "*RES*", "*RES*", "TPC", "CMSAR0", "FBRST", "VPU-STAT", "*RES*", "CMSAR1"};
char *CP2VFnames[] = { "x", "y", "z", "w" }; const char *CP2VFnames[] = { "x", "y", "z", "w" };
// Type deffinition of our functions // Type definition of our functions
#define DisFInterface (u32 code, u32 pc) #define DisFInterface (u32 code, u32 pc)
#define DisFInterfaceT (u32, u32) #define DisFInterfaceT (u32, u32)
#define DisFInterfaceN (code, pc) #define DisFInterfaceN (code, pc)

16
pcsx2/DebugTools/DisR5900asm.c
View File

@ -49,13 +49,13 @@ unsigned long opcode_addr;
#define DECODE_C2BC ((cpuRegs.code >> 16) & 0x03) #define DECODE_C2BC ((cpuRegs.code >> 16) & 0x03)
*/ */
/*************************CPUS REGISTERS**************************/ /*************************CPUS REGISTERS**************************/
char *GPR_REG[32] = { const char *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"
}; };
char *COP0_REG[32] ={ const char *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",
@ -63,14 +63,14 @@ char *COP0_REG[32] ={
"TagHi","ErrorPC","C0r31" "TagHi","ErrorPC","C0r31"
}; };
//floating point cop1 Floating point reg //floating point cop1 Floating point reg
char *COP1_REG_FP[32] ={ const char *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
char *COP1_REG_FCR[32] ={ const char *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",
@ -78,7 +78,7 @@ char *COP1_REG_FCR[32] ={
}; };
//floating point cop2 reg //floating point cop2 reg
char *COP2_REG_FP[32] ={ const char *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",
@ -86,17 +86,13 @@ char *COP2_REG_FP[32] ={
}; };
//cop2 control registers //cop2 control registers
char *COP2_REG_CTL[32] ={ const char *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"
}; };
//**************************************************************** //****************************************************************
void P_SpecialOpcode(char *buf); void P_SpecialOpcode(char *buf);
void P_REGIMMOpcode(char *buf); void P_REGIMMOpcode(char *buf);

2
pcsx2/DebugTools/DisVU1Micro.c
View File

@ -110,7 +110,7 @@ typedef char* (*TdisR5900F)DisFInterface;
#define _Ftf_ ((code >> 23) & 0x03) #define _Ftf_ ((code >> 23) & 0x03)
/********************************************************* /*********************************************************
* Unknow instruction (would generate an exception) * * Unknown instruction (would generate an exception) *
* Format: ? * * Format: ? *
*********************************************************/ *********************************************************/
extern char* disNULL DisFInterface; extern char* disNULL DisFInterface;

2
pcsx2/Interpreter.c
View File

@ -27,7 +27,7 @@
extern u32 maxrecmem; extern u32 maxrecmem;
char *bios[256]={ const char *bios[256]={
//0x00 //0x00
"RFU000_FullReset", "ResetEE", "SetGsCrt", "RFU003", "RFU000_FullReset", "ResetEE", "SetGsCrt", "RFU003",
"Exit", "RFU005", "LoadExecPS2", "ExecPS2", "Exit", "RFU005", "LoadExecPS2", "ExecPS2",

20
pcsx2/Linux/GtkGui.cpp
View File

@ -670,8 +670,8 @@ void on_Speed_Hacks(GtkMenuItem *menuitem, gpointer user_data)
set_checked(SpeedHacksDlg, "check_Disable_Underflow", (Config.Hacks & FLAG_NO_UNDERFLOW)); set_checked(SpeedHacksDlg, "check_Disable_Underflow", (Config.Hacks & FLAG_NO_UNDERFLOW));
set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", (Config.Hacks & FLAG_IOP_2_SYNC)); set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", (Config.Hacks & FLAG_IOP_2_SYNC));
set_checked(SpeedHacksDlg, "check_Triple_Sync",(Config.Hacks & FLAG_TRIPLE_SYNC)); set_checked(SpeedHacksDlg, "check_Triple_Sync",(Config.Hacks & FLAG_TRIPLE_SYNC));
set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", (Config.Hacks & FLAG_NO_VU_FLAGS)); //set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", (Config.Hacks & FLAG_NO_VU_FLAGS));
set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", (Config.Hacks & FLAG_NO_FPU_FLAGS)); //set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", (Config.Hacks & FLAG_NO_FPU_FLAGS));
set_checked(SpeedHacksDlg, "check_ESC_Hack", (Config.Hacks & FLAG_ESC)); set_checked(SpeedHacksDlg, "check_ESC_Hack", (Config.Hacks & FLAG_ESC));
gtk_widget_show_all(SpeedHacksDlg); gtk_widget_show_all(SpeedHacksDlg);
@ -688,8 +688,8 @@ void on_Speed_Hack_Compatability(GtkButton *button, gpointer user_data)
set_checked(SpeedHacksDlg, "check_Disable_Underflow", TRUE); set_checked(SpeedHacksDlg, "check_Disable_Underflow", TRUE);
set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", FALSE); set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", FALSE);
set_checked(SpeedHacksDlg, "check_Triple_Sync", FALSE); set_checked(SpeedHacksDlg, "check_Triple_Sync", FALSE);
set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", TRUE); //set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", TRUE);
set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", TRUE); //set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", TRUE);
} }
void on_Speed_Hack_Normal(GtkButton *button, gpointer user_data) void on_Speed_Hack_Normal(GtkButton *button, gpointer user_data)
@ -702,8 +702,8 @@ void on_Speed_Hack_Normal(GtkButton *button, gpointer user_data)
set_checked(SpeedHacksDlg, "check_Disable_Underflow", FALSE); set_checked(SpeedHacksDlg, "check_Disable_Underflow", FALSE);
set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", FALSE); set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", FALSE);
set_checked(SpeedHacksDlg, "check_Triple_Sync", FALSE); set_checked(SpeedHacksDlg, "check_Triple_Sync", FALSE);
set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", FALSE); //set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", FALSE);
set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", FALSE); //set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", FALSE);
} }
void on_Speed_Hack_Speed(GtkButton *button, gpointer user_data) void on_Speed_Hack_Speed(GtkButton *button, gpointer user_data)
@ -716,8 +716,8 @@ void on_Speed_Hack_Speed(GtkButton *button, gpointer user_data)
set_checked(SpeedHacksDlg, "check_Disable_Underflow", TRUE); set_checked(SpeedHacksDlg, "check_Disable_Underflow", TRUE);
set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", TRUE); set_checked(SpeedHacksDlg, "check_IOP_Double_Sync", TRUE);
set_checked(SpeedHacksDlg, "check_Triple_Sync", FALSE); set_checked(SpeedHacksDlg, "check_Triple_Sync", FALSE);
set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", TRUE); //set_checked(SpeedHacksDlg, "check_Disable_VU_Flags", TRUE);
set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", TRUE); //set_checked(SpeedHacksDlg, "check_Disable_FPU_Flags", TRUE);
} }
@ -742,8 +742,8 @@ void on_Speed_Hack_OK(GtkButton *button, gpointer user_data)
Config.Hacks |= is_checked(SpeedHacksDlg, "check_Disable_Underflow") ? FLAG_NO_UNDERFLOW : 0; Config.Hacks |= is_checked(SpeedHacksDlg, "check_Disable_Underflow") ? FLAG_NO_UNDERFLOW : 0;
Config.Hacks |= is_checked(SpeedHacksDlg, "check_IOP_Double_Sync") ? FLAG_IOP_2_SYNC : 0; Config.Hacks |= is_checked(SpeedHacksDlg, "check_IOP_Double_Sync") ? FLAG_IOP_2_SYNC : 0;
Config.Hacks |= is_checked(SpeedHacksDlg, "check_Triple_Sync") ? FLAG_TRIPLE_SYNC : 0; Config.Hacks |= is_checked(SpeedHacksDlg, "check_Triple_Sync") ? FLAG_TRIPLE_SYNC : 0;
Config.Hacks |= is_checked(SpeedHacksDlg, "check_Disable_VU_Flags") ? FLAG_NO_VU_FLAGS : 0; //Config.Hacks |= is_checked(SpeedHacksDlg, "check_Disable_VU_Flags") ? FLAG_NO_VU_FLAGS : 0;
Config.Hacks |= is_checked(SpeedHacksDlg, "check_Disable_FPU_Flags")? FLAG_NO_FPU_FLAGS : 0; //Config.Hacks |= is_checked(SpeedHacksDlg, "check_Disable_FPU_Flags")? FLAG_NO_FPU_FLAGS : 0;
Config.Hacks |= is_checked(SpeedHacksDlg, "check_ESC_Hack") ? FLAG_ESC : 0; Config.Hacks |= is_checked(SpeedHacksDlg, "check_ESC_Hack") ? FLAG_ESC : 0;
switch (gtk_combo_box_get_active(GTK_COMBO_BOX(lookup_widget(SpeedHacksDlg, "ComboFPUOverflow")))) { switch (gtk_combo_box_get_active(GTK_COMBO_BOX(lookup_widget(SpeedHacksDlg, "ComboFPUOverflow")))) {

0
pcsx2/Linux/LnxMain.c → pcsx2/Linux/LnxMain.cpp
View File

2
pcsx2/Linux/LnxMain.h
View File

@ -23,7 +23,7 @@
char* g_pRunGSState = NULL; char* g_pRunGSState = NULL;
char* phelpmsg = const char* phelpmsg =
"\tpcsx2 [options] [file]\n\n" "\tpcsx2 [options] [file]\n\n"
"-cfg [file] {configuration file}\n" "-cfg [file] {configuration file}\n"
"-efile [efile] {0 - reset, 1 - runcd (default), 2 - loadelf}\n" "-efile [efile] {0 - reset, 1 - runcd (default), 2 - loadelf}\n"

2
pcsx2/Linux/Makefile.am
View File

@ -3,7 +3,7 @@ INCLUDES = $(shell pkg-config --cflags gtk+-2.0) -I@srcdir@/../
bin_PROGRAMS = pcsx2 bin_PROGRAMS = pcsx2
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
pcsx2_SOURCES = Pref.cpp interface.c ConfigDlg.cpp DebugDlg.cpp GtkGui.cpp LnxMain.c support.c pcsx2_SOURCES = Pref.cpp interface.c ConfigDlg.cpp DebugDlg.cpp GtkGui.cpp LnxMain.cpp support.c
pcsx2_LDFLAGS = pcsx2_LDFLAGS =

1
pcsx2/Linux/interface.c
View File

@ -618,7 +618,6 @@ create_GameFixDlg (void)
check_Slow_DVD = gtk_check_button_new_with_mnemonic (_("Slow DVD access (fixes Tales of the Abyss) (Not currently needed)")); check_Slow_DVD = gtk_check_button_new_with_mnemonic (_("Slow DVD access (fixes Tales of the Abyss) (Not currently needed)"));
gtk_widget_show (check_Slow_DVD); gtk_widget_show (check_Slow_DVD);
gtk_box_pack_start (GTK_BOX (vbox30), check_Slow_DVD, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox30), check_Slow_DVD, FALSE, FALSE, 0);
gtk_widget_set_sensitive (check_Slow_DVD, FALSE);
check_VU_Branch = gtk_check_button_new_with_mnemonic (_("VU Branch Hack - Special fix for Magna Carta; Breaks Crash Bandicoot!")); check_VU_Branch = gtk_check_button_new_with_mnemonic (_("VU Branch Hack - Special fix for Magna Carta; Breaks Crash Bandicoot!"));
gtk_widget_show (check_VU_Branch); gtk_widget_show (check_VU_Branch);

22
pcsx2/Linux/pcsx2.glade
View File

@ -919,6 +919,7 @@ Enabled (Helps SPS, Slow)</property>
<child> <child>
<widget class="GtkCheckButton" id="check_Disable_VU_Flags"> <widget class="GtkCheckButton" id="check_Disable_VU_Flags">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label" translatable="yes">Disable Extra VU Flags - When checked, PCSX2 doesn't set some flags that are rarely used by games. ( Speedup! )</property> <property name="label" translatable="yes">Disable Extra VU Flags - When checked, PCSX2 doesn't set some flags that are rarely used by games. ( Speedup! )</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -938,6 +939,7 @@ Enabled (Helps SPS, Slow)</property>
<child> <child>
<widget class="GtkCheckButton" id="check_Disable_FPU_Flags"> <widget class="GtkCheckButton" id="check_Disable_FPU_Flags">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label" translatable="yes">Disable Extra FPU Flags - When checked, PCSX2 doesn't set some flags that are rarely used by games. ( Speedup! )</property> <property name="label" translatable="yes">Disable Extra FPU Flags - When checked, PCSX2 doesn't set some flags that are rarely used by games. ( Speedup! )</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -1319,26 +1321,6 @@ Enabled (Helps SPS, Slow)</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkCheckButton" id="check_Slow_DVD">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Slow DVD access (fixes Tales of the Abyss) (Not currently needed)</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child> <child>
<widget class="GtkCheckButton" id="check_VU_Branch"> <widget class="GtkCheckButton" id="check_VU_Branch">
<property name="visible">True</property> <property name="visible">True</property>

8
pcsx2/Misc.c
View File

@ -55,7 +55,7 @@ u32 BiosVersion;
char CdromId[12]; char CdromId[12];
static int g_Pcsx2Recording = 0; // true 1 if recording video and sound static int g_Pcsx2Recording = 0; // true 1 if recording video and sound
char *LabelAuthors = { N_( const char *LabelAuthors = { N_(
"PCSX2, a PS2 emulator\n\n" "PCSX2, a PS2 emulator\n\n"
"originally written by:\n" "originally written by:\n"
"saqib, refraction, zerofrog,\n" "saqib, refraction, zerofrog,\n"
@ -72,7 +72,7 @@ char *LabelAuthors = { N_(
"Webmasters: CKemu, Falcon4ever") "Webmasters: CKemu, Falcon4ever")
}; };
char *LabelGreets = { N_( const char *LabelGreets = { N_(
"Greets to: Bobbi, Keith, CpUMasteR, Nave, Snake785\n\n" "Greets to: Bobbi, Keith, CpUMasteR, Nave, Snake785\n\n"
"Special thanks to: Gigaherz, Gabest, Sjeep, Dreamtime, F|RES, BGnome, MrBrown, \n" "Special thanks to: Gigaherz, Gabest, Sjeep, Dreamtime, F|RES, BGnome, MrBrown, \n"
"Seta-San, Skarmeth, blackd_wd, _Demo_\n" "Seta-San, Skarmeth, blackd_wd, _Demo_\n"
@ -84,7 +84,7 @@ char *LabelGreets = { N_(
}; };
static struct { static struct {
char *name; const char *name;
u32 size; u32 size;
} ioprps[]={ } ioprps[]={
{"IOPRP14", 43845}, {"IOPRP14", 43845},
@ -142,7 +142,7 @@ void GetRPCVersion(char *ioprp, char *rpcver){
if (te.fileSize==ioprps[i].size) if (te.fileSize==ioprps[i].size)
break; break;
if (ioprps[i].size>0) if (ioprps[i].size>0)
p=ioprps[i].name; p=(char *)ioprps[i].name;
} }
// fixme - Is p really supposed to be set in the middle of an if statement? // fixme - Is p really supposed to be set in the middle of an if statement?
if (p && (p=strstr(p, "IOPRP")+strlen("IOPRP"))){ if (p && (p=strstr(p, "IOPRP")+strlen("IOPRP"))){

4
pcsx2/Misc.h
View File

@ -143,8 +143,8 @@ int LoadCdrom();
int CheckCdrom(); int CheckCdrom();
int GetPS2ElfName(char*); int GetPS2ElfName(char*);
extern char *LabelAuthors; extern const char *LabelAuthors;
extern char *LabelGreets; extern const char *LabelGreets;
int SaveState(const char *file); int SaveState(const char *file);
int LoadState(const char *file); int LoadState(const char *file);
int CheckState(const char *file); int CheckState(const char *file);

2
pcsx2/Patch.h
View File

@ -62,7 +62,7 @@ typedef void (*PATCHTABLEFUNC)( char * text1, char * text2 );
struct PatchTextTable struct PatchTextTable
{ {
char *text; const char *text;
int code; int code;
PATCHTABLEFUNC func; PATCHTABLEFUNC func;
}; };

6
pcsx2/PsxBios.c
View File

@ -24,7 +24,7 @@
#include "PsxCommon.h" #include "PsxCommon.h"
char *biosA0n[256] = { const char *biosA0n[256] = {
// 0x00 // 0x00
"open", "lseek", "read", "write", "open", "lseek", "read", "write",
"close", "ioctl", "exit", "sys_a0_07", "close", "ioctl", "exit", "sys_a0_07",
@ -85,7 +85,7 @@ char *biosA0n[256] = {
"?? sub_function", "?? sub_function",
}; };
char *biosB0n[256] = { const char *biosB0n[256] = {
// 0x00 // 0x00
"SysMalloc", "sys_b0_01", "sys_b0_02", "sys_b0_03", "SysMalloc", "sys_b0_01", "sys_b0_02", "sys_b0_03",
"sys_b0_04", "sys_b0_05", "sys_b0_06", "DeliverEvent", "sys_b0_04", "sys_b0_05", "sys_b0_06", "DeliverEvent",
@ -118,7 +118,7 @@ char *biosB0n[256] = {
"_card_status", "_card_wait", "_card_status", "_card_wait",
}; };
char *biosC0n[256] = { const char *biosC0n[256] = {
// 0x00 // 0x00
"InitRCnt", "InitException", "SysEnqIntRP", "SysDeqIntRP", "InitRCnt", "InitException", "SysEnqIntRP", "SysDeqIntRP",
"get_free_EvCB_slot", "get_free_TCB_slot", "ExceptionHandler", "InstallExeptionHandler", "get_free_EvCB_slot", "get_free_TCB_slot", "ExceptionHandler", "InstallExeptionHandler",

6
pcsx2/PsxBios.h
View File

@ -19,9 +19,9 @@
#ifndef __PSXBIOS_H__ #ifndef __PSXBIOS_H__
#define __PSXBIOS_H__ #define __PSXBIOS_H__
extern char *biosA0n[256]; extern const char *biosA0n[256];
extern char *biosB0n[256]; extern const char *biosB0n[256];
extern char *biosC0n[256]; extern const char *biosC0n[256];
void psxBiosInit(); void psxBiosInit();
void psxBiosShutdown(); void psxBiosShutdown();

2
pcsx2/PsxInterpreter.c
View File

@ -187,7 +187,7 @@ irxlib irxlibs[32] = {
#define Ra2 ((char*)PSXM(psxRegs.GPR.n.a2)) #define Ra2 ((char*)PSXM(psxRegs.GPR.n.a2))
#define Ra3 ((char*)PSXM(psxRegs.GPR.n.a3)) #define Ra3 ((char*)PSXM(psxRegs.GPR.n.a3))
char* intrname[]={ const char* intrname[]={
"INT_VBLANK", "INT_GM", "INT_CDROM", "INT_DMA", //00 "INT_VBLANK", "INT_GM", "INT_CDROM", "INT_DMA", //00
"INT_RTC0", "INT_RTC1", "INT_RTC2", "INT_SIO0", //04 "INT_RTC0", "INT_RTC1", "INT_RTC2", "INT_SIO0", //04
"INT_SIO1", "INT_SPU", "INT_PIO", "INT_EVBLANK", //08 "INT_SIO1", "INT_SPU", "INT_PIO", "INT_EVBLANK", //08

2
pcsx2/windows/Debugger.c
View File

@ -622,7 +622,7 @@ BOOL APIENTRY DebuggerProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
} }
/* this lives in interpreter.c */ /* this lives in interpreter.c */
extern char* bios[]; extern const char* bios[];
void RefreshDebugger(void) void RefreshDebugger(void)
{ {

2
pcsx2/x86/iR3000A.cpp
View File

@ -48,7 +48,7 @@
#include "iR3000A.h" #include "iR3000A.h"
u32 g_psxMaxRecMem = 0; u32 g_psxMaxRecMem = 0;
extern char *disRNameGPR[]; extern const char *disRNameGPR[];
extern char* disR3000Fasm(u32 code, u32 pc); extern char* disR3000Fasm(u32 code, u32 pc);
u32 s_psxrecblocks[] = {0}; u32 s_psxrecblocks[] = {0};

4
pcsx2/x86/ix86-32/iR5900-32.c
View File

@ -149,7 +149,7 @@ static void iDumpBlock( int startpc, u8 * ptr )
char filename[ g_MaxPath ]; char filename[ g_MaxPath ];
u32 i, j; u32 i, j;
EEINST* pcur; EEINST* pcur;
extern char *disRNameGPR[]; extern const char *disRNameGPR[];
u8 used[34]; u8 used[34];
u8 fpuused[33]; u8 fpuused[33];
int numused, count, fpunumused; int numused, count, fpunumused;
@ -2737,7 +2737,7 @@ void iDumpRegisters(u32 startpc, u32 temp)
int i; int i;
char* pstr;// = temp ? "t" : ""; char* pstr;// = temp ? "t" : "";
const u32 dmacs[] = {0x8000, 0x9000, 0xa000, 0xb000, 0xb400, 0xc000, 0xc400, 0xc800, 0xd000, 0xd400 }; const u32 dmacs[] = {0x8000, 0x9000, 0xa000, 0xb000, 0xb400, 0xc000, 0xc400, 0xc800, 0xd000, 0xd400 };
extern char *disRNameGPR[]; extern const char *disRNameGPR[];
char* psymb; char* psymb;
if (temp) if (temp)