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

Fixed some warnings thrown by optimisation reduction in GCC 3.4.5

This commit is contained in:
Barry Harris 2011-12-21 13:55:40 +00:00
parent 9f83b4a91f
commit b3189e7605
9 changed files with 478 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/burn/drivers/misc_pre90s/d_tigerheli.cpp
View File

@ -454,16 +454,6 @@ static void TigerHeliTextRender()
// ---------------------------------------------------------------------------
// Tile layer
static void TigerHeliTileExit()
{
return;
}
static INT32 TigerHeliTileInit()
{
return 0;
}
#define PLOTPIXEL(x) pPixel[x] = nPalette + pTileData[x];
#define CLIPPIXEL(a,b) if ((nTileXPos + a) >= 0 && (nTileXPos + a) < 280) { b; }
@ -582,16 +572,6 @@ static INT32 nSpriteXPos, nSpriteYPos, nSpriteNumber, nSpritePalette;
static INT32 nTigerHeliSpriteMask;
static void TigerHeliSpriteExit()
{
return;
}
static INT32 TigerHeliSpriteInit()
{
return 0;
}
#define PLOTPIXEL(a) if (pSpriteData[a]) { pPixel[a] = nPalette + pSpriteData[a]; }
#define CLIPPIXEL(a,b) if ((nSpriteXPos + a) >= 0 && (nSpriteXPos + a) < 280) { b; }
@ -1948,9 +1928,7 @@ static INT32 tigerhExit()
{
BurnTransferExit();
TigerHeliSpriteExit();
TigerHeliTextExit();
TigerHeliTileExit();
ZetExit();
AY8910Exit(0);
@ -2135,9 +2113,7 @@ static INT32 tigerhInit()
AY8910Init(0, 1500000, nBurnSoundRate, &tigerhReadPort0, &tigerhReadPort1, NULL, NULL);
AY8910Init(1, 1500000, nBurnSoundRate, &tigerhReadPort2, &tigerhReadPort3, NULL, NULL);
TigerHeliTileInit();
TigerHeliTextInit();
TigerHeliSpriteInit();
TigerHeliPaletteInit();
BurnTransferInit();

31
src/burn/drivers/snes/snes.h
View File

@ -162,31 +162,12 @@ extern INT32 lorom;
UINT8 readmeml(unsigned long adress);
void writememl(unsigned long adress, unsigned char v);
static inline unsigned char readmem(unsigned long adress)
{
cycles-=accessspeed[(adress>>13)&0x7FF];
clockspc(accessspeed[(adress>>13)&0x7FF]);
if (memread[(adress>>13)&0x7FF])
{
return memlookup[(adress>>13)&0x7FF][adress&0x1FFF];
}
return readmeml(adress);
}
unsigned char snes_readmem(unsigned long adress);
void snes_writemem(unsigned long ad, unsigned char v);
static inline void writemem(unsigned long ad, unsigned char v)
{
cycles-=accessspeed[(ad>>13)&0x7FF];
clockspc(accessspeed[(ad>>13)&0x7FF]);
if (memwrite[(ad>>13)&0x7FF])
memlookup[(ad>>13)&0x7FF][(ad)&0x1FFF]=v;
else
writememl(ad,v);
}
#define readmemw(a) (readmem(a))|((readmem((a)+1))<<8)
#define writememw(a,v) writemem(a,(v)&0xFF); writemem((a)+1,(v)>>8)
#define writememw2(a,v) writemem((a)+1,(v)>>8); writemem(a,(v)&0xFF)
#define readmemw(a) (snes_readmem(a))|((snes_readmem((a)+1))<<8)
#define writememw(a,v) snes_writemem(a,(v)&0xFF); snes_writemem((a)+1,(v)>>8)
#define writememw2(a,v) snes_writemem((a)+1,(v)>>8); snes_writemem(a,(v)&0xFF)
/*Video*/
extern INT32 nmi,vbl,joyscan;
@ -272,4 +253,4 @@ INT32 SnesFrame();
INT32 SnesScan(INT32 nAction,INT32 *pnMin);
extern unsigned char DoSnesReset;
extern unsigned char SnesJoy1[12];
extern unsigned char SnesJoy1[12];

776
src/burn/drivers/snes/snes_65816.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/burn/drivers/snes/snes_io.cpp
View File

@ -142,11 +142,11 @@ void writeio(unsigned short addr, unsigned char val)
{
// printf("Dest %04X+%04X SRC %06X %04X\n",dmadest[d],offset,dmabank[d],dmasrc[d]);
temp=readppu(dmadest[d]+offset);
writemem((dmabank[d]<<16)|dmasrc[d],temp);
snes_writemem((dmabank[d]<<16)|dmasrc[d],temp);
}
else
{
temp=readmem((dmabank[d]<<16)|dmasrc[d]);
temp=snes_readmem((dmabank[d]<<16)|dmasrc[d]);
// if (dmabank[d]==0 && dmasrc[d]<0x2000) printf("%02X %06X %04X\n",temp,dmabank[d]|dmasrc[d],dmalen[d]);
writeppu(dmadest[d]+offset,temp);
}

12
src/burn/drivers/snes/snes_main.cpp
View File

@ -58,7 +58,7 @@ INT32 SnesInit()
initmem();
if (((readmem(0xFFFD)<<8)|readmem(0xFFFC))==0xFFFF)
if (((snes_readmem(0xFFFD)<<8)|snes_readmem(0xFFFC))==0xFFFF)
{
lorom^=1;
initmem();
@ -67,18 +67,18 @@ INT32 SnesInit()
len=counter;//-0x10000;
for (counter=0;counter<21;counter++)
{
name[counter]=readmem(0xFFC0+counter);
name[counter]=snes_readmem(0xFFC0+counter);
}
name[21]=0;
srammask=(1<<(readmem(0xFFD8)+10))-1;
srammask=(1<<(snes_readmem(0xFFD8)+10))-1;
if (!readmem(0xFFD8))
if (!snes_readmem(0xFFD8))
{
srammask=0;
}
if (readmem(0xFFD9)>1)
if (snes_readmem(0xFFD9)>1)
{
global_pal=1;
}
@ -139,7 +139,7 @@ INT32 SnesFrame()
intthisline=0;
while (cycles>0)
{
global_opcode=readmem(pbr|pc);
global_opcode=snes_readmem(pbr|pc);
pc++;
opcodes[global_opcode ][cpumode]();
if ((((irqenable==3) && (lines==yirq)) || (irqenable==1)) && !intthisline)

20
src/burn/drivers/snes/snes_mem.cpp
View File

@ -276,3 +276,23 @@ void writememl(unsigned long addr, unsigned char val)
}
unsigned char snes_readmem(unsigned long adress)
{
cycles-=accessspeed[(adress>>13)&0x7FF];
clockspc(accessspeed[(adress>>13)&0x7FF]);
if (memread[(adress>>13)&0x7FF])
{
return memlookup[(adress>>13)&0x7FF][adress&0x1FFF];
}
return readmeml(adress);
}
void snes_writemem(unsigned long ad, unsigned char v)
{
cycles-=accessspeed[(ad>>13)&0x7FF];
clockspc(accessspeed[(ad>>13)&0x7FF]);
if (memwrite[(ad>>13)&0x7FF])
memlookup[(ad>>13)&0x7FF][(ad)&0x1FFF]=v;
else
writememl(ad,v);
}

104
src/burn/drivers/snes/snes_ppu.cpp
View File

@ -1590,7 +1590,7 @@ static SNES_INLINE unsigned char pal5bit(unsigned char bits)
#define RGB_BLACK 0x00
#if 0
SNES_INLINE static unsigned int CalcCol(unsigned short nColour)
{
int r, g, b;
@ -1608,7 +1608,7 @@ SNES_INLINE static unsigned int CalcCol(unsigned short nColour)
return BurnHighCol(r, g, b, 0);
}
#endif
@ -1812,7 +1812,7 @@ void dohdma(int line)
{
if (hdmacount[c]<=0)
{
hdmacount[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
hdmacount[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
// printf("HDMA %i count now %04X at %02X%04X %02X %04X\n",c,hdmacount[c],dmabank[c],hdmaaddr[c],dmactrl[c],hdmadat[c]);
if (!hdmacount[c])
{
@ -1839,49 +1839,49 @@ void dohdma(int line)
switch (dmactrl[c]&7)
{
case 1: /*Two registers*/
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+1,hdmadat[c]);
break;
case 2: /*One register write twice*/
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
case 0: /*One register write once*/
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
// if (c==2) printf("Channel 2 now %02X%04X\n",dmabank[c],hdmaaddr[c]);
break;
case 3: /*Two registers write twice*/
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+1,hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+1,hdmadat[c]);
break;
case 4: /*Four registers*/
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+1,hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+2,hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+3,hdmadat[c]);
break;
default:
@ -1894,48 +1894,48 @@ void dohdma(int line)
switch (dmactrl[c]&7)
{
case 1: /*Two registers*/
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+1,hdmadat[c]);
break;
case 2: /*One register write twice*/
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
case 0: /*One register write once*/
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
break;
case 3: /*Two registers write twice*/
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+1,hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+1,hdmadat[c]);
break;
case 4: /*Four registers*/
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c],hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+1,hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+2,hdmadat[c]);
if (hdmastat[c]&INDIRECT) hdmadat[c]=readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
if (hdmastat[c]&INDIRECT) hdmadat[c]=snes_readmem((dmaibank[c]<<16)|(hdmaaddr2[c]++));
else hdmadat[c]=snes_readmem((dmabank[c]<<16)|(hdmaaddr[c]++));
writeppu(dmadest[c]+3,hdmadat[c]);
break;
default:
@ -2705,4 +2705,4 @@ unsigned char readppu(unsigned short offset)
void dumpvram()
{
}
}

6
src/burner/platform/win32/inpd.cpp
View File

@ -469,9 +469,9 @@ static int ListItemActivate()
return 0;
}
#if 0
static int NewMacroButton()
{
#if 0
LVITEM LvItem;
int nSel;
@ -499,10 +499,10 @@ static int NewMacroButton()
}
InpMacroCreate(nSel);
#endif
return 0;
}
#endif
static int DeleteInput(unsigned int i)
{
@ -722,7 +722,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP
if (Id == IDC_INPD_NEWMACRO && Notify == BN_CLICKED) {
NewMacroButton();
// NewMacroButton();
return 0;
}

2
src/interface/perfcount/win32/prf_performance_counter.cpp
View File

@ -14,7 +14,7 @@ int cntInit()
{
LARGE_INTEGER f;
cntExit();
// cntExit();
QueryPerformanceFrequency(&f);