Fixed a bunch of const issues. Trimmed some whitespace.
git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@77 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
parent
4b18719fd0
commit
5af1e7e3f8
|
@ -1913,7 +1913,7 @@ void CPUSoftwareInterrupt(int comment)
|
||||||
if(armState) comment >>= 16;
|
if(armState) comment >>= 16;
|
||||||
#ifdef BKPT_SUPPORT
|
#ifdef BKPT_SUPPORT
|
||||||
if(comment == 0xff) {
|
if(comment == 0xff) {
|
||||||
extern void (*dbgOutput)(char *, u32);
|
extern void (*dbgOutput)(const char *, u32);
|
||||||
dbgOutput(NULL, reg[0].I);
|
dbgOutput(NULL, reg[0].I);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#ifdef BKPT_SUPPORT
|
#ifdef BKPT_SUPPORT
|
||||||
#define CONSOLE_OUTPUT(a,b) \
|
#define CONSOLE_OUTPUT(a,b) \
|
||||||
extern void (*dbgOutput)(char *, u32);\
|
extern void (*dbgOutput)(const char *, u32);\
|
||||||
if((opcode == 0xe0000000) && (reg[0].I == 0xC0DED00D)) {\
|
if((opcode == 0xe0000000) && (reg[0].I == 0xC0DED00D)) {\
|
||||||
dbgOutput((a), (b));\
|
dbgOutput((a), (b));\
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,7 +107,7 @@ extern void remoteStubSignal(int,int);
|
||||||
extern void remoteOutput(char *, u32);
|
extern void remoteOutput(char *, u32);
|
||||||
extern void remoteSetProtocol(int);
|
extern void remoteSetProtocol(int);
|
||||||
extern void remoteSetPort(int);
|
extern void remoteSetPort(int);
|
||||||
extern void debuggerOutput(char *, u32);
|
extern void debuggerOutput(const char *, u32);
|
||||||
|
|
||||||
extern void CPUUpdateRenderBuffers(bool);
|
extern void CPUUpdateRenderBuffers(bool);
|
||||||
extern int gbHardware;
|
extern int gbHardware;
|
||||||
|
@ -264,7 +264,7 @@ extern void debuggerMain();
|
||||||
|
|
||||||
void (*dbgMain)() = debuggerMain;
|
void (*dbgMain)() = debuggerMain;
|
||||||
void (*dbgSignal)(int,int) = debuggerSignal;
|
void (*dbgSignal)(int,int) = debuggerSignal;
|
||||||
void (*dbgOutput)(char *, u32) = debuggerOutput;
|
void (*dbgOutput)(const char *, u32) = debuggerOutput;
|
||||||
|
|
||||||
int mouseCounter = 0;
|
int mouseCounter = 0;
|
||||||
int autoFire = 0;
|
int autoFire = 0;
|
||||||
|
|
|
@ -277,7 +277,7 @@ void remotePutPacket(const char *packet)
|
||||||
#define debuggerWriteByte(addr, value) \
|
#define debuggerWriteByte(addr, value) \
|
||||||
map[(addr)>>24].address[(addr) & map[(addr)>>24].mask] = (value)
|
map[(addr)>>24].address[(addr) & map[(addr)>>24].mask] = (value)
|
||||||
|
|
||||||
void remoteOutput(char *s, u32 addr)
|
void remoteOutput(const char *s, u32 addr)
|
||||||
{
|
{
|
||||||
char buffer[16384];
|
char buffer[16384];
|
||||||
|
|
||||||
|
|
|
@ -103,10 +103,10 @@ extern void remoteInit();
|
||||||
extern void remoteCleanUp();
|
extern void remoteCleanUp();
|
||||||
extern void remoteStubMain();
|
extern void remoteStubMain();
|
||||||
extern void remoteStubSignal(int,int);
|
extern void remoteStubSignal(int,int);
|
||||||
extern void remoteOutput(char *, u32);
|
extern void remoteOutput(const char *, u32);
|
||||||
extern void remoteSetProtocol(int);
|
extern void remoteSetProtocol(int);
|
||||||
extern void remoteSetPort(int);
|
extern void remoteSetPort(int);
|
||||||
extern void debuggerOutput(char *, u32);
|
extern void debuggerOutput(const char *, u32);
|
||||||
|
|
||||||
extern void CPUUpdateRenderBuffers(bool);
|
extern void CPUUpdateRenderBuffers(bool);
|
||||||
extern int gbHardware;
|
extern int gbHardware;
|
||||||
|
@ -241,7 +241,7 @@ extern void debuggerSignal(int,int);
|
||||||
|
|
||||||
void (*dbgMain)() = debuggerMain;
|
void (*dbgMain)() = debuggerMain;
|
||||||
void (*dbgSignal)(int,int) = debuggerSignal;
|
void (*dbgSignal)(int,int) = debuggerSignal;
|
||||||
void (*dbgOutput)(char *, u32) = debuggerOutput;
|
void (*dbgOutput)(const char *, u32) = debuggerOutput;
|
||||||
|
|
||||||
int mouseCounter = 0;
|
int mouseCounter = 0;
|
||||||
int autoFire = 0;
|
int autoFire = 0;
|
||||||
|
|
|
@ -2538,7 +2538,7 @@ static bool debuggerCondEvaluate(int num)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*extern*/ void debuggerOutput(char *s, u32 addr)
|
/*extern*/ void debuggerOutput(const char *s, u32 addr)
|
||||||
{
|
{
|
||||||
if(s)
|
if(s)
|
||||||
printf(s);
|
printf(s);
|
||||||
|
|
|
@ -1049,7 +1049,7 @@ case 0x28:
|
||||||
#ifdef BKPT_SUPPORT
|
#ifdef BKPT_SUPPORT
|
||||||
#define THUMB_CONSOLE_OUTPUT(a,b) \
|
#define THUMB_CONSOLE_OUTPUT(a,b) \
|
||||||
if((opcode == 0x4000) && (reg[0].I == 0xC0DED00D)) {\
|
if((opcode == 0x4000) && (reg[0].I == 0xC0DED00D)) {\
|
||||||
extern void (*dbgOutput)(char *, u32);\
|
extern void (*dbgOutput)(const char *, u32);\
|
||||||
dbgOutput((a), (b));\
|
dbgOutput((a), (b));\
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -154,10 +154,10 @@ int systemDebug = 0;
|
||||||
int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
|
int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
|
||||||
bool soundBufferLow = 0;
|
bool soundBufferLow = 0;
|
||||||
void winSignal(int,int);
|
void winSignal(int,int);
|
||||||
void winOutput(char *, u32);
|
void winOutput(const char *, u32);
|
||||||
|
|
||||||
void (*dbgSignal)(int,int) = winSignal;
|
void (*dbgSignal)(int,int) = winSignal;
|
||||||
void (*dbgOutput)(char *, u32) = winOutput;
|
void (*dbgOutput)(const char *, u32) = winOutput;
|
||||||
|
|
||||||
#ifdef MMX
|
#ifdef MMX
|
||||||
extern "C" bool cpu_mmx;
|
extern "C" bool cpu_mmx;
|
||||||
|
@ -2440,7 +2440,7 @@ void winSignal(int, int)
|
||||||
#define CPUReadByteQuick(addr) \
|
#define CPUReadByteQuick(addr) \
|
||||||
map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]
|
map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]
|
||||||
|
|
||||||
void winOutput(char *s, u32 addr)
|
void winOutput(const char *s, u32 addr)
|
||||||
{
|
{
|
||||||
if(s) {
|
if(s) {
|
||||||
toolsLog(s);
|
toolsLog(s);
|
||||||
|
|
Loading…
Reference in New Issue