not worth mention in the whatsnew: fixed a couple of shadowed variables

This commit is contained in:
Fabio Priuli 2010-02-19 21:22:48 +00:00
parent 352756af42
commit 35584719ef
2 changed files with 27 additions and 27 deletions

View File

@ -1004,18 +1004,18 @@ static UINT8 spc7110_mmio_read(running_machine *machine, UINT32 addr)
case 0x4810: case 0x4810:
{ {
UINT8 data; UINT8 data;
UINT32 addr, adjust, adjustaddr; UINT32 address, adjust, adjustaddr;
if(snes_spc7110.r481x != 0x07) return 0x00; if(snes_spc7110.r481x != 0x07) return 0x00;
addr = spc7110_data_pointer(); address = spc7110_data_pointer();
adjust = spc7110_data_adjust(); adjust = spc7110_data_adjust();
if(snes_spc7110.r4818 & 8) if(snes_spc7110.r4818 & 8)
{ {
adjust = (INT16)adjust; //16-bit sign extend adjust = (INT16)adjust; //16-bit sign extend
} }
adjustaddr = addr; adjustaddr = address;
if(snes_spc7110.r4818 & 2) if(snes_spc7110.r4818 & 2)
{ {
adjustaddr += adjust; adjustaddr += adjust;
@ -1033,7 +1033,7 @@ static UINT8 spc7110_mmio_read(running_machine *machine, UINT32 addr)
if((snes_spc7110.r4818 & 16) == 0) if((snes_spc7110.r4818 & 16) == 0)
{ {
spc7110_set_data_pointer(addr + increment); spc7110_set_data_pointer(address + increment);
} }
else else
{ {
@ -1054,25 +1054,25 @@ static UINT8 spc7110_mmio_read(running_machine *machine, UINT32 addr)
case 0x481a: case 0x481a:
{ {
UINT8 data; UINT8 data;
UINT32 addr, adjust; UINT32 address, adjust;
if(snes_spc7110.r481x != 0x07) if(snes_spc7110.r481x != 0x07)
{ {
return 0x00; return 0x00;
} }
addr = spc7110_data_pointer(); address = spc7110_data_pointer();
adjust = spc7110_data_adjust(); adjust = spc7110_data_adjust();
if(snes_spc7110.r4818 & 8) if(snes_spc7110.r4818 & 8)
{ {
adjust = (INT16)adjust; //16-bit sign extend adjust = (INT16)adjust; //16-bit sign extend
} }
data = ROM[spc7110_datarom_addr(addr + adjust)]; data = ROM[spc7110_datarom_addr(address + adjust)];
if((snes_spc7110.r4818 & 0x60) == 0x60) if((snes_spc7110.r4818 & 0x60) == 0x60)
{ {
if((snes_spc7110.r4818 & 16) == 0) if((snes_spc7110.r4818 & 16) == 0)
{ {
spc7110_set_data_pointer(addr + adjust); spc7110_set_data_pointer(address + adjust);
} }
else else
{ {
@ -1143,17 +1143,17 @@ static void spc7110_mmio_write(running_machine *machine, UINT32 addr, UINT8 data
case 0x4805: snes_spc7110.r4805 = data; break; case 0x4805: snes_spc7110.r4805 = data; break;
case 0x4806: case 0x4806:
{ {
UINT32 table, index, length, addr, mode, offset; UINT32 table, index, length, address, mode, offset;
snes_spc7110.r4806 = data; snes_spc7110.r4806 = data;
table = (snes_spc7110.r4801 + (snes_spc7110.r4802 << 8) + (snes_spc7110.r4803 << 16)); table = (snes_spc7110.r4801 + (snes_spc7110.r4802 << 8) + (snes_spc7110.r4803 << 16));
index = (snes_spc7110.r4804 << 2); index = (snes_spc7110.r4804 << 2);
length = (snes_spc7110.r4809 + (snes_spc7110.r480a << 8)); length = (snes_spc7110.r4809 + (snes_spc7110.r480a << 8));
addr = spc7110_datarom_addr(table + index); address = spc7110_datarom_addr(table + index);
mode = (ROM[addr + 0]); mode = (ROM[address + 0]);
offset = (ROM[addr + 1] << 16) offset = (ROM[address + 1] << 16)
+ (ROM[addr + 2] << 8) + (ROM[address + 2] << 8)
+ (ROM[addr + 3] << 0); + (ROM[address + 3] << 0);
SPC7110Decomp_init(snes_spc7110.decomp, machine, mode, offset, (snes_spc7110.r4805 + (snes_spc7110.r4806 << 8)) << mode); SPC7110Decomp_init(snes_spc7110.decomp, machine, mode, offset, (snes_spc7110.r4805 + (snes_spc7110.r4806 << 8)) << mode);
snes_spc7110.r480c = 0x80; snes_spc7110.r480c = 0x80;

View File

@ -589,7 +589,7 @@ static void DSP4_OP07( void )
static void DSP4_OP08( void ) static void DSP4_OP08( void )
{ {
INT16 win_left, win_right; INT16 wleft, wright;
INT16 view_x[2], view_y[2]; INT16 view_x[2], view_y[2];
INT16 envelope[2][2]; INT16 envelope[2][2];
@ -695,33 +695,33 @@ static void DSP4_OP08( void )
// SR = 0x00 // SR = 0x00
// re-center coordinates // re-center coordinates
win_left = DSP4_vars.poly_cx[0][0] - view_x[0] + envelope[0][0]; wleft = DSP4_vars.poly_cx[0][0] - view_x[0] + envelope[0][0];
win_right = DSP4_vars.poly_cx[0][1] - view_x[0] + envelope[0][1]; wright = DSP4_vars.poly_cx[0][1] - view_x[0] + envelope[0][1];
// saturate offscreen data for polygon #1 // saturate offscreen data for polygon #1
if (win_left < DSP4_vars.poly_clipLf[0][0]) if (wleft < DSP4_vars.poly_clipLf[0][0])
{ {
win_left = DSP4_vars.poly_clipLf[0][0]; wleft = DSP4_vars.poly_clipLf[0][0];
} }
if (win_left > DSP4_vars.poly_clipRt[0][0]) if (wleft > DSP4_vars.poly_clipRt[0][0])
{ {
win_left = DSP4_vars.poly_clipRt[0][0]; wleft = DSP4_vars.poly_clipRt[0][0];
} }
if (win_right < DSP4_vars.poly_clipLf[0][1]) if (wright < DSP4_vars.poly_clipLf[0][1])
{ {
win_right = DSP4_vars.poly_clipLf[0][1]; wright = DSP4_vars.poly_clipLf[0][1];
} }
if (win_right > DSP4_vars.poly_clipRt[0][1]) if (wright > DSP4_vars.poly_clipRt[0][1])
{ {
win_right = DSP4_vars.poly_clipRt[0][1]; wright = DSP4_vars.poly_clipRt[0][1];
} }
// SR = 0x80 // SR = 0x80
// initial output for polygon #1 // initial output for polygon #1
DSP4_CLEAR_OUT(); DSP4_CLEAR_OUT();
DSP4_WRITE_BYTE(win_left & 0xff); DSP4_WRITE_BYTE(wleft & 0xff);
DSP4_WRITE_BYTE(win_right & 0xff); DSP4_WRITE_BYTE(wright & 0xff);
do do