mirror of
https://github.com/dborth/snes9xgx.git
synced 2024-12-24 18:21:50 +01:00
upgrade core to 1.57
This commit is contained in:
Daryl Borth
parent
2fc86568c5
commit
8b73ba1913
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -294,7 +309,6 @@ void C4Op1F (void)
|
||||
{
|
||||
tanval = (double) C41FYVal / C41FXVal;
|
||||
C41FAngleRes = (int16) (atan(tanval) / (C4_PI * 2) * 512);
|
||||
C41FAngleRes = C41FAngleRes;
|
||||
if (C41FXVal< 0)
|
||||
C41FAngleRes += 0x100;
|
||||
C41FAngleRes &= 0x1FF;
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -1192,10 +1207,11 @@ void S9xSetC4 (uint8 byte, uint16 Address)
|
||||
if (Memory.C4RAM[0x1f4d] != 0x0e)
|
||||
printf("$7f4d=%02x, expected 0e for command 54 %02x\n", Memory.C4RAM[0x1f4d], Memory.C4RAM[0x1f4d]);
|
||||
#endif
|
||||
int64 a = SAR((int64) READ_3WORD(Memory.C4RAM + 0x1f80) << 40, 40);
|
||||
//printf("%08X%08X\n", (uint32) (a>>32), (uint32) (a&0xFFFFFFFF));
|
||||
int64 b = (int64) READ_3WORD(Memory.C4RAM + 0x1f80);
|
||||
int64 c = b << 40;
|
||||
int64 a = SAR(c, 30);
|
||||
a = SAR(c, 10);
|
||||
a *= a;
|
||||
//printf("%08X%08X\n", (uint32) (a>>32), (uint32) (a&0xFFFFFFFF));
|
||||
WRITE_3WORD(Memory.C4RAM + 0x1f83, a);
|
||||
WRITE_3WORD(Memory.C4RAM + 0x1f86, (a >> 24));
|
||||
break;
|
||||
|
||||
@ -607,6 +607,7 @@ int S9xAddCheatGroup (const char *name, const char *cheat)
|
||||
return -1;
|
||||
|
||||
Cheat.g.push_back (g);
|
||||
|
||||
return Cheat.g.size () - 1;
|
||||
}
|
||||
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -3085,6 +3085,16 @@ void S9xSetJoypadLatch (bool latch)
|
||||
FLAG_LATCH = latch;
|
||||
}
|
||||
|
||||
// prevent read_idx from overflowing (only latching resets it)
|
||||
// otherwise $4016/7 reads will start returning input data again
|
||||
static inline uint8 IncreaseReadIdxPost(uint8 &var)
|
||||
{
|
||||
uint8 oldval = var;
|
||||
if (var < 255)
|
||||
var++;
|
||||
return oldval;
|
||||
}
|
||||
|
||||
uint8 S9xReadJOYSERn (int n)
|
||||
{
|
||||
int i, j, r;
|
||||
@ -3139,7 +3149,7 @@ uint8 S9xReadJOYSERn (int n)
|
||||
switch (i = curcontrollers[n])
|
||||
{
|
||||
case MP5:
|
||||
r = read_idx[n][FLAG_IOBIT(n) ? 0 : 1]++;
|
||||
r = IncreaseReadIdxPost(read_idx[n][FLAG_IOBIT(n) ? 0 : 1]);
|
||||
j = FLAG_IOBIT(n) ? 0 : 2;
|
||||
|
||||
for (i = 0; i < 2; i++, j++)
|
||||
@ -3164,64 +3174,64 @@ uint8 S9xReadJOYSERn (int n)
|
||||
case JOYPAD7:
|
||||
if (read_idx[n][0] >= 16)
|
||||
{
|
||||
read_idx[n][0]++;
|
||||
IncreaseReadIdxPost(read_idx[n][0]);
|
||||
return (bits | 1);
|
||||
}
|
||||
else
|
||||
return (bits | ((joypad[i - JOYPAD0].buttons & (0x8000 >> read_idx[n][0]++)) ? 1 : 0));
|
||||
return (bits | ((joypad[i - JOYPAD0].buttons & (0x8000 >> IncreaseReadIdxPost(read_idx[n][0]))) ? 1 : 0));
|
||||
|
||||
case MOUSE0:
|
||||
case MOUSE1:
|
||||
if (read_idx[n][0] < 8)
|
||||
{
|
||||
read_idx[n][0]++;
|
||||
IncreaseReadIdxPost(read_idx[n][0]);
|
||||
return (bits);
|
||||
}
|
||||
else
|
||||
if (read_idx[n][0] < 16)
|
||||
return (bits | ((mouse[i - MOUSE0].buttons & (0x8000 >> read_idx[n][0]++)) ? 1 : 0));
|
||||
return (bits | ((mouse[i - MOUSE0].buttons & (0x8000 >> IncreaseReadIdxPost(read_idx[n][0]))) ? 1 : 0));
|
||||
else
|
||||
if (read_idx[n][0] < 24)
|
||||
return (bits | ((mouse[i - MOUSE0].delta_y & (0x800000 >> read_idx[n][0]++)) ? 1 : 0));
|
||||
return (bits | ((mouse[i - MOUSE0].delta_y & (0x800000 >> IncreaseReadIdxPost(read_idx[n][0]))) ? 1 : 0));
|
||||
else
|
||||
if (read_idx[n][0] < 32)
|
||||
return (bits | ((mouse[i - MOUSE0].delta_x & (0x80000000 >> read_idx[n][0]++)) ? 1 : 0));
|
||||
return (bits | ((mouse[i - MOUSE0].delta_x & (0x80000000 >> IncreaseReadIdxPost(read_idx[n][0]))) ? 1 : 0));
|
||||
else
|
||||
{
|
||||
read_idx[n][0]++;
|
||||
IncreaseReadIdxPost(read_idx[n][0]);
|
||||
return (bits | 1);
|
||||
}
|
||||
|
||||
case SUPERSCOPE:
|
||||
if (read_idx[n][0] < 8)
|
||||
return (bits | ((superscope.read_buttons & (0x80 >> read_idx[n][0]++)) ? 1 : 0));
|
||||
return (bits | ((superscope.read_buttons & (0x80 >> IncreaseReadIdxPost(read_idx[n][0]))) ? 1 : 0));
|
||||
else
|
||||
{
|
||||
read_idx[n][0]++;
|
||||
IncreaseReadIdxPost(read_idx[n][0]);
|
||||
return (bits | 1);
|
||||
}
|
||||
|
||||
case ONE_JUSTIFIER:
|
||||
if (read_idx[n][0] < 24)
|
||||
return (bits | ((0xaa7000 >> read_idx[n][0]++) & 1));
|
||||
return (bits | ((0xaa7000 >> IncreaseReadIdxPost(read_idx[n][0])) & 1));
|
||||
else
|
||||
if (read_idx[n][0] < 32)
|
||||
return (bits | ((justifier.buttons & (JUSTIFIER_TRIGGER | JUSTIFIER_START | JUSTIFIER_SELECT) & (0x80000000 >> read_idx[n][0]++)) ? 1 : 0));
|
||||
return (bits | ((justifier.buttons & (JUSTIFIER_TRIGGER | JUSTIFIER_START | JUSTIFIER_SELECT) & (0x80000000 >> IncreaseReadIdxPost(read_idx[n][0]))) ? 1 : 0));
|
||||
else
|
||||
{
|
||||
read_idx[n][0]++;
|
||||
IncreaseReadIdxPost(read_idx[n][0]);
|
||||
return (bits | 1);
|
||||
}
|
||||
|
||||
case TWO_JUSTIFIERS:
|
||||
if (read_idx[n][0] < 24)
|
||||
return (bits | ((0xaa7000 >> read_idx[n][0]++) & 1));
|
||||
return (bits | ((0xaa7000 >> IncreaseReadIdxPost(read_idx[n][0])) & 1));
|
||||
else
|
||||
if (read_idx[n][0] < 32)
|
||||
return (bits | ((justifier.buttons & (0x80000000 >> read_idx[n][0]++)) ? 1 : 0));
|
||||
return (bits | ((justifier.buttons & (0x80000000 >> IncreaseReadIdxPost(read_idx[n][0]))) ? 1 : 0));
|
||||
else
|
||||
{
|
||||
read_idx[n][0]++;
|
||||
IncreaseReadIdxPost(read_idx[n][0]);
|
||||
return (bits | 1);
|
||||
}
|
||||
|
||||
@ -3230,7 +3240,7 @@ uint8 S9xReadJOYSERn (int n)
|
||||
return (bits | ((macsrifle.buttons & 0x01) ? 1 : 0));
|
||||
|
||||
default:
|
||||
read_idx[n][0]++;
|
||||
IncreaseReadIdxPost(read_idx[n][0]);
|
||||
return (bits);
|
||||
}
|
||||
}
|
||||
@ -3912,3 +3922,4 @@ void MovieSetMacsRifle (int i, uint8 in[5])
|
||||
macsrifle.y = READ_WORD(ptr); ptr += 2;
|
||||
macsrifle.buttons = *ptr;
|
||||
}
|
||||
|
||||
|
||||
@ -289,7 +289,7 @@ void S9xReset (void)
|
||||
|
||||
memset(Memory.RAM, 0x55, 0x20000);
|
||||
memset(Memory.VRAM, 0x00, 0x10000);
|
||||
ZeroMemory(Memory.FillRAM, 0x8000);
|
||||
memset(Memory.FillRAM, 0, 0x8000);
|
||||
|
||||
S9xResetBSX();
|
||||
S9xResetCPU();
|
||||
@ -324,7 +324,7 @@ void S9xSoftReset (void)
|
||||
{
|
||||
S9xResetSaveTimer(FALSE);
|
||||
|
||||
ZeroMemory(Memory.FillRAM, 0x8000);
|
||||
memset(Memory.FillRAM, 0, 0x8000);
|
||||
|
||||
if (Settings.BS)
|
||||
S9xResetBSX();
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -287,6 +302,8 @@ static inline uint32 AbsoluteIndexedIndirectSlow (AccessMode a) // (a,X)
|
||||
static inline uint32 AbsoluteIndexedIndirect (AccessMode a) // (a,X)
|
||||
{
|
||||
uint16 addr = Immediate16Slow(READ);
|
||||
|
||||
AddCycles(ONE_CYCLE);
|
||||
addr += Registers.X.W;
|
||||
|
||||
// Address load wraps within the bank
|
||||
|
||||
@ -315,57 +315,40 @@ static inline void ADC (uint16 Work16)
|
||||
{
|
||||
if (CheckDecimal())
|
||||
{
|
||||
uint16 A1 = Registers.A.W & 0x000F;
|
||||
uint16 A2 = Registers.A.W & 0x00F0;
|
||||
uint16 A3 = Registers.A.W & 0x0F00;
|
||||
uint32 A4 = Registers.A.W & 0xF000;
|
||||
uint16 W1 = Work16 & 0x000F;
|
||||
uint16 W2 = Work16 & 0x00F0;
|
||||
uint16 W3 = Work16 & 0x0F00;
|
||||
uint16 W4 = Work16 & 0xF000;
|
||||
uint32 result;
|
||||
uint32 carry = CheckCarry();
|
||||
|
||||
A1 += W1 + CheckCarry();
|
||||
if (A1 > 0x0009)
|
||||
{
|
||||
A1 -= 0x000A;
|
||||
A1 &= 0x000F;
|
||||
A2 += 0x0010;
|
||||
}
|
||||
result = (Registers.A.W & 0x000F) + (Work16 & 0x000F) + carry;
|
||||
if (result > 0x0009)
|
||||
result += 0x0006;
|
||||
carry = (result > 0x000F);
|
||||
|
||||
A2 += W2;
|
||||
if (A2 > 0x0090)
|
||||
{
|
||||
A2 -= 0x00A0;
|
||||
A2 &= 0x00F0;
|
||||
A3 += 0x0100;
|
||||
}
|
||||
result = (Registers.A.W & 0x00F0) + (Work16 & 0x00F0) + (result & 0x000F) + carry * 0x10;
|
||||
if (result > 0x009F)
|
||||
result += 0x0060;
|
||||
carry = (result > 0x00FF);
|
||||
|
||||
A3 += W3;
|
||||
if (A3 > 0x0900)
|
||||
{
|
||||
A3 -= 0x0A00;
|
||||
A3 &= 0x0F00;
|
||||
A4 += 0x1000;
|
||||
}
|
||||
result = (Registers.A.W & 0x0F00) + (Work16 & 0x0F00) + (result & 0x00FF) + carry * 0x100;
|
||||
if (result > 0x09FF)
|
||||
result += 0x0600;
|
||||
carry = (result > 0x0FFF);
|
||||
|
||||
A4 += W4;
|
||||
if (A4 > 0x9000)
|
||||
{
|
||||
A4 -= 0xA000;
|
||||
A4 &= 0xF000;
|
||||
SetCarry();
|
||||
}
|
||||
else
|
||||
ClearCarry();
|
||||
result = (Registers.A.W & 0xF000) + (Work16 & 0xF000) + (result & 0x0FFF) + carry * 0x1000;
|
||||
|
||||
uint16 Ans16 = A4 | A3 | A2 | A1;
|
||||
|
||||
if (~(Registers.A.W ^ Work16) & (Work16 ^ Ans16) & 0x8000)
|
||||
if ((Registers.A.W & 0x8000) == (Work16 & 0x8000) && (Registers.A.W & 0x8000) != (result & 0x8000))
|
||||
SetOverflow();
|
||||
else
|
||||
ClearOverflow();
|
||||
|
||||
Registers.A.W = Ans16;
|
||||
if (result > 0x9FFF)
|
||||
result += 0x6000;
|
||||
|
||||
if (result > 0xFFFF)
|
||||
SetCarry();
|
||||
else
|
||||
ClearCarry();
|
||||
|
||||
Registers.A.W = result & 0xFFFF;
|
||||
SetZN(Registers.A.W);
|
||||
}
|
||||
else
|
||||
@ -388,37 +371,30 @@ static inline void ADC (uint8 Work8)
|
||||
{
|
||||
if (CheckDecimal())
|
||||
{
|
||||
uint8 A1 = Registers.A.W & 0x0F;
|
||||
uint16 A2 = Registers.A.W & 0xF0;
|
||||
uint8 W1 = Work8 & 0x0F;
|
||||
uint8 W2 = Work8 & 0xF0;
|
||||
uint32 result;
|
||||
uint32 carry = CheckCarry();
|
||||
|
||||
A1 += W1 + CheckCarry();
|
||||
if (A1 > 0x09)
|
||||
{
|
||||
A1 -= 0x0A;
|
||||
A1 &= 0x0F;
|
||||
A2 += 0x10;
|
||||
}
|
||||
result = (Registers.AL & 0x0F) + (Work8 & 0x0F) + carry;
|
||||
if ( result > 0x09 )
|
||||
result += 0x06;
|
||||
carry = (result > 0x0F);
|
||||
|
||||
A2 += W2;
|
||||
if (A2 > 0x90)
|
||||
{
|
||||
A2 -= 0xA0;
|
||||
A2 &= 0xF0;
|
||||
SetCarry();
|
||||
}
|
||||
else
|
||||
ClearCarry();
|
||||
result = (Registers.AL & 0xF0) + (Work8 & 0xF0) + (result & 0x0F) + (carry * 0x10);
|
||||
|
||||
uint8 Ans8 = A2 | A1;
|
||||
|
||||
if (~(Registers.AL ^ Work8) & (Work8 ^ Ans8) & 0x80)
|
||||
if ((Registers.AL & 0x80) == (Work8 & 0x80) && (Registers.AL & 0x80) != (result & 0x80))
|
||||
SetOverflow();
|
||||
else
|
||||
ClearOverflow();
|
||||
|
||||
Registers.AL = Ans8;
|
||||
if (result > 0x9F)
|
||||
result += 0x60;
|
||||
|
||||
if (result > 0xFF)
|
||||
SetCarry();
|
||||
else
|
||||
ClearCarry();
|
||||
|
||||
Registers.AL = result & 0xFF;
|
||||
SetZN(Registers.AL);
|
||||
}
|
||||
else
|
||||
@ -691,58 +667,42 @@ static inline void SBC (uint16 Work16)
|
||||
{
|
||||
if (CheckDecimal())
|
||||
{
|
||||
uint16 A1 = Registers.A.W & 0x000F;
|
||||
uint16 A2 = Registers.A.W & 0x00F0;
|
||||
uint16 A3 = Registers.A.W & 0x0F00;
|
||||
uint32 A4 = Registers.A.W & 0xF000;
|
||||
uint16 W1 = Work16 & 0x000F;
|
||||
uint16 W2 = Work16 & 0x00F0;
|
||||
uint16 W3 = Work16 & 0x0F00;
|
||||
uint16 W4 = Work16 & 0xF000;
|
||||
int result;
|
||||
int carry = CheckCarry();
|
||||
|
||||
A1 -= W1 + !CheckCarry();
|
||||
A2 -= W2;
|
||||
A3 -= W3;
|
||||
A4 -= W4;
|
||||
Work16 ^= 0xFFFF;
|
||||
|
||||
if (A1 > 0x000F)
|
||||
{
|
||||
A1 += 0x000A;
|
||||
A1 &= 0x000F;
|
||||
A2 -= 0x0010;
|
||||
}
|
||||
result = (Registers.A.W & 0x000F) + (Work16 & 0x000F) + carry;
|
||||
if (result < 0x0010)
|
||||
result -= 0x0006;
|
||||
carry = (result > 0x000F);
|
||||
|
||||
if (A2 > 0x00F0)
|
||||
{
|
||||
A2 += 0x00A0;
|
||||
A2 &= 0x00F0;
|
||||
A3 -= 0x0100;
|
||||
}
|
||||
result = (Registers.A.W & 0x00F0) + (Work16 & 0x00F0) + (result & 0x000F) + carry * 0x10;
|
||||
if (result < 0x0100)
|
||||
result -= 0x0060;
|
||||
carry = (result > 0x00FF);
|
||||
|
||||
if (A3 > 0x0F00)
|
||||
{
|
||||
A3 += 0x0A00;
|
||||
A3 &= 0x0F00;
|
||||
A4 -= 0x1000;
|
||||
}
|
||||
result = (Registers.A.W & 0x0F00) + (Work16 & 0x0F00) + (result & 0x00FF) + carry * 0x100;
|
||||
if (result < 0x1000)
|
||||
result -= 0x0600;
|
||||
carry = (result > 0x0FFF);
|
||||
|
||||
if (A4 > 0xF000)
|
||||
{
|
||||
A4 += 0xA000;
|
||||
A4 &= 0xF000;
|
||||
ClearCarry();
|
||||
}
|
||||
else
|
||||
SetCarry();
|
||||
result = (Registers.A.W & 0xF000) + (Work16 & 0xF000) + (result & 0x0FFF) + carry * 0x1000;
|
||||
|
||||
uint16 Ans16 = A4 | A3 | A2 | A1;
|
||||
|
||||
if ((Registers.A.W ^ Work16) & (Registers.A.W ^ Ans16) & 0x8000)
|
||||
if (((Registers.A.W ^ Work16) & 0x8000) == 0 && ((Registers.A.W ^ result) & 0x8000))
|
||||
SetOverflow();
|
||||
else
|
||||
ClearOverflow();
|
||||
|
||||
Registers.A.W = Ans16;
|
||||
if (result < 0x10000)
|
||||
result -= 0x6000;
|
||||
|
||||
if (result > 0xFFFF)
|
||||
SetCarry();
|
||||
else
|
||||
ClearCarry();
|
||||
|
||||
Registers.A.W = result & 0xFFFF;
|
||||
SetZN(Registers.A.W);
|
||||
}
|
||||
else
|
||||
@ -765,38 +725,32 @@ static inline void SBC (uint8 Work8)
|
||||
{
|
||||
if (CheckDecimal())
|
||||
{
|
||||
uint8 A1 = Registers.A.W & 0x0F;
|
||||
uint16 A2 = Registers.A.W & 0xF0;
|
||||
uint8 W1 = Work8 & 0x0F;
|
||||
uint8 W2 = Work8 & 0xF0;
|
||||
int result;
|
||||
int carry = CheckCarry();
|
||||
|
||||
A1 -= W1 + !CheckCarry();
|
||||
A2 -= W2;
|
||||
Work8 ^= 0xFF;
|
||||
|
||||
if (A1 > 0x0F)
|
||||
{
|
||||
A1 += 0x0A;
|
||||
A1 &= 0x0F;
|
||||
A2 -= 0x10;
|
||||
}
|
||||
result = (Registers.AL & 0x0F) + (Work8 & 0x0F) + carry;
|
||||
if (result < 0x10)
|
||||
result -= 0x06;
|
||||
carry = (result > 0x0F);
|
||||
|
||||
if (A2 > 0xF0)
|
||||
{
|
||||
A2 += 0xA0;
|
||||
A2 &= 0xF0;
|
||||
ClearCarry();
|
||||
}
|
||||
else
|
||||
SetCarry();
|
||||
result = (Registers.AL & 0xF0) + (Work8 & 0xF0) + (result & 0x0F) + carry * 0x10;
|
||||
|
||||
uint8 Ans8 = A2 | A1;
|
||||
|
||||
if ((Registers.AL ^ Work8) & (Registers.AL ^ Ans8) & 0x80)
|
||||
if ((Registers.AL & 0x80) == (Work8 & 0x80) && (Registers.AL & 0x80) != (result & 0x80))
|
||||
SetOverflow();
|
||||
else
|
||||
ClearOverflow();
|
||||
|
||||
Registers.AL = Ans8;
|
||||
if (result < 0x100 )
|
||||
result -= 0x60;
|
||||
|
||||
if (result > 0xFF)
|
||||
SetCarry();
|
||||
else
|
||||
ClearCarry();
|
||||
|
||||
Registers.AL = result & 0xFF;
|
||||
SetZN(Registers.AL);
|
||||
}
|
||||
else
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -1354,7 +1369,7 @@ void DSP1SetByte (uint8 byte, uint16 address)
|
||||
case 0x17:
|
||||
case 0x37:
|
||||
case 0x3F:
|
||||
DSP1.command = 0x1f;
|
||||
DSP1.command = 0x1f; // Fall through
|
||||
case 0x1f: DSP1.in_count = 1; break;
|
||||
default:
|
||||
#ifdef DEBUGGER
|
||||
@ -1885,7 +1900,7 @@ uint8 DSP1GetByte (uint16 address)
|
||||
DSP1.waiting4command = TRUE;
|
||||
}
|
||||
else
|
||||
t = 0xff;
|
||||
t = 0x80;
|
||||
}
|
||||
else
|
||||
t = 0x80;
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -1139,7 +1154,7 @@ static void DSP3_OP10 (void)
|
||||
DSP3_Reset();
|
||||
else
|
||||
// absorb 2 bytes
|
||||
DSP3.DR = DSP3.DR;
|
||||
DSP3.DR = DSP3.DR; // FIXME?
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -213,8 +213,9 @@ void S9xInitSuperFX (void)
|
||||
|
||||
void S9xResetSuperFX (void)
|
||||
{
|
||||
// FIXME: Snes9x can't execute CPU and SuperFX at a time. Don't ask me what is 0.417 :P
|
||||
SuperFX.speedPerLine = (uint32) (0.417 * 10.5e6 * ((1.0 / (float) Memory.ROMFramesPerSecond) / ((float) (Timings.V_Max))));
|
||||
// FIXME: Snes9x only runs the SuperFX at the end of every line.
|
||||
// 5823405 is a magic number that seems to work for most games.
|
||||
SuperFX.speedPerLine = (uint32) (5823405 * ((1.0 / (float) Memory.ROMFramesPerSecond) / ((float) (Timings.V_Max))));
|
||||
SuperFX.oneLineDone = FALSE;
|
||||
SuperFX.vFlags = 0;
|
||||
CPU.IRQExternal = FALSE;
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -891,14 +906,14 @@ static void fx_plot_2bit (void)
|
||||
return;
|
||||
#endif
|
||||
|
||||
if (!(GSU.vPlotOptionReg & 0x01) && !(COLR & 0xf))
|
||||
return;
|
||||
|
||||
if (GSU.vPlotOptionReg & 0x02)
|
||||
c = (x ^ y) & 1 ? (uint8) (GSU.vColorReg >> 4) : (uint8) GSU.vColorReg;
|
||||
c = ((x ^ y) & 1) ? (uint8) (GSU.vColorReg >> 4) : (uint8) GSU.vColorReg;
|
||||
else
|
||||
c = (uint8) GSU.vColorReg;
|
||||
|
||||
if (!(GSU.vPlotOptionReg & 0x01) && !(c & 0xf))
|
||||
return;
|
||||
|
||||
a = GSU.apvScreen[y >> 3] + GSU.x[x >> 3] + ((y & 7) << 1);
|
||||
v = 128 >> (x & 7);
|
||||
|
||||
@ -955,14 +970,14 @@ static void fx_plot_4bit (void)
|
||||
return;
|
||||
#endif
|
||||
|
||||
if (!(GSU.vPlotOptionReg & 0x01) && !(COLR & 0xf))
|
||||
return;
|
||||
|
||||
if (GSU.vPlotOptionReg & 0x02)
|
||||
c = (x ^ y) & 1 ? (uint8) (GSU.vColorReg >> 4) : (uint8) GSU.vColorReg;
|
||||
c = ((x ^ y) & 1) ? (uint8) (GSU.vColorReg >> 4) : (uint8) GSU.vColorReg;
|
||||
else
|
||||
c = (uint8) GSU.vColorReg;
|
||||
|
||||
if (!(GSU.vPlotOptionReg & 0x01) && !(c & 0xf))
|
||||
return;
|
||||
|
||||
a = GSU.apvScreen[y >> 3] + GSU.x[x >> 3] + ((y & 7) << 1);
|
||||
v = 128 >> (x & 7);
|
||||
|
||||
@ -1034,7 +1049,7 @@ static void fx_plot_8bit (void)
|
||||
c = (uint8) GSU.vColorReg;
|
||||
if (!(GSU.vPlotOptionReg & 0x10))
|
||||
{
|
||||
if (!(GSU.vPlotOptionReg & 0x01) && !(c & 0xf))
|
||||
if (!(GSU.vPlotOptionReg & 0x01) && (!c || ((GSU.vPlotOptionReg & 0x08) && !(c & 0xf))))
|
||||
return;
|
||||
}
|
||||
else
|
||||
@ -4137,7 +4152,6 @@ static void fx_sm_r15 (void)
|
||||
uint32 fx_run (uint32 nInstructions)
|
||||
{
|
||||
GSU.vCounter = nInstructions;
|
||||
READR14;
|
||||
while (TF(G) && (GSU.vCounter-- > 0))
|
||||
FX_STEP;
|
||||
#if 0
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -885,8 +885,7 @@ inline void S9xSetPCBase (uint32 Address)
|
||||
Registers.PBPC = Address & 0xffffff;
|
||||
ICPU.ShiftedPB = Address & 0xff0000;
|
||||
|
||||
int block;
|
||||
uint8 *GetAddress = Memory.Map[block = ((Address & 0xffffff) >> MEMMAP_SHIFT)];
|
||||
uint8 *GetAddress = Memory.Map[(int)((Address & 0xffffff) >> MEMMAP_SHIFT)];
|
||||
|
||||
CPU.MemSpeed = memory_speed(Address);
|
||||
CPU.MemSpeedx2 = CPU.MemSpeed << 1;
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -215,7 +230,7 @@ static uint16 get_crosshair_color (uint8);
|
||||
bool8 S9xGraphicsInit (void)
|
||||
{
|
||||
S9xInitTileRenderer();
|
||||
ZeroMemory(BlackColourMap, 256 * sizeof(uint16));
|
||||
memset(BlackColourMap, 0, 256 * sizeof(uint16));
|
||||
|
||||
#ifdef GFX_MULTI_FORMAT
|
||||
if (GFX.BuildPixel == NULL)
|
||||
@ -226,9 +241,9 @@ bool8 S9xGraphicsInit (void)
|
||||
GFX.InterlaceFrame = 0;
|
||||
GFX.RealPPL = GFX.Pitch >> 1;
|
||||
IPPU.OBJChanged = TRUE;
|
||||
IPPU.DirectColourMapsNeedRebuild = TRUE;
|
||||
Settings.BG_Forced = 0;
|
||||
S9xFixColourBrightness();
|
||||
S9xBuildDirectColourMaps();
|
||||
|
||||
GFX.X2 = (uint16 *) malloc(sizeof(uint16) * 0x10000);
|
||||
GFX.ZERO = (uint16 *) malloc(sizeof(uint16) * 0x10000);
|
||||
@ -245,7 +260,7 @@ bool8 S9xGraphicsInit (void)
|
||||
}
|
||||
|
||||
// Lookup table for color addition
|
||||
ZeroMemory(GFX.X2, 0x10000 * sizeof(uint16));
|
||||
memset(GFX.X2, 0, 0x10000 * sizeof(uint16));
|
||||
for (uint32 r = 0; r <= MAX_RED; r++)
|
||||
{
|
||||
uint32 r2 = r << 1;
|
||||
@ -271,7 +286,7 @@ bool8 S9xGraphicsInit (void)
|
||||
}
|
||||
|
||||
// Lookup table for 1/2 color subtraction
|
||||
ZeroMemory(GFX.ZERO, 0x10000 * sizeof(uint16));
|
||||
memset(GFX.ZERO, 0, 0x10000 * sizeof(uint16));
|
||||
for (uint32 r = 0; r <= MAX_RED; r++)
|
||||
{
|
||||
uint32 r2 = r;
|
||||
@ -314,33 +329,8 @@ void S9xGraphicsDeinit (void)
|
||||
if (GFX.SubZBuffer) { free(GFX.SubZBuffer); GFX.SubZBuffer = NULL; }
|
||||
}
|
||||
|
||||
void S9xBuildDirectColourMaps (void)
|
||||
void S9xGraphicsScreenResize (void)
|
||||
{
|
||||
IPPU.XB = mul_brightness[PPU.Brightness];
|
||||
|
||||
for (uint32 p = 0; p < 8; p++)
|
||||
for (uint32 c = 0; c < 256; c++)
|
||||
DirectColourMaps[p][c] = BUILD_PIXEL(IPPU.XB[((c & 7) << 2) | ((p & 1) << 1)], IPPU.XB[((c & 0x38) >> 1) | (p & 2)], IPPU.XB[((c & 0xc0) >> 3) | (p & 4)]);
|
||||
|
||||
IPPU.DirectColourMapsNeedRebuild = FALSE;
|
||||
}
|
||||
|
||||
void S9xStartScreenRefresh (void)
|
||||
{
|
||||
if (IPPU.RenderThisFrame)
|
||||
{
|
||||
GFX.InterlaceFrame = !GFX.InterlaceFrame;
|
||||
if (!GFX.DoInterlace || !GFX.InterlaceFrame)
|
||||
{
|
||||
if (!S9xInitUpdate())
|
||||
{
|
||||
IPPU.RenderThisFrame = FALSE;
|
||||
return;
|
||||
}
|
||||
|
||||
if (GFX.DoInterlace)
|
||||
GFX.DoInterlace--;
|
||||
|
||||
IPPU.MaxBrightness = PPU.Brightness;
|
||||
|
||||
IPPU.Interlace = Memory.FillRAM[0x2133] & 1;
|
||||
@ -361,6 +351,7 @@ void S9xStartScreenRefresh (void)
|
||||
else
|
||||
#endif
|
||||
GFX.RealPPL = GFX.Pitch >> 1;
|
||||
|
||||
IPPU.DoubleWidthPixels = FALSE;
|
||||
IPPU.RenderedScreenWidth = SNES_WIDTH;
|
||||
}
|
||||
@ -378,6 +369,35 @@ void S9xStartScreenRefresh (void)
|
||||
IPPU.DoubleHeightPixels = FALSE;
|
||||
IPPU.RenderedScreenHeight = PPU.ScreenHeight;
|
||||
}
|
||||
}
|
||||
|
||||
void S9xBuildDirectColourMaps (void)
|
||||
{
|
||||
IPPU.XB = mul_brightness[PPU.Brightness];
|
||||
|
||||
for (uint32 p = 0; p < 8; p++)
|
||||
for (uint32 c = 0; c < 256; c++)
|
||||
DirectColourMaps[p][c] = BUILD_PIXEL(IPPU.XB[((c & 7) << 2) | ((p & 1) << 1)], IPPU.XB[((c & 0x38) >> 1) | (p & 2)], IPPU.XB[((c & 0xc0) >> 3) | (p & 4)]);
|
||||
}
|
||||
|
||||
void S9xStartScreenRefresh (void)
|
||||
{
|
||||
GFX.InterlaceFrame = !GFX.InterlaceFrame;
|
||||
|
||||
if (IPPU.RenderThisFrame)
|
||||
{
|
||||
if (!GFX.DoInterlace || !GFX.InterlaceFrame)
|
||||
{
|
||||
if (!S9xInitUpdate())
|
||||
{
|
||||
IPPU.RenderThisFrame = FALSE;
|
||||
return;
|
||||
}
|
||||
|
||||
if (GFX.DoInterlace)
|
||||
GFX.DoInterlace--;
|
||||
|
||||
S9xGraphicsScreenResize();
|
||||
|
||||
IPPU.RenderedFramesCount++;
|
||||
}
|
||||
@ -386,8 +406,8 @@ void S9xStartScreenRefresh (void)
|
||||
PPU.RecomputeClipWindows = TRUE;
|
||||
IPPU.PreviousLine = IPPU.CurrentLine = 0;
|
||||
|
||||
ZeroMemory(GFX.ZBuffer, GFX.ScreenSize);
|
||||
ZeroMemory(GFX.SubZBuffer, GFX.ScreenSize);
|
||||
memset(GFX.ZBuffer, 0, GFX.ScreenSize);
|
||||
memset(GFX.SubZBuffer, 0, GFX.ScreenSize);
|
||||
}
|
||||
|
||||
if (++IPPU.FrameCount % Memory.ROMFramesPerSecond == 0)
|
||||
@ -692,7 +712,6 @@ void S9xUpdateScreen (void)
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
// Have to back out of the regular speed hack
|
||||
for (register uint32 y = 0; y < GFX.StartY; y++)
|
||||
{
|
||||
@ -702,31 +721,20 @@ void S9xUpdateScreen (void)
|
||||
for (register int x = 255; x >= 0; x--, p--, q -= 2)
|
||||
*q = *(q + 1) = *p;
|
||||
}
|
||||
}
|
||||
|
||||
IPPU.DoubleWidthPixels = TRUE;
|
||||
IPPU.RenderedScreenWidth = 512;
|
||||
}
|
||||
|
||||
if (!IPPU.DoubleHeightPixels && IPPU.Interlace)
|
||||
if (!IPPU.DoubleHeightPixels && IPPU.Interlace && (PPU.BGMode == 5 || PPU.BGMode == 6))
|
||||
{
|
||||
IPPU.DoubleHeightPixels = TRUE;
|
||||
IPPU.RenderedScreenHeight = PPU.ScreenHeight << 1;
|
||||
GFX.PPL = GFX.RealPPL << 1;
|
||||
GFX.DoInterlace = 2;
|
||||
|
||||
for (register int32 y = (int32) GFX.StartY - 1; y >= 0; y--)
|
||||
memmove(GFX.Screen + y * GFX.PPL, GFX.Screen + y * GFX.RealPPL, IPPU.RenderedScreenWidth * sizeof(uint16));
|
||||
}
|
||||
else if (IPPU.DoubleHeightPixels && !IPPU.Interlace)
|
||||
{
|
||||
for (register int32 y = 0; y < (int32) GFX.StartY; y++)
|
||||
memmove(GFX.Screen + y * GFX.RealPPL, GFX.Screen + y * GFX.PPL, IPPU.RenderedScreenWidth * sizeof(uint16));
|
||||
|
||||
IPPU.DoubleHeightPixels = FALSE;
|
||||
IPPU.RenderedScreenHeight = PPU.ScreenHeight;
|
||||
GFX.PPL = GFX.RealPPL;
|
||||
GFX.DoInterlace = 0;
|
||||
for (register int32 y = (int32) GFX.StartY - 2; y >= 0; y--)
|
||||
memmove(GFX.Screen + (y + 1) * GFX.PPL, GFX.Screen + y * GFX.RealPPL, GFX.PPL * sizeof(uint16));
|
||||
}
|
||||
}
|
||||
|
||||
@ -819,12 +827,12 @@ static void SetupOBJ (void)
|
||||
if (!PPU.OAMPriorityRotation || !(PPU.OAMFlip & PPU.OAMAddr & 1)) // normal case
|
||||
{
|
||||
uint8 LineOBJ[SNES_HEIGHT_EXTENDED];
|
||||
ZeroMemory(LineOBJ, sizeof(LineOBJ));
|
||||
memset(LineOBJ, 0, sizeof(LineOBJ));
|
||||
|
||||
for (int i = 0; i < SNES_HEIGHT_EXTENDED; i++)
|
||||
{
|
||||
GFX.OBJLines[i].RTOFlags = 0;
|
||||
GFX.OBJLines[i].Tiles = 34;
|
||||
GFX.OBJLines[i].Tiles = Settings.MaxSpriteTilesPerLine;
|
||||
for (int j = 0; j < 32; j++)
|
||||
GFX.OBJLines[i].OBJ[j].Sprite = -1;
|
||||
}
|
||||
@ -896,7 +904,13 @@ static void SetupOBJ (void)
|
||||
{
|
||||
// First, find out which sprites are on which lines
|
||||
uint8 OBJOnLine[SNES_HEIGHT_EXTENDED][128];
|
||||
ZeroMemory(OBJOnLine, sizeof(OBJOnLine));
|
||||
// memset(OBJOnLine, 0, sizeof(OBJOnLine));
|
||||
/* Hold on here, that's a lot of bytes to initialise at once!
|
||||
* So we only initialise them per line, as needed. [Neb]
|
||||
* Bonus: We can quickly avoid looping if a line has no OBJs.
|
||||
*/
|
||||
bool8 AnyOBJOnLine[SNES_HEIGHT_EXTENDED];
|
||||
memset(AnyOBJOnLine, FALSE, sizeof(AnyOBJOnLine)); // better
|
||||
|
||||
for (S = 0; S < 128; S++)
|
||||
{
|
||||
@ -930,6 +944,11 @@ static void SetupOBJ (void)
|
||||
if (Y >= SNES_HEIGHT_EXTENDED)
|
||||
continue;
|
||||
|
||||
if (!AnyOBJOnLine[Y]) {
|
||||
memset(OBJOnLine[Y], 0, sizeof(OBJOnLine[Y]));
|
||||
AnyOBJOnLine[Y] = TRUE;
|
||||
}
|
||||
|
||||
if (PPU.OBJ[S].VFlip)
|
||||
// Yes, Width not Height. It so happens that the
|
||||
// sprites with H=2*W flip as two WxW sprites.
|
||||
@ -945,12 +964,14 @@ static void SetupOBJ (void)
|
||||
for (int Y = 0; Y < SNES_HEIGHT_EXTENDED; Y++)
|
||||
{
|
||||
GFX.OBJLines[Y].RTOFlags = Y ? GFX.OBJLines[Y - 1].RTOFlags : 0;
|
||||
GFX.OBJLines[Y].Tiles = 34;
|
||||
GFX.OBJLines[Y].Tiles = Settings.MaxSpriteTilesPerLine;
|
||||
|
||||
uint8 FirstSprite = (PPU.FirstSprite + Y) & 0x7f;
|
||||
S = FirstSprite;
|
||||
j = 0;
|
||||
|
||||
if (AnyOBJOnLine[Y])
|
||||
{
|
||||
do
|
||||
{
|
||||
if (OBJOnLine[Y][S])
|
||||
@ -970,6 +991,7 @@ static void SetupOBJ (void)
|
||||
|
||||
S = (S + 1) & 0x7f;
|
||||
} while (S != FirstSprite);
|
||||
}
|
||||
|
||||
if (j < 32)
|
||||
GFX.OBJLines[Y].OBJ[j].Sprite = -1;
|
||||
@ -979,6 +1001,8 @@ static void SetupOBJ (void)
|
||||
IPPU.OBJChanged = FALSE;
|
||||
}
|
||||
|
||||
#pragma GCC push_options
|
||||
#pragma GCC optimize ("no-tree-vrp")
|
||||
static void DrawOBJS (int D)
|
||||
{
|
||||
void (*DrawTile) (uint32, uint32, uint32, uint32) = NULL;
|
||||
@ -1071,6 +1095,8 @@ static void DrawOBJS (int D)
|
||||
}
|
||||
}
|
||||
}
|
||||
#pragma GCC pop_options
|
||||
|
||||
|
||||
static void DrawBackground (int bg, uint8 Zh, uint8 Zl)
|
||||
{
|
||||
@ -1329,8 +1355,8 @@ static void DrawBackgroundMosaic (int bg, uint8 Zh, uint8 Zl)
|
||||
for (uint32 Y = GFX.StartY - MosaicStart; Y <= GFX.EndY; Y += PPU.Mosaic)
|
||||
{
|
||||
uint32 Y2 = HiresInterlace ? Y * 2 : Y;
|
||||
uint32 VOffset = LineData[Y].BG[bg].VOffset + (HiresInterlace ? 1 : 0);
|
||||
uint32 HOffset = LineData[Y].BG[bg].HOffset;
|
||||
uint32 VOffset = LineData[Y + MosaicStart].BG[bg].VOffset + (HiresInterlace ? 1 : 0);
|
||||
uint32 HOffset = LineData[Y + MosaicStart].BG[bg].HOffset;
|
||||
|
||||
Lines = PPU.Mosaic - MosaicStart;
|
||||
if (Y + MosaicStart + Lines > GFX.EndY)
|
||||
@ -1493,7 +1519,6 @@ static void DrawBackgroundOffset (int bg, uint8 Zh, uint8 Zl, int VOffOff)
|
||||
int PixWidth = IPPU.DoubleWidthPixels ? 2 : 1;
|
||||
bool8 HiresInterlace = IPPU.Interlace && IPPU.DoubleWidthPixels;
|
||||
|
||||
void (*DrawTile) (uint32, uint32, uint32, uint32);
|
||||
void (*DrawClippedTile) (uint32, uint32, uint32, uint32, uint32, uint32);
|
||||
|
||||
for (int clip = 0; clip < GFX.Clip[bg].Count; clip++)
|
||||
@ -1502,12 +1527,10 @@ static void DrawBackgroundOffset (int bg, uint8 Zh, uint8 Zl, int VOffOff)
|
||||
|
||||
if (BG.EnableMath && (GFX.Clip[bg].DrawMode[clip] & 2))
|
||||
{
|
||||
DrawTile = GFX.DrawTileMath;
|
||||
DrawClippedTile = GFX.DrawClippedTileMath;
|
||||
}
|
||||
else
|
||||
{
|
||||
DrawTile = GFX.DrawTileNomath;
|
||||
DrawClippedTile = GFX.DrawClippedTileNomath;
|
||||
}
|
||||
|
||||
@ -1539,8 +1562,8 @@ static void DrawBackgroundOffset (int bg, uint8 Zh, uint8 Zl, int VOffOff)
|
||||
uint32 Left = GFX.Clip[bg].Left[clip];
|
||||
uint32 Right = GFX.Clip[bg].Right[clip];
|
||||
uint32 Offset = Left * PixWidth + Y * GFX.PPL;
|
||||
uint32 LineHOffset = LineData[Y].BG[bg].HOffset;
|
||||
bool8 left_edge = (Left < (8 - (LineHOffset & 7)));
|
||||
uint32 HScroll = LineData[Y].BG[bg].HOffset;
|
||||
bool8 left_edge = (Left < (8 - (HScroll & 7)));
|
||||
uint32 Width = Right - Left;
|
||||
|
||||
while (Left < Right)
|
||||
@ -1551,7 +1574,7 @@ static void DrawBackgroundOffset (int bg, uint8 Zh, uint8 Zl, int VOffOff)
|
||||
{
|
||||
// SNES cannot do OPT for leftmost tile column
|
||||
VOffset = LineData[Y].BG[bg].VOffset;
|
||||
HOffset = LineHOffset;
|
||||
HOffset = HScroll;
|
||||
left_edge = FALSE;
|
||||
}
|
||||
else
|
||||
@ -1595,9 +1618,9 @@ static void DrawBackgroundOffset (int bg, uint8 Zh, uint8 Zl, int VOffOff)
|
||||
VOffset = LineData[Y].BG[bg].VOffset;
|
||||
|
||||
if (HCellOffset & OffsetEnableMask)
|
||||
HOffset = (HCellOffset & ~7) | (LineHOffset & 7);
|
||||
HOffset = (HCellOffset & ~7) | (HScroll & 7);
|
||||
else
|
||||
HOffset = LineHOffset;
|
||||
HOffset = HScroll;
|
||||
}
|
||||
|
||||
if (HiresInterlace)
|
||||
@ -1719,7 +1742,6 @@ static void DrawBackgroundOffsetMosaic (int bg, uint8 Zh, uint8 Zl, int VOffOff)
|
||||
int Lines;
|
||||
int OffsetMask = (BG.TileSizeH == 16) ? 0x3ff : 0x1ff;
|
||||
int OffsetShift = (BG.TileSizeV == 16) ? 4 : 3;
|
||||
int Offset2Mask = (BG.OffsetSizeH == 16) ? 0x3ff : 0x1ff;
|
||||
int Offset2Shift = (BG.OffsetSizeV == 16) ? 4 : 3;
|
||||
int OffsetEnableMask = 0x2000 << bg;
|
||||
int PixWidth = IPPU.DoubleWidthPixels ? 2 : 1;
|
||||
@ -1741,8 +1763,8 @@ static void DrawBackgroundOffsetMosaic (int bg, uint8 Zh, uint8 Zl, int VOffOff)
|
||||
for (uint32 Y = GFX.StartY - MosaicStart; Y <= GFX.EndY; Y += PPU.Mosaic)
|
||||
{
|
||||
uint32 Y2 = HiresInterlace ? Y * 2 : Y;
|
||||
uint32 VOff = LineData[Y].BG[2].VOffset - 1;
|
||||
uint32 HOff = LineData[Y].BG[2].HOffset;
|
||||
uint32 VOff = LineData[Y + MosaicStart].BG[2].VOffset - 1;
|
||||
uint32 HOff = LineData[Y + MosaicStart].BG[2].HOffset;
|
||||
|
||||
Lines = PPU.Mosaic - MosaicStart;
|
||||
if (Y + MosaicStart + Lines > GFX.EndY)
|
||||
@ -1771,24 +1793,22 @@ static void DrawBackgroundOffsetMosaic (int bg, uint8 Zh, uint8 Zl, int VOffOff)
|
||||
uint32 Left = GFX.Clip[bg].Left[clip];
|
||||
uint32 Right = GFX.Clip[bg].Right[clip];
|
||||
uint32 Offset = Left * PixWidth + (Y + MosaicStart) * GFX.PPL;
|
||||
uint32 LineHOffset = LineData[Y].BG[bg].HOffset;
|
||||
bool8 left_edge = (Left < (8 - (LineHOffset & 7)));
|
||||
uint32 HScroll = LineData[Y + MosaicStart].BG[bg].HOffset;
|
||||
uint32 Width = Right - Left;
|
||||
|
||||
while (Left < Right)
|
||||
{
|
||||
uint32 VOffset, HOffset;
|
||||
|
||||
if (left_edge)
|
||||
if (Left < (8 - (HScroll & 7)))
|
||||
{
|
||||
// SNES cannot do OPT for leftmost tile column
|
||||
VOffset = LineData[Y].BG[bg].VOffset;
|
||||
HOffset = LineHOffset;
|
||||
left_edge = FALSE;
|
||||
VOffset = LineData[Y + MosaicStart].BG[bg].VOffset;
|
||||
HOffset = HScroll;
|
||||
}
|
||||
else
|
||||
{
|
||||
int HOffTile = ((HOff + Left - 1) & Offset2Mask) >> 3;
|
||||
int HOffTile = (((Left + (HScroll & 7)) - 8) + (HOff & ~7)) >> 3;
|
||||
|
||||
if (BG.OffsetSizeH == 8)
|
||||
{
|
||||
@ -1824,12 +1844,12 @@ static void DrawBackgroundOffsetMosaic (int bg, uint8 Zh, uint8 Zl, int VOffOff)
|
||||
if (VCellOffset & OffsetEnableMask)
|
||||
VOffset = VCellOffset + 1;
|
||||
else
|
||||
VOffset = LineData[Y].BG[bg].VOffset;
|
||||
VOffset = LineData[Y + MosaicStart].BG[bg].VOffset;
|
||||
|
||||
if (HCellOffset & OffsetEnableMask)
|
||||
HOffset = (HCellOffset & ~7) | (LineHOffset & 7);
|
||||
HOffset = (HCellOffset & ~7) | (HScroll & 7);
|
||||
else
|
||||
HOffset = LineHOffset;
|
||||
HOffset = HScroll;
|
||||
}
|
||||
|
||||
if (HiresInterlace)
|
||||
@ -2052,7 +2072,7 @@ static void DisplayPressedKeys (void)
|
||||
static int KeyOrder[] = { 8, 10, 7, 9, 0, 6, 14, 13, 5, 1, 4, 3, 2, 11, 12 }; // < ^ > v A B Y X L R S s
|
||||
|
||||
enum controllers controller;
|
||||
int line = 1;
|
||||
int line = Settings.DisplayMovieFrame && S9xMovieActive() ? 2 : 1;
|
||||
int8 ids[4];
|
||||
char string[255];
|
||||
|
||||
@ -2267,12 +2287,7 @@ void S9xDrawCrosshair (const char *crosshair, uint8 fgcolor, uint8 bgcolor, int1
|
||||
fg = get_crosshair_color(fgcolor);
|
||||
bg = get_crosshair_color(bgcolor);
|
||||
|
||||
// XXX: FIXME: why does it crash without this on Linux port? There are no out-of-bound writes without it...
|
||||
#if (defined(__unix) || defined(__linux) || defined(__sun) || defined(__DJGPP))
|
||||
if (x >= 0 && y >= 0)
|
||||
#endif
|
||||
{
|
||||
uint16 *s = GFX.Screen + y * GFX.RealPPL + x;
|
||||
uint16 *s = GFX.Screen + y * (int32)GFX.RealPPL + x;
|
||||
|
||||
for (r = 0; r < 15 * rx; r++, s += GFX.RealPPL - 15 * cx)
|
||||
{
|
||||
@ -2306,7 +2321,6 @@ void S9xDrawCrosshair (const char *crosshair, uint8 fgcolor, uint8 bgcolor, int1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef GFX_MULTI_FORMAT
|
||||
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -344,6 +359,7 @@ void S9xBuildDirectColourMaps (void);
|
||||
void RenderLine (uint8);
|
||||
void S9xComputeClipWindows (void);
|
||||
void S9xDisplayChar (uint16 *, uint8);
|
||||
void S9xGraphicsScreenResize (void);
|
||||
// called automatically unless Settings.AutoDisplayMessages is false
|
||||
void S9xDisplayMessages (uint16 *, int, int, int, int);
|
||||
#ifdef GFX_MULTI_FORMAT
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -195,7 +210,7 @@
|
||||
#define SAVE_INFO_LOAD "Loaded"
|
||||
#define SAVE_INFO_OOPS "Auto-saving 'oops' snapshot"
|
||||
#define SAVE_ERR_WRONG_FORMAT "File not in Snes9x snapshot format"
|
||||
#define SAVE_ERR_WRONG_VERSION "Incompatable snapshot version"
|
||||
#define SAVE_ERR_WRONG_VERSION "Incompatible snapshot version"
|
||||
#define SAVE_ERR_ROM_NOT_FOUND "ROM image \"%s\" for snapshot not found"
|
||||
#define SAVE_ERR_SAVE_NOT_FOUND "Snapshot %s does not exist"
|
||||
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -1401,6 +1401,20 @@ int CMemory::ScoreLoROM (bool8 skip_header, int32 romoff)
|
||||
return (score);
|
||||
}
|
||||
|
||||
int CMemory::First512BytesCountZeroes() const
|
||||
{
|
||||
const uint8 *buf = ROM;
|
||||
int zeroCount = 0;
|
||||
for (int i = 0; i < 512; i++)
|
||||
{
|
||||
if (buf[i] == 0)
|
||||
{
|
||||
zeroCount++;
|
||||
}
|
||||
}
|
||||
return zeroCount;
|
||||
}
|
||||
|
||||
uint32 CMemory::HeaderRemove (uint32 size, uint8 *buf)
|
||||
{
|
||||
uint32 calc_size = (size / 0x2000) * 0x2000;
|
||||
@ -1616,13 +1630,21 @@ bool8 CMemory::LoadROMInt (int32 ROMfillSize)
|
||||
ExtendedFormat = NOPE;
|
||||
|
||||
int hi_score, lo_score;
|
||||
int score_headered;
|
||||
int score_nonheadered;
|
||||
|
||||
hi_score = ScoreHiROM(FALSE);
|
||||
lo_score = ScoreLoROM(FALSE);
|
||||
score_nonheadered = max(hi_score, lo_score);
|
||||
score_headered = max(ScoreHiROM(TRUE), ScoreLoROM(TRUE));
|
||||
|
||||
if (HeaderCount == 0 && !Settings.ForceNoHeader &&
|
||||
((hi_score > lo_score && ScoreHiROM(TRUE) > hi_score) ||
|
||||
(hi_score <= lo_score && ScoreLoROM(TRUE) > lo_score)))
|
||||
bool size_is_likely_headered = ((ROMfillSize - 512) & 0xFFFF) == 0;
|
||||
if (size_is_likely_headered) { score_headered += 2; } else { score_headered -= 2; }
|
||||
if (First512BytesCountZeroes() >= 0x1E0) { score_headered += 2; } else { score_headered -= 2; }
|
||||
|
||||
bool headered_score_highest = score_headered > score_nonheadered;
|
||||
|
||||
if (HeaderCount == 0 && !Settings.ForceNoHeader && headered_score_highest)
|
||||
{
|
||||
memmove(ROM, ROM + 512, ROMfillSize - 512);
|
||||
ROMfillSize -= 512;
|
||||
@ -3850,7 +3872,7 @@ void CMemory::ApplyROMFixes (void)
|
||||
|
||||
Timings.HDMAStart = SNES_HDMA_START_HC + Settings.HDMATimingHack - 100;
|
||||
Timings.HBlankStart = SNES_HBLANK_START_HC + Timings.HDMAStart - SNES_HDMA_START_HC;
|
||||
Timings.IRQTriggerCycles = 10;
|
||||
Timings.IRQTriggerCycles = 14;
|
||||
|
||||
if (!Settings.DisableGameSpecificHacks)
|
||||
{
|
||||
|
||||
@ -294,6 +294,7 @@ struct CMemory
|
||||
|
||||
int ScoreHiROM (bool8, int32 romoff = 0);
|
||||
int ScoreLoROM (bool8, int32 romoff = 0);
|
||||
int First512BytesCountZeroes() const;
|
||||
uint32 HeaderRemove (uint32, uint8 *);
|
||||
uint32 FileLoader (uint8 *, const char *, uint32);
|
||||
uint32 MemLoader (uint8 *, const char*, uint32);
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -437,14 +452,14 @@ static void reset_controllers (void)
|
||||
MovieSetJoypad(i, 0);
|
||||
|
||||
uint8 clearedMouse[MOUSE_DATA_SIZE];
|
||||
ZeroMemory(clearedMouse, MOUSE_DATA_SIZE);
|
||||
memset(clearedMouse, 0, MOUSE_DATA_SIZE);
|
||||
clearedMouse[4] = 1;
|
||||
|
||||
uint8 clearedScope[SCOPE_DATA_SIZE];
|
||||
ZeroMemory(clearedScope, SCOPE_DATA_SIZE);
|
||||
memset(clearedScope, 0, SCOPE_DATA_SIZE);
|
||||
|
||||
uint8 clearedJustifier[JUSTIFIER_DATA_SIZE];
|
||||
ZeroMemory(clearedJustifier, JUSTIFIER_DATA_SIZE);
|
||||
memset(clearedJustifier, 0, JUSTIFIER_DATA_SIZE);
|
||||
|
||||
for (int p = 0; p < 2; p++)
|
||||
{
|
||||
@ -639,7 +654,7 @@ static void write_movie_header (FILE *fd, SMovie *movie)
|
||||
{
|
||||
uint8 buf[SMV_HEADER_SIZE], *ptr = buf;
|
||||
|
||||
ZeroMemory(buf, sizeof(buf));
|
||||
memset(buf, 0, sizeof(buf));
|
||||
|
||||
Write32(SMV_MAGIC, ptr);
|
||||
Write32(SMV_VERSION, ptr);
|
||||
@ -771,7 +786,8 @@ int S9xMovieUnfreeze (uint8 *buf, uint32 size)
|
||||
}
|
||||
else
|
||||
{
|
||||
if (current_frame > Movie.MaxFrame || current_sample > Movie.MaxSample || memcmp(Movie.InputBuffer, ptr, space_needed))
|
||||
uint32 space_processed = (Movie.BytesPerSample * (current_sample + 1));
|
||||
if (current_frame > Movie.MaxFrame || current_sample > Movie.MaxSample || memcmp(Movie.InputBuffer, ptr, space_processed))
|
||||
return (SNAPSHOT_INCONSISTENT);
|
||||
|
||||
change_state(MOVIE_STATE_PLAY);
|
||||
@ -812,13 +828,15 @@ int S9xMovieOpen (const char *filename, bool8 read_only)
|
||||
|
||||
read_movie_extrarominfo(fd, &Movie);
|
||||
|
||||
fn = dup(fileno(fd));
|
||||
fclose(fd);
|
||||
fflush(fd);
|
||||
fn = fileno(fd);
|
||||
|
||||
store_previous_settings();
|
||||
restore_movie_settings();
|
||||
|
||||
lseek(fn, Movie.SaveStateOffset, SEEK_SET);
|
||||
|
||||
// reopen stream to access as gzipped data
|
||||
stream = REOPEN_STREAM(fn, "rb");
|
||||
if (!stream)
|
||||
return (FILE_NOT_FOUND);
|
||||
@ -832,7 +850,11 @@ int S9xMovieOpen (const char *filename, bool8 read_only)
|
||||
else
|
||||
result = S9xUnfreezeFromStream(stream);
|
||||
|
||||
CLOSE_STREAM(stream);
|
||||
// do not close stream but close FILE *
|
||||
// (msvcrt will try to close all open FILE *handles on exit - if we do CLOSE_STREAM here
|
||||
// the underlying file will be closed by zlib, causing problems when msvcrt tries to do it)
|
||||
delete stream;
|
||||
fclose(fd);
|
||||
|
||||
if (result != SUCCESS)
|
||||
return (result);
|
||||
@ -846,7 +868,10 @@ int S9xMovieOpen (const char *filename, bool8 read_only)
|
||||
}
|
||||
|
||||
if (fseek(fd, Movie.ControllerDataOffset, SEEK_SET))
|
||||
{
|
||||
fclose(fd);
|
||||
return (WRONG_FORMAT);
|
||||
}
|
||||
|
||||
Movie.File = fd;
|
||||
Movie.BytesPerSample = bytes_per_sample();
|
||||
@ -879,7 +904,6 @@ int S9xMovieCreate (const char *filename, uint8 controllers_mask, uint8 opts, co
|
||||
{
|
||||
FILE *fd;
|
||||
STREAM stream;
|
||||
int fn;
|
||||
|
||||
if (controllers_mask == 0)
|
||||
return (WRONG_FORMAT);
|
||||
@ -928,10 +952,9 @@ int S9xMovieCreate (const char *filename, uint8 controllers_mask, uint8 opts, co
|
||||
|
||||
write_movie_extrarominfo(fd, &Movie);
|
||||
|
||||
fn = dup(fileno(fd));
|
||||
fclose(fd);
|
||||
|
||||
stream = REOPEN_STREAM(fn, "ab");
|
||||
stream = OPEN_STREAM(filename, "ab");
|
||||
if (!stream)
|
||||
return (FILE_NOT_FOUND);
|
||||
|
||||
@ -989,14 +1012,17 @@ int S9xMovieGetInfo (const char *filename, struct MovieInfo *info)
|
||||
|
||||
flush_movie();
|
||||
|
||||
ZeroMemory(info, sizeof(*info));
|
||||
memset(info, 0, sizeof(*info));
|
||||
|
||||
if (!(fd = fopen(filename, "rb")))
|
||||
return (FILE_NOT_FOUND);
|
||||
|
||||
result = read_movie_header(fd, &local_movie);
|
||||
if (result != SUCCESS)
|
||||
{
|
||||
fclose(fd);
|
||||
return (result);
|
||||
}
|
||||
|
||||
info->TimeCreated = (time_t) local_movie.MovieId;
|
||||
info->Version = local_movie.Version;
|
||||
@ -1035,9 +1061,10 @@ int S9xMovieGetInfo (const char *filename, struct MovieInfo *info)
|
||||
strncpy(info->ROMName, local_movie.ROMName, 23);
|
||||
|
||||
fclose(fd);
|
||||
|
||||
if (access(filename, W_OK))
|
||||
if ((fd = fopen(filename, "r+")) == NULL)
|
||||
info->ReadOnly = true;
|
||||
else
|
||||
fclose(fd);
|
||||
|
||||
return (SUCCESS);
|
||||
}
|
||||
@ -1117,7 +1144,7 @@ void S9xMovieUpdateOnReset (void)
|
||||
|
||||
void S9xMovieInit (void)
|
||||
{
|
||||
ZeroMemory(&Movie, sizeof(Movie));
|
||||
memset(&Movie, 0, sizeof(Movie));
|
||||
Movie.State = MOVIE_STATE_NONE;
|
||||
}
|
||||
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -184,10 +199,8 @@
|
||||
#define MOVIE_OPT_NOSAVEDATA (1 << 2)
|
||||
#define MOVIE_SYNC_DATA_EXISTS 0x01
|
||||
#define MOVIE_SYNC_OBSOLETE 0x02
|
||||
#define MOVIE_SYNC_LEFTRIGHT 0x04
|
||||
#define MOVIE_SYNC_VOLUMEENVX 0x08
|
||||
#define MOVIE_SYNC_FAKEMUTE 0x10
|
||||
#define MOVIE_SYNC_SYNCSOUND 0x20
|
||||
#define MOVIE_SYNC_HASROMINFO 0x40
|
||||
#define MOVIE_SYNC_NOCPUSHUTDOWN 0x80
|
||||
#define MOVIE_MAX_METADATA 512
|
||||
|
||||
@ -22,10 +22,12 @@
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2016 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2011 - 2016 Hans-Kristian Arntzen,
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
@ -138,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2016 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -146,14 +148,14 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2016 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2016 Hans-Kristian Arntzen,
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
@ -190,12 +192,14 @@
|
||||
Nintendo Co., Limited and its subsidiary companies.
|
||||
***********************************************************************************/
|
||||
|
||||
#include "msu1.h"
|
||||
#include "display.h"
|
||||
#include "filebrowser.h"
|
||||
#include "snes9x.h"
|
||||
#include "memmap.h"
|
||||
#include "snes9xgx.h"
|
||||
#include "display.h"
|
||||
#include "msu1.h"
|
||||
#include "apu/blargg_endian.h"
|
||||
#include "snes9xgx.h"
|
||||
#include <fstream>
|
||||
#include <sys/stat.h>
|
||||
|
||||
STREAM dataStream = NULL;
|
||||
STREAM audioStream = NULL;
|
||||
@ -241,9 +245,12 @@ static int unzFindExtension(unzFile &file, const char *ext, bool restart = TRUE,
|
||||
|
||||
STREAM S9xMSU1OpenFile(const char *msu_ext, bool skip_unpacked)
|
||||
{
|
||||
#ifdef GEKKO
|
||||
char filename[MAXPATHLEN];
|
||||
sprintf(filename, "%s%s%s", Memory.ROMFilePath, Memory.ROMFilename, msu_ext);
|
||||
|
||||
#else
|
||||
const char *filename = S9xGetFilename(msu_ext, ROMFILENAME_DIR);
|
||||
#endif
|
||||
STREAM file = 0;
|
||||
|
||||
if (!skip_unpacked)
|
||||
@ -257,10 +264,15 @@ STREAM S9xMSU1OpenFile(const char *msu_ext, bool skip_unpacked)
|
||||
// look for msu1 pack file in the rom or patch dir if msu data file not found in rom dir
|
||||
if (!file)
|
||||
{
|
||||
char zip_filename[MAXPATHLEN];
|
||||
sprintf(zip_filename, "%s%s.msu1", Memory.ROMFilePath, Memory.ROMFilename);
|
||||
const char *zip_filename = S9xGetFilename(".msu1", ROMFILENAME_DIR);
|
||||
unzFile unzFile = unzOpen(zip_filename);
|
||||
|
||||
if (!unzFile)
|
||||
{
|
||||
zip_filename = S9xGetFilename(".msu1", PATCH_DIR);
|
||||
unzFile = unzOpen(zip_filename);
|
||||
}
|
||||
|
||||
if (unzFile)
|
||||
{
|
||||
int port = unzFindExtension(unzFile, msu_ext, true, true, true);
|
||||
@ -381,7 +393,6 @@ void S9xMSU1DeInit(void)
|
||||
AudioClose();
|
||||
}
|
||||
|
||||
|
||||
bool S9xMSU1ROMExists(void)
|
||||
{
|
||||
STREAM s = S9xMSU1OpenFile(".msu");
|
||||
@ -391,9 +402,15 @@ bool S9xMSU1ROMExists(void)
|
||||
return true;
|
||||
}
|
||||
#ifdef UNZIP_SUPPORT
|
||||
char fname[MAXPATHLEN];
|
||||
sprintf(fname, "%s%s.msu1", Memory.ROMFilePath, Memory.ROMFilename);
|
||||
unzFile unzFile = unzOpen(fname);
|
||||
char drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1];
|
||||
_splitpath(Memory.ROMFilename, drive, dir, def, ext);
|
||||
if (!strcasecmp(ext, ".msu1"))
|
||||
return true;
|
||||
|
||||
unzFile unzFile = unzOpen(S9xGetFilename(".msu1", ROMFILENAME_DIR));
|
||||
|
||||
if(!unzFile)
|
||||
unzFile = unzOpen(S9xGetFilename(".msu1", PATCH_DIR));
|
||||
|
||||
if (unzFile)
|
||||
{
|
||||
@ -422,6 +439,7 @@ void S9xMSU1Generate(size_t sample_count)
|
||||
*left = ((int32)(int16)GET_LE16(left) * MSU1.MSU1_VOLUME / 255);
|
||||
*right = ((int32)(int16)GET_LE16(right) * MSU1.MSU1_VOLUME / 255);
|
||||
|
||||
|
||||
*(bufPos++) = *left;
|
||||
*(bufPos++) = *right;
|
||||
MSU1.MSU1_AUDIO_POS += 4;
|
||||
|
||||
@ -22,10 +22,12 @@
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2016 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2011 - 2016 Hans-Kristian Arntzen,
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
@ -138,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2016 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -146,14 +148,14 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2016 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2016 Hans-Kristian Arntzen,
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
@ -193,8 +195,6 @@
|
||||
#ifndef _MSU1_H_
|
||||
#define _MSU1_H_
|
||||
#include "snes9x.h"
|
||||
#include <stdint.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#define MSU1_REVISION 0x02
|
||||
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -192,7 +207,7 @@
|
||||
#include <sys/types.h>
|
||||
|
||||
#ifdef __WIN32__
|
||||
#define NOMINMAX
|
||||
#define NOMINMAX 1
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
@ -201,7 +216,14 @@
|
||||
#define RIGHTSHIFT_int8_IS_SAR
|
||||
#define RIGHTSHIFT_int16_IS_SAR
|
||||
#define RIGHTSHIFT_int32_IS_SAR
|
||||
#ifndef GEKKO
|
||||
#define SNES_JOY_READ_CALLBACKS
|
||||
#define GFX_MULTI_FORMAT
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __LIBRETRO__
|
||||
#define GFX_MULTI_FORMAT
|
||||
#endif
|
||||
|
||||
#ifdef __MACOSX__
|
||||
@ -230,30 +252,22 @@ typedef uint64_t uint64;
|
||||
#else // HAVE_STDINT_H
|
||||
#ifdef __WIN32__
|
||||
typedef intptr_t pint;
|
||||
#else // __WIN32__
|
||||
#ifdef PTR_NOT_INT
|
||||
typedef long pint;
|
||||
#else
|
||||
typedef int pint;
|
||||
#endif
|
||||
#endif // __WIN32__
|
||||
#ifdef __WIN32__
|
||||
#ifdef __BORLANDC__
|
||||
#include <systypes.h>
|
||||
#else
|
||||
typedef signed char int8;
|
||||
typedef unsigned char uint8;
|
||||
typedef signed short int16;
|
||||
typedef unsigned short uint16;
|
||||
#ifndef WSAAP
|
||||
// winsock2.h typedefs int32 as well
|
||||
typedef signed int int32;
|
||||
#endif
|
||||
typedef unsigned int uint32;
|
||||
#endif
|
||||
typedef unsigned char uint8_t;
|
||||
typedef signed __int64 int64;
|
||||
typedef unsigned __int64 uint64;
|
||||
typedef int8 int8_t;
|
||||
typedef uint8 uint8_t;
|
||||
typedef int16 int16_t;
|
||||
typedef uint16 uint16_t;
|
||||
typedef int32 int32_t;
|
||||
typedef uint32 uint32_t;
|
||||
typedef int64 int64_t;
|
||||
typedef uint64 uint64_t;
|
||||
typedef int socklen_t;
|
||||
#else // __WIN32__
|
||||
typedef signed char int8;
|
||||
@ -268,6 +282,11 @@ __extension__
|
||||
#endif
|
||||
typedef long long int64;
|
||||
typedef unsigned long long uint64;
|
||||
#ifdef PTR_NOT_INT
|
||||
typedef size_t pint;
|
||||
#else // __PTR_NOT_INT
|
||||
typedef size_t pint;
|
||||
#endif // __PTR_NOT_INT
|
||||
#endif // __WIN32__
|
||||
#endif // HAVE_STDINT_H
|
||||
#endif // snes9x_types_defined
|
||||
@ -298,21 +317,24 @@ typedef unsigned long long uint64;
|
||||
#endif
|
||||
|
||||
#ifndef __WIN32__
|
||||
#define ZeroMemory(a, b) memset((a), 0, (b))
|
||||
void _splitpath (const char *, char *, char *, char *, char *);
|
||||
void _makepath (char *, const char *, const char *, const char *, const char *);
|
||||
#define S9xDisplayString DisplayStringFromBottom
|
||||
#else
|
||||
#else // __WIN32__
|
||||
#define snprintf _snprintf
|
||||
#define strcasecmp stricmp
|
||||
#define strncasecmp strnicmp
|
||||
#ifndef __LIBRETRO__
|
||||
void WinDisplayStringFromBottom(const char *string, int linesFromBottom, int pixelsFromLeft, bool allowWrap);
|
||||
#define S9xDisplayString WinDisplayStringFromBottom
|
||||
void SetInfoDlgColor(unsigned char, unsigned char, unsigned char);
|
||||
#define SET_UI_COLOR(r,g,b) SetInfoDlgColor(r,g,b)
|
||||
#endif
|
||||
#else // __LIBRETRO__
|
||||
#define S9xDisplayString DisplayStringFromBottom
|
||||
#endif // __LIBRETRO__
|
||||
#endif // __WIN32__
|
||||
|
||||
#ifdef __DJGPP
|
||||
#if defined(__DJGPP) || defined(__WIN32__)
|
||||
#define SLASH_STR "\\"
|
||||
#define SLASH_CHAR '\\'
|
||||
#else
|
||||
@ -333,7 +355,7 @@ void SetInfoDlgColor(unsigned char, unsigned char, unsigned char);
|
||||
#define TITLE "Snes9x"
|
||||
#endif
|
||||
|
||||
#if defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(__x86_64__) || defined(__alpha__) || defined(__MIPSEL__) || defined(_M_IX86) || defined(_M_X64)
|
||||
#if defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(__x86_64__) || defined(__alpha__) || defined(__MIPSEL__) || defined(_M_IX86) || defined(_M_X64) || defined(_XBOX1) || defined(__arm__) || defined(ANDROID) || defined(__aarch64__) || (defined(__BYTE_ORDER__) && __BYTE_ORDER == __ORDER_LITTLE_ENDIAN__)
|
||||
#define LSB_FIRST
|
||||
#define FAST_LSB_WORD_ACCESS
|
||||
#else
|
||||
|
||||
@ -341,9 +341,9 @@ void S9xUpdateIRQPositions (bool initial)
|
||||
else if (!PPU.HTimerEnabled && PPU.VTimerEnabled)
|
||||
{
|
||||
if (CPU.V_Counter == PPU.VTimerPosition && initial)
|
||||
Timings.NextIRQTimer = CPU.Cycles + Timings.IRQTriggerCycles;
|
||||
Timings.NextIRQTimer = CPU.Cycles + Timings.IRQTriggerCycles - ONE_DOT_CYCLE;
|
||||
else
|
||||
Timings.NextIRQTimer = CyclesUntilNext (Timings.IRQTriggerCycles, PPU.VTimerPosition);
|
||||
Timings.NextIRQTimer = CyclesUntilNext (Timings.IRQTriggerCycles - ONE_DOT_CYCLE, PPU.VTimerPosition);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -716,15 +716,7 @@ void S9xSetPPU (uint8 Byte, uint16 Address)
|
||||
PPU.VMA.Address &= 0xff00;
|
||||
PPU.VMA.Address |= Byte;
|
||||
|
||||
if (PPU.VMA.FullGraphicCount)
|
||||
{
|
||||
uint32 addr = PPU.VMA.Address;
|
||||
uint32 rem = addr & PPU.VMA.Mask1;
|
||||
uint32 address = (addr & ~PPU.VMA.Mask1) + (rem >> PPU.VMA.Shift) + ((rem & (PPU.VMA.FullGraphicCount - 1)) << 3);
|
||||
IPPU.VRAMReadBuffer = READ_WORD(Memory.VRAM + ((address << 1) & 0xffff));
|
||||
}
|
||||
else
|
||||
IPPU.VRAMReadBuffer = READ_WORD(Memory.VRAM + ((PPU.VMA.Address << 1) & 0xffff));
|
||||
S9xUpdateVRAMReadBuffer();
|
||||
|
||||
break;
|
||||
|
||||
@ -732,15 +724,7 @@ void S9xSetPPU (uint8 Byte, uint16 Address)
|
||||
PPU.VMA.Address &= 0x00ff;
|
||||
PPU.VMA.Address |= Byte << 8;
|
||||
|
||||
if (PPU.VMA.FullGraphicCount)
|
||||
{
|
||||
uint32 addr = PPU.VMA.Address;
|
||||
uint32 rem = addr & PPU.VMA.Mask1;
|
||||
uint32 address = (addr & ~PPU.VMA.Mask1) + (rem >> PPU.VMA.Shift) + ((rem & (PPU.VMA.FullGraphicCount - 1)) << 3);
|
||||
IPPU.VRAMReadBuffer = READ_WORD(Memory.VRAM + ((address << 1) & 0xffff));
|
||||
}
|
||||
else
|
||||
IPPU.VRAMReadBuffer = READ_WORD(Memory.VRAM + ((PPU.VMA.Address << 1) & 0xffff));
|
||||
S9xUpdateVRAMReadBuffer();
|
||||
|
||||
break;
|
||||
|
||||
@ -1308,18 +1292,10 @@ uint8 S9xGetPPU (uint16 Address)
|
||||
return (PPU.OpenBus1 = byte);
|
||||
|
||||
case 0x2139: // VMDATALREAD
|
||||
byte = IPPU.VRAMReadBuffer & 0xff;
|
||||
byte = PPU.VRAMReadBuffer & 0xff;
|
||||
if (!PPU.VMA.High)
|
||||
{
|
||||
if (PPU.VMA.FullGraphicCount)
|
||||
{
|
||||
uint32 addr = PPU.VMA.Address;
|
||||
uint32 rem = addr & PPU.VMA.Mask1;
|
||||
uint32 address = (addr & ~PPU.VMA.Mask1) + (rem >> PPU.VMA.Shift) + ((rem & (PPU.VMA.FullGraphicCount - 1)) << 3);
|
||||
IPPU.VRAMReadBuffer = READ_WORD(Memory.VRAM + ((address << 1) & 0xffff));
|
||||
}
|
||||
else
|
||||
IPPU.VRAMReadBuffer = READ_WORD(Memory.VRAM + ((PPU.VMA.Address << 1) & 0xffff));
|
||||
S9xUpdateVRAMReadBuffer();
|
||||
|
||||
PPU.VMA.Address += PPU.VMA.Increment;
|
||||
}
|
||||
@ -1330,18 +1306,10 @@ uint8 S9xGetPPU (uint16 Address)
|
||||
return (PPU.OpenBus1 = byte);
|
||||
|
||||
case 0x213a: // VMDATAHREAD
|
||||
byte = (IPPU.VRAMReadBuffer >> 8) & 0xff;
|
||||
byte = (PPU.VRAMReadBuffer >> 8) & 0xff;
|
||||
if (PPU.VMA.High)
|
||||
{
|
||||
if (PPU.VMA.FullGraphicCount)
|
||||
{
|
||||
uint32 addr = PPU.VMA.Address;
|
||||
uint32 rem = addr & PPU.VMA.Mask1;
|
||||
uint32 address = (addr & ~PPU.VMA.Mask1) + (rem >> PPU.VMA.Shift) + ((rem & (PPU.VMA.FullGraphicCount - 1)) << 3);
|
||||
IPPU.VRAMReadBuffer = READ_WORD(Memory.VRAM + ((address << 1) & 0xffff));
|
||||
}
|
||||
else
|
||||
IPPU.VRAMReadBuffer = READ_WORD(Memory.VRAM + ((PPU.VMA.Address << 1) & 0xffff));
|
||||
S9xUpdateVRAMReadBuffer();
|
||||
|
||||
PPU.VMA.Address += PPU.VMA.Increment;
|
||||
}
|
||||
@ -1598,6 +1566,7 @@ void S9xSetCPU (uint8 Byte, uint16 Address)
|
||||
CPU.IRQTransition = FALSE;
|
||||
}
|
||||
|
||||
if ((Byte & 0x30) != (Memory.FillRAM[0x4200] & 0x30))
|
||||
S9xUpdateIRQPositions(true);
|
||||
|
||||
// NMI can trigger immediately during VBlank as long as NMI_read ($4210) wasn't cleard.
|
||||
@ -1752,6 +1721,8 @@ void S9xSetCPU (uint8 Byte, uint16 Address)
|
||||
}
|
||||
else
|
||||
CPU.FastROMSpeed = SLOW_ONE_CYCLE;
|
||||
// we might currently be in FastROMSpeed region, S9xSetPCBase will update CPU.MemSpeed
|
||||
S9xSetPCBase(Registers.PBPC);
|
||||
}
|
||||
|
||||
break;
|
||||
@ -2095,7 +2066,7 @@ void S9xSoftResetPPU (void)
|
||||
memset(IPPU.TileCached[TILE_2BIT_ODD], 0, MAX_2BIT_TILES);
|
||||
memset(IPPU.TileCached[TILE_4BIT_EVEN], 0, MAX_4BIT_TILES);
|
||||
memset(IPPU.TileCached[TILE_4BIT_ODD], 0, MAX_4BIT_TILES);
|
||||
IPPU.VRAMReadBuffer = 0; // XXX: FIXME: anything better?
|
||||
PPU.VRAMReadBuffer = 0; // XXX: FIXME: anything better?
|
||||
GFX.InterlaceFrame = 0;
|
||||
IPPU.Interlace = FALSE;
|
||||
IPPU.InterlaceOBJ = FALSE;
|
||||
|
||||
@ -225,10 +225,8 @@ struct InternalPPU
|
||||
struct ClipData Clip[2][6];
|
||||
bool8 ColorsChanged;
|
||||
bool8 OBJChanged;
|
||||
bool8 DirectColourMapsNeedRebuild;
|
||||
uint8 *TileCache[7];
|
||||
uint8 *TileCached[7];
|
||||
uint16 VRAMReadBuffer;
|
||||
bool8 Interlace;
|
||||
bool8 InterlaceOBJ;
|
||||
bool8 PseudoHires;
|
||||
@ -295,6 +293,7 @@ struct SPPU
|
||||
bool8 CGFLIP;
|
||||
uint8 CGFLIPRead;
|
||||
uint8 CGADD;
|
||||
uint8 CGSavedByte;
|
||||
uint16 CGDATA[256];
|
||||
|
||||
struct SOBJ OBJ[128];
|
||||
@ -378,6 +377,8 @@ struct SPPU
|
||||
|
||||
uint8 OpenBus1;
|
||||
uint8 OpenBus2;
|
||||
|
||||
uint16 VRAMReadBuffer;
|
||||
};
|
||||
|
||||
extern uint16 SignExtend[2];
|
||||
@ -419,6 +420,19 @@ static inline void FLUSH_REDRAW (void)
|
||||
S9xUpdateScreen();
|
||||
}
|
||||
|
||||
static inline void S9xUpdateVRAMReadBuffer()
|
||||
{
|
||||
if (PPU.VMA.FullGraphicCount)
|
||||
{
|
||||
uint32 addr = PPU.VMA.Address;
|
||||
uint32 rem = addr & PPU.VMA.Mask1;
|
||||
uint32 address = (addr & ~PPU.VMA.Mask1) + (rem >> PPU.VMA.Shift) + ((rem & (PPU.VMA.FullGraphicCount - 1)) << 3);
|
||||
PPU.VRAMReadBuffer = READ_WORD(Memory.VRAM + ((address << 1) & 0xffff));
|
||||
}
|
||||
else
|
||||
PPU.VRAMReadBuffer = READ_WORD(Memory.VRAM + ((PPU.VMA.Address << 1) & 0xffff));
|
||||
}
|
||||
|
||||
static inline void REGISTER_2104 (uint8 Byte)
|
||||
{
|
||||
if (!(PPU.OAMFlip & 1))
|
||||
@ -720,12 +734,12 @@ static inline void REGISTER_2122 (uint8 Byte)
|
||||
{
|
||||
if (PPU.CGFLIP)
|
||||
{
|
||||
if ((Byte & 0x7f) != (PPU.CGDATA[PPU.CGADD] >> 8))
|
||||
if ((Byte & 0x7f) != (PPU.CGDATA[PPU.CGADD] >> 8) || PPU.CGSavedByte != (uint8) (PPU.CGDATA[PPU.CGADD] & 0xff))
|
||||
{
|
||||
FLUSH_REDRAW();
|
||||
PPU.CGDATA[PPU.CGADD] &= 0x00ff;
|
||||
PPU.CGDATA[PPU.CGADD] |= (Byte & 0x7f) << 8;
|
||||
PPU.CGDATA[PPU.CGADD] = (Byte & 0x7f) << 8 | PPU.CGSavedByte;
|
||||
IPPU.ColorsChanged = TRUE;
|
||||
IPPU.Red[PPU.CGADD] = IPPU.XB[PPU.CGSavedByte & 0x1f];
|
||||
IPPU.Blue[PPU.CGADD] = IPPU.XB[(Byte >> 2) & 0x1f];
|
||||
IPPU.Green[PPU.CGADD] = IPPU.XB[(PPU.CGDATA[PPU.CGADD] >> 5) & 0x1f];
|
||||
IPPU.ScreenColors[PPU.CGADD] = (uint16) BUILD_PIXEL(IPPU.Red[PPU.CGADD], IPPU.Green[PPU.CGADD], IPPU.Blue[PPU.CGADD]);
|
||||
@ -735,16 +749,7 @@ static inline void REGISTER_2122 (uint8 Byte)
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Byte != (uint8) (PPU.CGDATA[PPU.CGADD] & 0xff))
|
||||
{
|
||||
FLUSH_REDRAW();
|
||||
PPU.CGDATA[PPU.CGADD] &= 0x7f00;
|
||||
PPU.CGDATA[PPU.CGADD] |= Byte;
|
||||
IPPU.ColorsChanged = TRUE;
|
||||
IPPU.Red[PPU.CGADD] = IPPU.XB[Byte & 0x1f];
|
||||
IPPU.Green[PPU.CGADD] = IPPU.XB[(PPU.CGDATA[PPU.CGADD] >> 5) & 0x1f];
|
||||
IPPU.ScreenColors[PPU.CGADD] = (uint16) BUILD_PIXEL(IPPU.Red[PPU.CGADD], IPPU.Green[PPU.CGADD], IPPU.Blue[PPU.CGADD]);
|
||||
}
|
||||
PPU.CGSavedByte = Byte;
|
||||
}
|
||||
|
||||
PPU.CGFLIP ^= 1;
|
||||
|
||||
@ -229,7 +229,7 @@ void S9xSA1Init (void)
|
||||
SA1.op2 = 0;
|
||||
SA1.sum = 0;
|
||||
SA1.overflow = FALSE;
|
||||
SA1.VirtualBitmapFormat = 0;
|
||||
SA1.VirtualBitmapFormat = 4;
|
||||
SA1.variable_bit_pos = 0;
|
||||
|
||||
SA1Registers.PBPC = 0;
|
||||
@ -303,6 +303,10 @@ void S9xSA1PostLoadState (void)
|
||||
SA1.VirtualBitmapFormat = (Memory.FillRAM[0x223f] & 0x80) ? 2 : 4;
|
||||
Memory.BWRAM = Memory.SRAM + (Memory.FillRAM[0x2224] & 7) * 0x2000;
|
||||
S9xSA1SetBWRAMMemMap(Memory.FillRAM[0x2225]);
|
||||
S9xSetSA1(Memory.FillRAM[0x2220], 0x2220);
|
||||
S9xSetSA1(Memory.FillRAM[0x2221], 0x2221);
|
||||
S9xSetSA1(Memory.FillRAM[0x2222], 0x2222);
|
||||
S9xSetSA1(Memory.FillRAM[0x2223], 0x2223);
|
||||
}
|
||||
|
||||
static void S9xSetSA1MemMap (uint32 which1, uint8 map)
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -218,70 +233,70 @@ static const int16 ST010_SinTable[256] =
|
||||
|
||||
static const uint8 ST010_ArcTan[32][32] =
|
||||
{
|
||||
{ 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
|
||||
0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 },
|
||||
{ 0x80, 0xa0, 0xad, 0xb3, 0xb6, 0xb8, 0xb9, 0xba, 0xbb, 0xbb, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd,
|
||||
0xbd, 0xbe, 0xbe, 0xbe, 0xbe, 0xbe, 0xbe, 0xbe, 0xbe, 0xbe, 0xbe, 0xbe, 0xbf, 0xbf, 0xbf, 0xbf },
|
||||
{ 0x80, 0x93, 0xa0, 0xa8, 0xad, 0xb0, 0xb3, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xba, 0xbb,
|
||||
0xbb, 0xbb, 0xbb, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd },
|
||||
{ 0x80, 0x8d, 0x98, 0xa0, 0xa6, 0xaa, 0xad, 0xb0, 0xb1, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb7, 0xb8,
|
||||
0xb8, 0xb9, 0xb9, 0xba, 0xba, 0xba, 0xba, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbc, 0xbc, 0xbc, 0xbc },
|
||||
{ 0x80, 0x8a, 0x93, 0x9a, 0xa0, 0xa5, 0xa8, 0xab, 0xad, 0xaf, 0xb0, 0xb2, 0xb3, 0xb4, 0xb5, 0xb5,
|
||||
0xb6, 0xb7, 0xb7, 0xb8, 0xb8, 0xb8, 0xb9, 0xb9, 0xb9, 0xba, 0xba, 0xba, 0xba, 0xba, 0xbb, 0xbb },
|
||||
{ 0x80, 0x88, 0x90, 0x96, 0x9b, 0xa0, 0xa4, 0xa7, 0xa9, 0xab, 0xad, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3,
|
||||
0xb4, 0xb4, 0xb5, 0xb6, 0xb6, 0xb6, 0xb7, 0xb7, 0xb8, 0xb8, 0xb8, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9 },
|
||||
{ 0x80, 0x87, 0x8d, 0x93, 0x98, 0x9c, 0xa0, 0xa3, 0xa6, 0xa8, 0xaa, 0xac, 0xad, 0xae, 0xb0, 0xb0,
|
||||
0xb1, 0xb2, 0xb3, 0xb4, 0xb4, 0xb5, 0xb5, 0xb6, 0xb6, 0xb6, 0xb7, 0xb7, 0xb7, 0xb8, 0xb8, 0xb8 },
|
||||
{ 0x80, 0x86, 0x8b, 0x90, 0x95, 0x99, 0x9d, 0xa0, 0xa3, 0xa5, 0xa7, 0xa9, 0xaa, 0xac, 0xad, 0xae,
|
||||
0xaf, 0xb0, 0xb1, 0xb2, 0xb2, 0xb3, 0xb3, 0xb4, 0xb4, 0xb5, 0xb5, 0xb6, 0xb6, 0xb6, 0xb7, 0xb7 },
|
||||
{ 0x80, 0x85, 0x8a, 0x8f, 0x93, 0x97, 0x9a, 0x9d, 0xa0, 0xa2, 0xa5, 0xa6, 0xa8, 0xaa, 0xab, 0xac,
|
||||
0xad, 0xae, 0xaf, 0xb0, 0xb0, 0xb1, 0xb2, 0xb2, 0xb3, 0xb3, 0xb4, 0xb4, 0xb5, 0xb5, 0xb5, 0xb5 },
|
||||
{ 0x80, 0x85, 0x89, 0x8d, 0x91, 0x95, 0x98, 0x9b, 0x9e, 0xa0, 0xa0, 0xa4, 0xa6, 0xa7, 0xa9, 0xaa,
|
||||
0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb0, 0xb1, 0xb1, 0xb2, 0xb2, 0xb3, 0xb3, 0xb4, 0xb4, 0xb4 },
|
||||
{ 0x80, 0x84, 0x88, 0x8c, 0x90, 0x93, 0x96, 0x99, 0x9b, 0x9e, 0xa0, 0xa2, 0xa4, 0xa5, 0xa7, 0xa8,
|
||||
0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xaf, 0xb0, 0xb0, 0xb1, 0xb2, 0xb2, 0xb2, 0xb3, 0xb3 },
|
||||
{ 0x80, 0x84, 0x87, 0x8b, 0x8e, 0x91, 0x94, 0x97, 0x9a, 0x9c, 0x9e, 0xa0, 0xa2, 0xa3, 0xa5, 0xa6,
|
||||
0xa7, 0xa9, 0xaa, 0xab, 0xac, 0xac, 0xad, 0xae, 0xae, 0xaf, 0xb0, 0xb0, 0xb1, 0xb1, 0xb2, 0xb2 },
|
||||
{ 0x80, 0x83, 0x87, 0x8a, 0x8d, 0x90, 0x93, 0x96, 0x98, 0x9a, 0x9c, 0x9e, 0xa0, 0xa2, 0xa3, 0xa5,
|
||||
0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xac, 0xad, 0xae, 0xae, 0xaf, 0xb0, 0xb0, 0xb0, 0xb1 },
|
||||
{ 0x80, 0x83, 0x86, 0x89, 0x8c, 0x8f, 0x92, 0x94, 0x96, 0x99, 0x9b, 0x9d, 0x9e, 0xa0, 0xa2, 0xa3,
|
||||
0xa4, 0xa5, 0xa7, 0xa8, 0xa9, 0xa9, 0xaa, 0xab, 0xac, 0xac, 0xad, 0xae, 0xae, 0xaf, 0xaf, 0xb0 },
|
||||
{ 0x80, 0x83, 0x86, 0x89, 0x8b, 0x8e, 0x90, 0x93, 0x95, 0x97, 0x99, 0x9b, 0x9d, 0x9e, 0xa0, 0xa1,
|
||||
0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xaa, 0xab, 0xac, 0xad, 0xad, 0xae, 0xae, 0xaf },
|
||||
{ 0x80, 0x83, 0x85, 0x88, 0x8b, 0x8d, 0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 0x9b, 0x9d, 0x9f, 0xa0,
|
||||
0xa1, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa8, 0xa9, 0xaa, 0xab, 0xab, 0xac, 0xad, 0xad, 0xae },
|
||||
{ 0x80, 0x83, 0x85, 0x88, 0x8a, 0x8c, 0x8f, 0x91, 0x93, 0x95, 0x97, 0x99, 0x9a, 0x9c, 0x9d, 0x9f,
|
||||
0xa0, 0xa1, 0xa2, 0xa3, 0xa5, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xaa, 0xab, 0xab, 0xac, 0xad },
|
||||
{ 0x80, 0x82, 0x85, 0x87, 0x89, 0x8c, 0x8e, 0x90, 0x92, 0x94, 0x96, 0x97, 0x99, 0x9b, 0x9c, 0x9d,
|
||||
0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa8, 0xa9, 0xaa, 0xaa, 0xab, 0xac },
|
||||
{ 0x80, 0x82, 0x85, 0x87, 0x89, 0x8b, 0x8d, 0x8f, 0x91, 0x93, 0x95, 0x96, 0x98, 0x99, 0x9b, 0x9c,
|
||||
0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa7, 0xa8, 0xa9, 0xa9, 0xaa, 0xab },
|
||||
{ 0x80, 0x82, 0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e, 0x90, 0x92, 0x94, 0x95, 0x97, 0x98, 0x9a, 0x9b,
|
||||
0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8, 0xa8, 0xa9, 0xaa },
|
||||
{ 0x80, 0x82, 0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e, 0x90, 0x91, 0x93, 0x94, 0x96, 0x97, 0x99, 0x9a,
|
||||
0x9b, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa5, 0xa6, 0xa7, 0xa7, 0xa8, 0xa9 },
|
||||
{ 0x80, 0x82, 0x84, 0x86, 0x88, 0x8a, 0x8b, 0x8d, 0x8f, 0x90, 0x92, 0x94, 0x95, 0x97, 0x98, 0x99,
|
||||
0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa4, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8 },
|
||||
{ 0x80, 0x82, 0x84, 0x86, 0x87, 0x89, 0x8b, 0x8d, 0x8e, 0x90, 0x91, 0x93, 0x94, 0x96, 0x97, 0x98,
|
||||
0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa3, 0xa4, 0xa5, 0xa6, 0xa6, 0xa7 },
|
||||
{ 0x80, 0x82, 0x84, 0x85, 0x87, 0x89, 0x8a, 0x8c, 0x8e, 0x8f, 0x91, 0x92, 0x94, 0x95, 0x96, 0x98,
|
||||
0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa2, 0xa3, 0xa4, 0xa5, 0xa5, 0xa6 },
|
||||
{ 0x80, 0x82, 0x83, 0x85, 0x87, 0x88, 0x8a, 0x8c, 0x8d, 0x8f, 0x90, 0x92, 0x93, 0x94, 0x96, 0x97,
|
||||
0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa2, 0xa3, 0xa4, 0xa5, 0xa5 },
|
||||
{ 0x80, 0x82, 0x83, 0x85, 0x86, 0x88, 0x8a, 0x8b, 0x8d, 0x8e, 0x90, 0x91, 0x92, 0x94, 0x95, 0x96,
|
||||
0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa2, 0xa3, 0xa4, 0xa4 },
|
||||
{ 0x80, 0x82, 0x83, 0x85, 0x86, 0x88, 0x89, 0x8b, 0x8c, 0x8e, 0x8f, 0x90, 0x92, 0x93, 0x94, 0x95,
|
||||
0x96, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa2, 0xa3, 0xa4 },
|
||||
{ 0x80, 0x82, 0x83, 0x85, 0x86, 0x87, 0x89, 0x8a, 0x8c, 0x8d, 0x8e, 0x90, 0x91, 0x92, 0x93, 0x95,
|
||||
0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9e, 0x9f, 0xa0, 0xa1, 0xa1, 0xa2, 0xa3 },
|
||||
{ 0x80, 0x81, 0x83, 0x84, 0x86, 0x87, 0x89, 0x8a, 0x8b, 0x8d, 0x8e, 0x8f, 0x90, 0x92, 0x93, 0x94,
|
||||
0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9e, 0x9f, 0xa0, 0xa1, 0xa1, 0xa2 },
|
||||
{ 0x80, 0x81, 0x83, 0x84, 0x86, 0x87, 0x88, 0x8a, 0x8b, 0x8c, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93,
|
||||
0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0x9f, 0xa0, 0xa1, 0xa1 },
|
||||
{ 0x80, 0x81, 0x83, 0x84, 0x85, 0x87, 0x88, 0x89, 0x8b, 0x8c, 0x8d, 0x8e, 0x90, 0x91, 0x92, 0x93,
|
||||
0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0x9f, 0xa0, 0xa1 },
|
||||
{ 0x80, 0x81, 0x83, 0x84, 0x85, 0x87, 0x88, 0x89, 0x8a, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92,
|
||||
0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9c, 0x9d, 0x9e, 0x9f, 0x9f, 0xa0 }
|
||||
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
|
||||
{ 0x40, 0x20, 0x13, 0x0D, 0x0A, 0x08, 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x03, 0x03, 0x03, 0x03,
|
||||
0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01 },
|
||||
{ 0x40, 0x2D, 0x20, 0x18, 0x13, 0x10, 0x0D, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x07, 0x06, 0x06, 0x05,
|
||||
0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 },
|
||||
{ 0x40, 0x33, 0x28, 0x20, 0x1A, 0x16, 0x13, 0x10, 0x0F, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x09, 0x08,
|
||||
0x08, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04 },
|
||||
{ 0x40, 0x36, 0x2D, 0x26, 0x20, 0x1B, 0x18, 0x15, 0x13, 0x11, 0x10, 0x0E, 0x0D, 0x0C, 0x0B, 0x0B,
|
||||
0x0A, 0x09, 0x09, 0x08, 0x08, 0x08, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x05 },
|
||||
{ 0x40, 0x38, 0x30, 0x2A, 0x25, 0x20, 0x1C, 0x19, 0x17, 0x15, 0x13, 0x11, 0x10, 0x0F, 0x0E, 0x0D,
|
||||
0x0C, 0x0C, 0x0B, 0x0A, 0x0A, 0x0A, 0x09, 0x09, 0x08, 0x08, 0x08, 0x07, 0x07, 0x07, 0x07, 0x07 },
|
||||
{ 0x40, 0x39, 0x33, 0x2D, 0x28, 0x24, 0x20, 0x1D, 0x1A, 0x18, 0x16, 0x14, 0x13, 0x12, 0x10, 0x10,
|
||||
0x0F, 0x0E, 0x0D, 0x0C, 0x0C, 0x0B, 0x0B, 0x0A, 0x0A, 0x0A, 0x09, 0x09, 0x09, 0x08, 0x08, 0x08 },
|
||||
{ 0x40, 0x3A, 0x35, 0x30, 0x2B, 0x27, 0x23, 0x20, 0x1D, 0x1B, 0x19, 0x17, 0x16, 0x14, 0x13, 0x12,
|
||||
0x11, 0x10, 0x0F, 0x0E, 0x0E, 0x0D, 0x0D, 0x0C, 0x0C, 0x0B, 0x0B, 0x0A, 0x0A, 0x0A, 0x09, 0x09 },
|
||||
{ 0x40, 0x3B, 0x36, 0x31, 0x2D, 0x29, 0x26, 0x23, 0x20, 0x1E, 0x1B, 0x1A, 0x18, 0x16, 0x15, 0x14,
|
||||
0x13, 0x12, 0x11, 0x10, 0x10, 0x0F, 0x0E, 0x0E, 0x0D, 0x0D, 0x0C, 0x0C, 0x0B, 0x0B, 0x0B, 0x0A },
|
||||
{ 0x40, 0x3B, 0x37, 0x33, 0x2F, 0x2B, 0x28, 0x25, 0x22, 0x20, 0x1E, 0x1C, 0x1A, 0x19, 0x17, 0x16,
|
||||
0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x10, 0x0F, 0x0F, 0x0E, 0x0E, 0x0D, 0x0D, 0x0C, 0x0C, 0x0C },
|
||||
{ 0x40, 0x3C, 0x38, 0x34, 0x30, 0x2D, 0x2A, 0x27, 0x25, 0x20, 0x20, 0x1E, 0x1C, 0x1B, 0x19, 0x18,
|
||||
0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x11, 0x10, 0x10, 0x0F, 0x0E, 0x0E, 0x0E, 0x0D, 0x0D },
|
||||
{ 0x40, 0x3C, 0x39, 0x35, 0x32, 0x2F, 0x2C, 0x29, 0x26, 0x24, 0x22, 0x20, 0x1E, 0x1D, 0x1B, 0x1A,
|
||||
0x19, 0x17, 0x16, 0x15, 0x14, 0x14, 0x13, 0x12, 0x12, 0x11, 0x10, 0x10, 0x0F, 0x0F, 0x0E, 0x0E },
|
||||
{ 0x40, 0x3D, 0x39, 0x36, 0x33, 0x30, 0x2D, 0x2A, 0x28, 0x26, 0x24, 0x22, 0x20, 0x1E, 0x1D, 0x1B,
|
||||
0x1A, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x14, 0x13, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x0F },
|
||||
{ 0x40, 0x3D, 0x3A, 0x37, 0x34, 0x31, 0x2E, 0x2C, 0x2A, 0x27, 0x25, 0x23, 0x22, 0x20, 0x1E, 0x1D,
|
||||
0x1C, 0x1B, 0x19, 0x18, 0x17, 0x17, 0x16, 0x15, 0x14, 0x14, 0x13, 0x12, 0x12, 0x11, 0x11, 0x10 },
|
||||
{ 0x40, 0x3D, 0x3A, 0x37, 0x35, 0x32, 0x30, 0x2D, 0x2B, 0x29, 0x27, 0x25, 0x23, 0x22, 0x20, 0x1F,
|
||||
0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18, 0x17, 0x16, 0x16, 0x15, 0x14, 0x13, 0x13, 0x12, 0x12, 0x11 },
|
||||
{ 0x40, 0x3D, 0x3B, 0x38, 0x35, 0x33, 0x30, 0x2E, 0x2C, 0x2A, 0x28, 0x26, 0x25, 0x23, 0x21, 0x20,
|
||||
0x1F, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18, 0x18, 0x17, 0x16, 0x15, 0x15, 0x14, 0x13, 0x13, 0x12 },
|
||||
{ 0x40, 0x3D, 0x3B, 0x38, 0x36, 0x34, 0x31, 0x2F, 0x2D, 0x2B, 0x29, 0x27, 0x26, 0x24, 0x23, 0x21,
|
||||
0x20, 0x1F, 0x1E, 0x1D, 0x1B, 0x1B, 0x1A, 0x19, 0x18, 0x17, 0x16, 0x16, 0x15, 0x15, 0x14, 0x13 },
|
||||
{ 0x40, 0x3E, 0x3B, 0x39, 0x37, 0x34, 0x32, 0x30, 0x2E, 0x2C, 0x2A, 0x29, 0x27, 0x25, 0x24, 0x23,
|
||||
0x21, 0x20, 0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18, 0x18, 0x17, 0x16, 0x16, 0x15, 0x14 },
|
||||
{ 0x40, 0x3E, 0x3B, 0x39, 0x37, 0x35, 0x33, 0x31, 0x2F, 0x2D, 0x2B, 0x2A, 0x28, 0x27, 0x25, 0x24,
|
||||
0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x19, 0x18, 0x17, 0x17, 0x16, 0x15 },
|
||||
{ 0x40, 0x3E, 0x3C, 0x3A, 0x38, 0x36, 0x34, 0x32, 0x30, 0x2E, 0x2C, 0x2B, 0x29, 0x28, 0x26, 0x25,
|
||||
0x23, 0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x1A, 0x19, 0x18, 0x18, 0x17, 0x16 },
|
||||
{ 0x40, 0x3E, 0x3C, 0x3A, 0x38, 0x36, 0x34, 0x32, 0x30, 0x2F, 0x2D, 0x2C, 0x2A, 0x29, 0x27, 0x26,
|
||||
0x25, 0x23, 0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1B, 0x1A, 0x19, 0x19, 0x18, 0x17 },
|
||||
{ 0x40, 0x3E, 0x3C, 0x3A, 0x38, 0x36, 0x35, 0x33, 0x31, 0x30, 0x2E, 0x2C, 0x2B, 0x29, 0x28, 0x27,
|
||||
0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1D, 0x1C, 0x1C, 0x1B, 0x1A, 0x1A, 0x19, 0x18 },
|
||||
{ 0x40, 0x3E, 0x3C, 0x3A, 0x39, 0x37, 0x35, 0x33, 0x32, 0x30, 0x2F, 0x2D, 0x2C, 0x2A, 0x29, 0x28,
|
||||
0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1D, 0x1D, 0x1C, 0x1B, 0x1A, 0x1A, 0x19 },
|
||||
{ 0x40, 0x3E, 0x3C, 0x3B, 0x39, 0x37, 0x36, 0x34, 0x32, 0x31, 0x2F, 0x2E, 0x2C, 0x2B, 0x2A, 0x28,
|
||||
0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1E, 0x1D, 0x1C, 0x1B, 0x1B, 0x1A },
|
||||
{ 0x40, 0x3E, 0x3D, 0x3B, 0x39, 0x38, 0x36, 0x34, 0x33, 0x31, 0x30, 0x2E, 0x2D, 0x2C, 0x2A, 0x29,
|
||||
0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1E, 0x1D, 0x1C, 0x1B, 0x1B },
|
||||
{ 0x40, 0x3E, 0x3D, 0x3B, 0x3A, 0x38, 0x36, 0x35, 0x33, 0x32, 0x30, 0x2F, 0x2E, 0x2C, 0x2B, 0x2A,
|
||||
0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1E, 0x1D, 0x1C, 0x1C },
|
||||
{ 0x40, 0x3E, 0x3D, 0x3B, 0x3A, 0x38, 0x37, 0x35, 0x34, 0x32, 0x31, 0x30, 0x2E, 0x2D, 0x2C, 0x2B,
|
||||
0x2A, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1E, 0x1D, 0x1C },
|
||||
{ 0x40, 0x3E, 0x3D, 0x3B, 0x3A, 0x39, 0x37, 0x36, 0x34, 0x33, 0x32, 0x30, 0x2F, 0x2E, 0x2D, 0x2B,
|
||||
0x2A, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x22, 0x21, 0x20, 0x1F, 0x1F, 0x1E, 0x1D },
|
||||
{ 0x40, 0x3F, 0x3D, 0x3C, 0x3A, 0x39, 0x37, 0x36, 0x35, 0x33, 0x32, 0x31, 0x30, 0x2E, 0x2D, 0x2C,
|
||||
0x2B, 0x2A, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x22, 0x21, 0x20, 0x1F, 0x1F, 0x1E },
|
||||
{ 0x40, 0x3F, 0x3D, 0x3C, 0x3A, 0x39, 0x38, 0x36, 0x35, 0x34, 0x32, 0x31, 0x30, 0x2F, 0x2E, 0x2D,
|
||||
0x2B, 0x2A, 0x29, 0x28, 0x27, 0x26, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x21, 0x20, 0x1F, 0x1F },
|
||||
{ 0x40, 0x3F, 0x3D, 0x3C, 0x3B, 0x39, 0x38, 0x37, 0x35, 0x34, 0x33, 0x32, 0x30, 0x2F, 0x2E, 0x2D,
|
||||
0x2C, 0x2B, 0x2A, 0x29, 0x28, 0x27, 0x26, 0x25, 0x25, 0x24, 0x23, 0x22, 0x21, 0x21, 0x20, 0x1F },
|
||||
{ 0x40, 0x3F, 0x3D, 0x3C, 0x3B, 0x39, 0x38, 0x37, 0x35, 0x34, 0x33, 0x32, 0x31, 0x30, 0x2F, 0x2E,
|
||||
0x2D, 0x2C, 0x2B, 0x2A, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x24, 0x23, 0x22, 0x21, 0x21, 0x20 }
|
||||
};
|
||||
|
||||
// Mode 7 scaling constants for all raster lines
|
||||
@ -316,6 +331,7 @@ static const int16 ST010_M7Scale[176] =
|
||||
#endif
|
||||
|
||||
#define ST010_WORD(offset) (Memory.SRAM[offset + 1] << 8) | Memory.SRAM[offset]
|
||||
#define ST010_DWORD(offset) (Memory.SRAM[offset + 3] << 24) | (Memory.SRAM[offset + 2] << 16) | (Memory.SRAM[offset + 1] << 8) | Memory.SRAM[offset]
|
||||
|
||||
|
||||
static int16 ST010_Sin (int16 Theta)
|
||||
@ -328,23 +344,21 @@ static int16 ST010_Cos (int16 Theta)
|
||||
return (ST010_SinTable[((Theta + 0x4000) >> 8) & 0xff]);
|
||||
}
|
||||
|
||||
static void ST010_OP01 (int16 x0, int16 y0, int16 &x1, int16 &y1, int16 &Quadrant, int16 &Theta)
|
||||
void ST010_Compass(int16 x0, int16 y0, int16 &x1, int16 &y1, int16 &Quadrant, int16 &Theta)
|
||||
{
|
||||
if ((x0 < 0) && (y0 < 0))
|
||||
if ((x0 <= 0) && (y0 < 0))
|
||||
{
|
||||
x1 = -x0;
|
||||
y1 = -y0;
|
||||
Quadrant = -0x8000;
|
||||
}
|
||||
else
|
||||
if (x0 < 0)
|
||||
else if (x0 < 0)
|
||||
{
|
||||
x1 = y0;
|
||||
y1 = -x0;
|
||||
Quadrant = -0x4000;
|
||||
}
|
||||
else
|
||||
if (y0 < 0)
|
||||
else if (y0 < 0)
|
||||
{
|
||||
x1 = -y0;
|
||||
y1 = x0;
|
||||
@ -359,16 +373,14 @@ static void ST010_OP01 (int16 x0, int16 y0, int16 &x1, int16 &y1, int16 &Quadran
|
||||
|
||||
while ((x1 > 0x1f) || (y1 > 0x1f))
|
||||
{
|
||||
if (x1 > 1)
|
||||
x1 >>= 1;
|
||||
if (y1 > 1)
|
||||
y1 >>= 1;
|
||||
if (x1 > 1) x1 >>= 1;
|
||||
if (y1 > 1) y1 >>= 1;
|
||||
}
|
||||
|
||||
if (y1 == 0)
|
||||
Quadrant += 0x4000;
|
||||
Theta = ST010_ArcTan[x1 & 0x1f][y1 & 0x1f] << 8;
|
||||
Theta = (Theta | Quadrant) ^ 0x8000;
|
||||
|
||||
Theta = (ST010_ArcTan[y1][x1] << 8) ^ Quadrant;
|
||||
if ((x0 == 0) && (y0 < 0)) Quadrant = 0x4000;
|
||||
}
|
||||
|
||||
static void ST010_Scale (int16 Multiplier, int16 X0, int16 Y0, int32 &X1, int32 &Y1)
|
||||
@ -421,17 +433,108 @@ static void ST010_SortDrivers (uint16 Positions, uint16 Places[32], uint16 Drive
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
static void SETA_Distance (int16 Y0, int16 X0, int16 &Distance)
|
||||
static void ST010_Raster(int16 Theta)
|
||||
{
|
||||
if (X0 < 0)
|
||||
X0 = -X0;
|
||||
if (Y0 < 0)
|
||||
Y0 = -Y0;
|
||||
int16 data;
|
||||
int offset = 0;
|
||||
|
||||
Distance = ((X0 * 0x7af0) + 0x4000) >> 15;
|
||||
for (int i = 0; i < 176; i++)
|
||||
{
|
||||
data = ST010_M7Scale[i] * ST010_Cos(Theta) >> 15;
|
||||
|
||||
Memory.SRAM[0x00f0 + offset] = data;
|
||||
Memory.SRAM[0x00f1 + offset] = data >> 8;
|
||||
|
||||
Memory.SRAM[0x0510 + offset] = data;
|
||||
Memory.SRAM[0x0511 + offset] = data >> 8;
|
||||
|
||||
data = ST010_M7Scale[i] * ST010_Sin(Theta) >> 15;
|
||||
|
||||
Memory.SRAM[0x0250 + offset] = data;
|
||||
Memory.SRAM[0x0251 + offset] = data >> 8;
|
||||
|
||||
if (data) data = ~data;
|
||||
|
||||
Memory.SRAM[0x03b0 + offset] = data;
|
||||
Memory.SRAM[0x03b1 + offset] = data >> 8;
|
||||
|
||||
offset += 2;
|
||||
}
|
||||
}
|
||||
|
||||
static void ST010_Distance(int16 x0, int16 y0, int16 &Distance)
|
||||
{
|
||||
int32 Product;
|
||||
|
||||
x0 = (x0 < 0) ? -x0 : x0;
|
||||
y0 = (y0 < 0) ? -y0 : y0;
|
||||
|
||||
if((uint16) x0 >= ((uint16) y0))
|
||||
Product = ((x0 * 0x3d78 << 1) + (y0 * 0x1976 << 1)) << 1;
|
||||
else
|
||||
Product = ((y0 * 0x3d78 << 1) + (x0 * 0x1976 << 1)) << 1;
|
||||
|
||||
Distance = (Product + 0x8000) >> 16;
|
||||
}
|
||||
|
||||
static void ST010_Navigation(int16 &MaxX, int16 &MaxY, int32 &x0, int32 &y0, int16 &Theta0, int16 &Theta1, int16 &x1, int16 &y1, uint16 &Radius, uint16 Increment, uint16 MaxRadius, int16 &Compass, int16 &Flags, int16 NewMaxX, int16 NewMaxY)
|
||||
{
|
||||
int16 dummy1,dummy2,dummy3;
|
||||
uint16 utemp16;
|
||||
int32 temp32;
|
||||
|
||||
|
||||
x1 = MaxX - (x0 >> 16);
|
||||
y1 = MaxY - (y0 >> 16);
|
||||
|
||||
ST010_Compass(x1, y1, dummy1, dummy2, dummy3, Theta1);
|
||||
Theta1 -= Theta0;
|
||||
|
||||
if (Theta1 & 0xff00)
|
||||
Theta0 += (Theta1 & 0x8000) ? 0xfd80 : 0x0280;
|
||||
|
||||
// compiler notice: -0x8000 ==> +0x8000
|
||||
utemp16 = ((Theta1 < 0) ? (int16) -Theta1 : Theta1) >> 4;
|
||||
|
||||
if (utemp16 < 0x0100)
|
||||
{
|
||||
temp32 = Radius + Increment;
|
||||
Radius = (temp32 >= MaxRadius) ? MaxRadius : (uint16) temp32;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
temp32 = Radius - utemp16;
|
||||
Radius = (temp32 <= 0) ? 0 : (uint16) temp32;
|
||||
}
|
||||
|
||||
x0 -= ((ST010_Sin(Theta0) >> 5) * (Radius >> 8)) << 1;
|
||||
y0 -= ((ST010_Cos(Theta0) >> 5) * (Radius >> 8)) << 1;
|
||||
|
||||
x0 &= 0x1fffffff;
|
||||
y0 &= 0x1fffffff;
|
||||
|
||||
|
||||
int16 MaxRadiusX, MaxRadiusY;
|
||||
if (Compass & 0x8000)
|
||||
{
|
||||
MaxRadiusX = 0x0008;
|
||||
MaxRadiusY = 0x0080;
|
||||
}
|
||||
else
|
||||
{
|
||||
MaxRadiusX = 0x0080;
|
||||
MaxRadiusY = 0x0008;
|
||||
}
|
||||
|
||||
if ((abs(x1) < MaxRadiusX) && (abs(y1) < MaxRadiusY))
|
||||
{
|
||||
MaxX = NewMaxX;
|
||||
MaxY = NewMaxY & 0x0fff;
|
||||
Compass = (NewMaxY & 0x8000) ? 0xffff : 0x0000;
|
||||
Flags |= 0x0008;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
uint8 S9xGetST010 (uint32 Address)
|
||||
{
|
||||
@ -471,16 +574,32 @@ void S9xSetST010 (uint32 Address, uint8 Byte)
|
||||
{
|
||||
switch (ST010.op_reg)
|
||||
{
|
||||
// Heading
|
||||
case 0x01:
|
||||
{
|
||||
Memory.SRAM[0x0006] = Memory.SRAM[0x0002];
|
||||
Memory.SRAM[0x0007] = Memory.SRAM[0x0003];
|
||||
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
ST010_Compass(*(int16 *) &Memory.SRAM[0x0000], *(int16 *) &Memory.SRAM[0x0002], (int16 &) Memory.SRAM[0x0000], (int16 &) Memory.SRAM[0x0002], (int16 &) Memory.SRAM[0x0004], (int16 &) Memory.SRAM[0x0010]);
|
||||
#else
|
||||
int16 x1, y1, Quadrant, Theta;
|
||||
|
||||
ST010_Compass(ST010_WORD(0x0000), ST010_WORD(0x0002), x1, y1, Quadrant, Theta);
|
||||
|
||||
Memory.SRAM[0x0000] = (uint8) (x1);
|
||||
Memory.SRAM[0x0001] = (uint8) (x1 >> 8);
|
||||
Memory.SRAM[0x0002] = (uint8) (y1);
|
||||
Memory.SRAM[0x0003] = (uint8) (y1 >> 8);
|
||||
Memory.SRAM[0x0004] = (uint8) (Quadrant);
|
||||
Memory.SRAM[0x0005] = (uint8) (Quadrant >> 8);
|
||||
Memory.SRAM[0x0010] = (uint8) (Theta);
|
||||
Memory.SRAM[0x0011] = (uint8) (Theta >> 8);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
// Sorts Driver Placements
|
||||
//
|
||||
// Input
|
||||
// 0x0024-0x0025 : Positions
|
||||
// 0x0040-0x007f : Places
|
||||
// 0x0080-0x00ff : Drivers
|
||||
// Output
|
||||
// 0x0040-0x007f : Places
|
||||
// 0x0080-0x00ff : Drivers
|
||||
//
|
||||
case 0x02:
|
||||
{
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
@ -513,15 +632,6 @@ void S9xSetST010 (uint32 Address, uint8 Byte)
|
||||
}
|
||||
|
||||
// Two Dimensional Coordinate Scale
|
||||
//
|
||||
// Input
|
||||
// 0x0000-0x0001 : X0 (signed)
|
||||
// 0x0002-0x0003 : Y0 (signed)
|
||||
// 0x0004-0x0005 : Multiplier (signed)
|
||||
// Output
|
||||
// 0x0010-0x0013 : X1 (signed)
|
||||
// 0x0014-0x0017 : Y1 (signed)
|
||||
//
|
||||
case 0x03:
|
||||
{
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
@ -543,14 +653,74 @@ void S9xSetST010 (uint32 Address, uint8 Byte)
|
||||
break;
|
||||
}
|
||||
|
||||
// calculate the vector length of (x, y)
|
||||
case 0x04:
|
||||
{
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
ST010_Distance(*(int16 *) &Memory.SRAM[0x0000], *(int16 *) &Memory.SRAM[0x0002], (int16 &) Memory.SRAM[0x0010]);
|
||||
#else
|
||||
int16 square;
|
||||
|
||||
ST010_Distance(ST010_WORD(0x0000), ST010_WORD(0x0002), square);
|
||||
|
||||
Memory.SRAM[0x10] = (uint8) (square);
|
||||
Memory.SRAM[0x11] = (uint8) (square >> 8);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
// calculate AI orientation based on specific guidelines
|
||||
case 0x05:
|
||||
{
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
ST010_Navigation((int16 &) Memory.SRAM[0x00c0], (int16 &) Memory.SRAM[0x00c2], (int32 &) Memory.SRAM[0x00c4], (int32 &) Memory.SRAM[0x00c8], (int16 &) Memory.SRAM[0x00cc], (int16 &) Memory.SRAM[0x00ce], (int16 &) Memory.SRAM[0x00d0], (int16 &) Memory.SRAM[0x00d2], (uint16 &) Memory.SRAM[0x00d4], *(uint16 *) &Memory.SRAM[0x00d6], *(uint16 *) &Memory.SRAM[0x00d8], (int16 &) Memory.SRAM[0x00da], (int16 &) Memory.SRAM[0x00dc], *(int16 *) &Memory.SRAM[0x00de], *(int16 *) &Memory.SRAM[0x00e0]);
|
||||
#else
|
||||
int32 x0,y0;
|
||||
int16 MaxX,MaxY,Theta0,Theta1,x1,y1,Compass,Flags;
|
||||
uint16 Radius;
|
||||
|
||||
MaxX = ST010_WORD(0x00c0);
|
||||
MaxY = ST010_WORD(0x00c2);
|
||||
x0 = ST010_DWORD(0x00c4);
|
||||
y0 = ST010_DWORD(0x00c8);
|
||||
Theta0 = ST010_WORD(0x00cc);
|
||||
Radius = ST010_WORD(0x00d4);
|
||||
Compass = ST010_WORD(0x00da);
|
||||
Flags = ST010_WORD(0x00dc);
|
||||
|
||||
ST010_Navigation(MaxX, MaxY, x0, y0, Theta0, Theta1, x1, y1, Radius, ST010_WORD(0x00d6), ST010_WORD(0x00d8), Compass, Flags, ST010_WORD(0x00de), ST010_WORD(0x00e0));
|
||||
|
||||
Memory.SRAM[0x00c0] = (uint8) (MaxX);
|
||||
Memory.SRAM[0x00c1] = (uint8) (MaxX >> 8);
|
||||
Memory.SRAM[0x00c2] = (uint8) (MaxY);
|
||||
Memory.SRAM[0x00c3] = (uint8) (MaxY >> 8);
|
||||
Memory.SRAM[0x00c4] = (uint8) (x0);
|
||||
Memory.SRAM[0x00c5] = (uint8) (x0 >> 8);
|
||||
Memory.SRAM[0x00c6] = (uint8) (x0 >> 16);
|
||||
Memory.SRAM[0x00c7] = (uint8) (x0 >> 24);
|
||||
Memory.SRAM[0x00c8] = (uint8) (y0);
|
||||
Memory.SRAM[0x00c9] = (uint8) (y0 >> 8);
|
||||
Memory.SRAM[0x00ca] = (uint8) (y0 >> 16);
|
||||
Memory.SRAM[0x00cb] = (uint8) (y0 >> 24);
|
||||
Memory.SRAM[0x00cc] = (uint8) (Theta0);
|
||||
Memory.SRAM[0x00cd] = (uint8) (Theta0 >> 8);
|
||||
Memory.SRAM[0x00ce] = (uint8) (Theta1);
|
||||
Memory.SRAM[0x00cf] = (uint8) (Theta1 >> 8);
|
||||
Memory.SRAM[0x00d0] = (uint8) (x1);
|
||||
Memory.SRAM[0x00d1] = (uint8) (x1 >> 8);
|
||||
Memory.SRAM[0x00d2] = (uint8) (y1);
|
||||
Memory.SRAM[0x00d3] = (uint8) (y1 >> 8);
|
||||
Memory.SRAM[0x00d4] = (uint8) (Radius);
|
||||
Memory.SRAM[0x00d5] = (uint8) (Radius >> 8);
|
||||
Memory.SRAM[0x00da] = (uint8) (Compass);
|
||||
Memory.SRAM[0x00db] = (uint8) (Compass >> 8);
|
||||
Memory.SRAM[0x00dc] = (uint8) (Flags);
|
||||
Memory.SRAM[0x00dd] = (uint8) (Flags >> 8);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
// 16-bit Multiplication
|
||||
//
|
||||
// Input
|
||||
// 0x0000-0x0001 : Multiplcand (signed)
|
||||
// 0x0002-0x0003 : Multiplier (signed)
|
||||
// Output
|
||||
// 0x0010-0x0013 : Product (signed)
|
||||
//
|
||||
case 0x06:
|
||||
{
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
@ -569,45 +739,13 @@ void S9xSetST010 (uint32 Address, uint8 Byte)
|
||||
}
|
||||
|
||||
// Mode 7 Raster Data Calculation
|
||||
//
|
||||
// Input
|
||||
// 0x0000-0x0001 : Angle (signed)
|
||||
// Output
|
||||
// 0x00f0-0x024f : Mode 7 Matrix A
|
||||
// 0x0250-0x03af : Mode 7 Matrix B
|
||||
// 0x03b0-0x050f : Mode 7 Matrix C
|
||||
// 0x0510-0x066f : Mode 7 Matrix D
|
||||
//
|
||||
case 0x07:
|
||||
{
|
||||
int16 data;
|
||||
int32 offset = 0;
|
||||
int16 Theta = ST010_WORD(0x0000);
|
||||
|
||||
for (int32 line = 0; line < 176; line++)
|
||||
{
|
||||
// Calculate Mode 7 Matrix A/D data
|
||||
data = ST010_M7Scale[line] * ST010_Cos(Theta) >> 15;
|
||||
|
||||
Memory.SRAM[0x00f0 + offset] = (uint8) (data);
|
||||
Memory.SRAM[0x00f1 + offset] = (uint8) (data >> 8);
|
||||
Memory.SRAM[0x0510 + offset] = (uint8) (data);
|
||||
Memory.SRAM[0x0511 + offset] = (uint8) (data >> 8);
|
||||
|
||||
// Calculate Mode 7 Matrix B/C data
|
||||
data = ST010_M7Scale[line] * ST010_Sin(Theta) >> 15;
|
||||
|
||||
Memory.SRAM[0x0250 + offset] = (uint8) (data);
|
||||
Memory.SRAM[0x0251 + offset] = (uint8) (data >> 8);
|
||||
|
||||
if (data)
|
||||
data = ~data;
|
||||
|
||||
Memory.SRAM[0x03b0 + offset] = (uint8) (data);
|
||||
Memory.SRAM[0x03b1 + offset] = (uint8) (data >> 8);
|
||||
|
||||
offset += 2;
|
||||
}
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
ST010_Raster(*(int16 *) &Memory.SRAM[0x0000]);
|
||||
#else
|
||||
ST010_Raster(ST010_WORD(0x0000));
|
||||
#endif
|
||||
|
||||
// Shift Angle for use with Lookup table
|
||||
Memory.SRAM[0x00] = Memory.SRAM[0x01];
|
||||
@ -617,15 +755,6 @@ void S9xSetST010 (uint32 Address, uint8 Byte)
|
||||
}
|
||||
|
||||
// Two dimensional Coordinate Rotation
|
||||
//
|
||||
// Input
|
||||
// 0x0000-0x0001 : X0 (signed)
|
||||
// 0x0002-0x0003 : Y0 (signed)
|
||||
// 0x0004-0x0005 : Angle (signed)
|
||||
// Output
|
||||
// 0x0010-0x0011 : X1 (signed)
|
||||
// 0x0012-0x0013 : Y1 (signed)
|
||||
//
|
||||
case 0x08:
|
||||
{
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
@ -643,212 +772,6 @@ void S9xSetST010 (uint32 Address, uint8 Byte)
|
||||
break;
|
||||
}
|
||||
|
||||
// Input
|
||||
// 0x0000-0x0001 : DX (signed)
|
||||
// 0x0002-0x0003 : DY (signed)
|
||||
// Output
|
||||
// 0x0010-0x0011 : Angle (signed)
|
||||
//
|
||||
case 0x01:
|
||||
{
|
||||
Memory.SRAM[0x0006] = Memory.SRAM[0x0002];
|
||||
Memory.SRAM[0x0007] = Memory.SRAM[0x0003];
|
||||
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
ST010_OP01(*(int16 *) &Memory.SRAM[0x0000], *(int16 *) &Memory.SRAM[0x0002], (int16 &) Memory.SRAM[0x0000], (int16 &) Memory.SRAM[0x0002], (int16 &) Memory.SRAM[0x0004], (int16 &) Memory.SRAM[0x0010]);
|
||||
#else
|
||||
int16 x1, y1, Quadrant, Theta;
|
||||
|
||||
ST010_OP01(ST010_WORD(0x0000), ST010_WORD(0x0002), x1, y1, Quadrant, Theta);
|
||||
|
||||
Memory.SRAM[0x0000] = (uint8) (x1);
|
||||
Memory.SRAM[0x0001] = (uint8) (x1 >> 8);
|
||||
Memory.SRAM[0x0002] = (uint8) (y1);
|
||||
Memory.SRAM[0x0003] = (uint8) (y1 >> 8);
|
||||
Memory.SRAM[0x0004] = (uint8) (Quadrant);
|
||||
Memory.SRAM[0x0005] = (uint8) (Quadrant >> 8);
|
||||
Memory.SRAM[0x0010] = (uint8) (Theta);
|
||||
Memory.SRAM[0x0011] = (uint8) (Theta >> 8);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
// calculate the vector length of (x, y)
|
||||
case 0x04:
|
||||
{
|
||||
int16 square, x, y;
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
x = *((int16 *) Memory.SRAM);
|
||||
y = *((int16 *) &Memory.SRAM[2]);
|
||||
#else
|
||||
x = Memory.SRAM[0] | (Memory.SRAM[1] << 8);
|
||||
y = Memory.SRAM[2] | (Memory.SRAM[3] << 8);
|
||||
#endif
|
||||
square = (int16) sqrt((double) (y * y + x * x));
|
||||
//SETA_Distance(x, y, square);
|
||||
|
||||
#ifdef FAST_LSB_WORD_ACCESS
|
||||
*((int16 *) &Memory.SRAM[0x10]) = square;
|
||||
#else
|
||||
Memory.SRAM[0x10] = (uint8) (square);
|
||||
Memory.SRAM[0x11] = (uint8) (square >> 8);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
// calculate AI orientation based on specific guidelines
|
||||
case 0x05:
|
||||
{
|
||||
int32 dx, dy;
|
||||
int16 a1, b1, c1;
|
||||
uint16 o1;
|
||||
bool wrap = false;
|
||||
|
||||
// target (x, y) coordinates
|
||||
int16 ypos_max = ST010_WORD(0x00C0);
|
||||
int16 xpos_max = ST010_WORD(0x00C2);
|
||||
|
||||
// current coordinates and direction
|
||||
int32 ypos = Memory.SRAM[0xC4] | (Memory.SRAM[0xC5] << 8) | (Memory.SRAM[0xC6] << 16) | (Memory.SRAM[0xC7] << 24);
|
||||
int32 xpos = Memory.SRAM[0xC8] | (Memory.SRAM[0xC9] << 8) | (Memory.SRAM[0xCA] << 16) | (Memory.SRAM[0xCB] << 24);
|
||||
uint16 rot = Memory.SRAM[0xCC] | (Memory.SRAM[0xCD] << 8);
|
||||
|
||||
// physics
|
||||
uint16 speed = ST010_WORD(0x00D4);
|
||||
uint16 accel = ST010_WORD(0x00D6);
|
||||
uint16 speed_max = ST010_WORD(0x00D8);
|
||||
|
||||
// special condition acknowledgment
|
||||
int16 system = ST010_WORD(0x00DA);
|
||||
int16 flags = ST010_WORD(0x00DC);
|
||||
|
||||
// new target coordinates
|
||||
int16 ypos_new = ST010_WORD(0x00DE);
|
||||
int16 xpos_new = ST010_WORD(0x00E0);
|
||||
|
||||
// mask upper bit
|
||||
xpos_new &= 0x7FFF;
|
||||
|
||||
// get the current distance
|
||||
dx = xpos_max - (xpos >> 16);
|
||||
dy = ypos_max - (ypos >> 16);
|
||||
|
||||
// quirk: clear and move in9
|
||||
Memory.SRAM[0xD2] = 0xFF;
|
||||
Memory.SRAM[0xD3] = 0xFF;
|
||||
Memory.SRAM[0xDA] = 0;
|
||||
Memory.SRAM[0xDB] = 0;
|
||||
|
||||
// grab the target angle
|
||||
ST010_OP01(dy, dx, a1, b1, c1, (int16 &) o1);
|
||||
|
||||
// check for wrapping
|
||||
//if ((o1 < 0x6000 && rot > 0xA000) || (rot < 0x6000 && o1 > 0xA000))
|
||||
//if (o1 < rot)
|
||||
if (abs(o1 - rot) > 0x8000)
|
||||
{
|
||||
o1 += 0x8000;
|
||||
rot += 0x8000;
|
||||
wrap = true;
|
||||
}
|
||||
//o1 = 0x0000;
|
||||
//rot = 0xFF00;
|
||||
|
||||
uint16 old_speed;
|
||||
|
||||
old_speed = speed;
|
||||
|
||||
// special case
|
||||
if (abs(o1 - rot) == 0x8000)
|
||||
speed = 0x100;
|
||||
// slow down for sharp curves
|
||||
else
|
||||
if (abs(o1 - rot) >= 0x1000)
|
||||
{
|
||||
uint32 slow = abs(o1 - rot);
|
||||
slow >>= 4; // scaling
|
||||
speed -= slow;
|
||||
}
|
||||
// otherwise accelerate
|
||||
else
|
||||
{
|
||||
speed += accel;
|
||||
if (speed > speed_max)
|
||||
{
|
||||
// clip speed
|
||||
speed = speed_max;
|
||||
}
|
||||
}
|
||||
|
||||
// prevent negative/positive overflow
|
||||
if (abs(old_speed - speed) > 0x8000)
|
||||
{
|
||||
if (old_speed < speed)
|
||||
speed = 0;
|
||||
else
|
||||
speed = 0xff00;
|
||||
}
|
||||
|
||||
// adjust direction by so many degrees
|
||||
// be careful of negative adjustments
|
||||
if ((o1 > rot && (o1 - rot) > 0x80) || (o1 < rot && (rot - o1) >= 0x80))
|
||||
{
|
||||
if (o1 < rot)
|
||||
rot -= 0x280;
|
||||
else
|
||||
if (o1 > rot)
|
||||
rot += 0x280;
|
||||
}
|
||||
|
||||
// turn off wrapping
|
||||
if (wrap)
|
||||
rot -= 0x8000;
|
||||
|
||||
// now check the distances (store for later)
|
||||
dx = (xpos_max << 16) - xpos;
|
||||
dy = (ypos_max << 16) - ypos;
|
||||
dx >>= 16;
|
||||
dy >>= 16;
|
||||
|
||||
// if we're in so many units of the target, signal it
|
||||
if ((system && (dy <= 6 && dy >= -8) && (dx <= 126 && dx >= -128)) || (!system && (dx <= 6 && dx >= -8) && (dy <= 126 && dy >= -128)))
|
||||
{
|
||||
// announce our new destination and flag it
|
||||
xpos_max = xpos_new & 0x7FFF;
|
||||
ypos_max = ypos_new;
|
||||
flags |= 0x08;
|
||||
}
|
||||
|
||||
// update position
|
||||
xpos -= (ST010_Cos(rot) * 0x400 >> 15) * (speed >> 8) << 1;
|
||||
ypos -= (ST010_Sin(rot) * 0x400 >> 15) * (speed >> 8) << 1;
|
||||
|
||||
// quirk: mask upper byte
|
||||
xpos &= 0x1FFFFFFF;
|
||||
ypos &= 0x1FFFFFFF;
|
||||
|
||||
Memory.SRAM[0x00C0] = (uint8) (ypos_max);
|
||||
Memory.SRAM[0x00C1] = (uint8) (ypos_max >> 8);
|
||||
Memory.SRAM[0x00C2] = (uint8) (xpos_max);
|
||||
Memory.SRAM[0x00C3] = (uint8) (xpos_max >> 8);
|
||||
Memory.SRAM[0x00C4] = (uint8) (ypos);
|
||||
Memory.SRAM[0x00C5] = (uint8) (ypos >> 8);
|
||||
Memory.SRAM[0x00C6] = (uint8) (ypos >> 16);
|
||||
Memory.SRAM[0x00C7] = (uint8) (ypos >> 24);
|
||||
Memory.SRAM[0x00C8] = (uint8) (xpos);
|
||||
Memory.SRAM[0x00C9] = (uint8) (xpos >> 8);
|
||||
Memory.SRAM[0x00CA] = (uint8) (xpos >> 16);
|
||||
Memory.SRAM[0x00CB] = (uint8) (xpos >> 24);
|
||||
Memory.SRAM[0x00CC] = (uint8) (rot);
|
||||
Memory.SRAM[0x00CD] = (uint8) (rot >> 8);
|
||||
Memory.SRAM[0x00D4] = (uint8) (speed);
|
||||
Memory.SRAM[0x00D5] = (uint8) (speed >> 8);
|
||||
Memory.SRAM[0x00DC] = (uint8) (flags);
|
||||
Memory.SRAM[0x00DD] = (uint8) (flags >> 8);
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
#ifdef DEBUGGER
|
||||
printf("Unknown Op\n");
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -13,8 +13,9 @@
|
||||
*********************************************************************/
|
||||
|
||||
/*************************** HEADER FILES ***************************/
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <memory.h>
|
||||
#include <string.h>
|
||||
|
||||
/****************************** MACROS ******************************/
|
||||
#define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b))))
|
||||
@ -35,7 +36,7 @@ typedef unsigned int WORD; /* 32-bit word, change to "long" for 16-
|
||||
typedef struct {
|
||||
BYTE data[64];
|
||||
WORD datalen;
|
||||
unsigned long long bitlen;
|
||||
uint64_t bitlen;
|
||||
WORD state[8];
|
||||
} SHA256_CTX;
|
||||
|
||||
|
||||
@ -204,6 +204,7 @@
|
||||
#include "movie.h"
|
||||
#include "display.h"
|
||||
#include "language.h"
|
||||
#include "gfx.h"
|
||||
|
||||
#ifndef min
|
||||
#define min(a,b) (((a) < (b)) ? (a) : (b))
|
||||
@ -433,6 +434,7 @@ static FreezeData SnapPPU[] =
|
||||
INT_ENTRY(6, CGFLIP),
|
||||
INT_ENTRY(6, CGFLIPRead),
|
||||
INT_ENTRY(6, CGADD),
|
||||
INT_ENTRY(11, CGSavedByte),
|
||||
ARRAY_ENTRY(6, CGDATA, 256, uint16_ARRAY_V),
|
||||
#define O(N) \
|
||||
INT_ENTRY(6, OBJ[N].HPos), \
|
||||
@ -529,7 +531,8 @@ static FreezeData SnapPPU[] =
|
||||
INT_ENTRY(6, HDMA),
|
||||
INT_ENTRY(6, HDMAEnded),
|
||||
INT_ENTRY(6, OpenBus1),
|
||||
INT_ENTRY(6, OpenBus2)
|
||||
INT_ENTRY(6, OpenBus2),
|
||||
INT_ENTRY(11, VRAMReadBuffer)
|
||||
};
|
||||
|
||||
#undef STRUCT
|
||||
@ -599,7 +602,8 @@ static FreezeData SnapTimings[] =
|
||||
INT_ENTRY(6, IRQFlagChanging),
|
||||
INT_ENTRY(6, APUSpeedup),
|
||||
INT_ENTRY(7, IRQTriggerCycles),
|
||||
INT_ENTRY(7, APUAllowTimeOverflow)
|
||||
INT_ENTRY(7, APUAllowTimeOverflow),
|
||||
INT_ENTRY(11, NextIRQTimer)
|
||||
};
|
||||
|
||||
#undef STRUCT
|
||||
@ -1825,11 +1829,13 @@ int S9xUnfreezeFromStream (STREAM stream)
|
||||
ICPU.ShiftedDB = Registers.DB << 16;
|
||||
S9xSetPCBase(Registers.PBPC);
|
||||
S9xUnpackStatus();
|
||||
S9xUpdateIRQPositions(false);
|
||||
if(version < SNAPSHOT_VERSION_IRQ_2018)
|
||||
S9xUpdateIRQPositions(false); // calculate the new trigger pos from saved PPU data
|
||||
S9xFixCycles();
|
||||
|
||||
for (int d = 0; d < 8; d++)
|
||||
DMA[d] = dma_snap.dma[d];
|
||||
// TODO: these should already be correct since they are stored in the snapshot
|
||||
CPU.InDMA = CPU.InHDMA = FALSE;
|
||||
CPU.InDMAorHDMA = CPU.InWRAMDMAorHDMA = FALSE;
|
||||
CPU.HDMARanInDMA = 0;
|
||||
@ -1840,8 +1846,17 @@ int S9xUnfreezeFromStream (STREAM stream)
|
||||
IPPU.OBJChanged = TRUE;
|
||||
IPPU.RenderThisFrame = TRUE;
|
||||
|
||||
uint8 hdma_byte = Memory.FillRAM[0x420c];
|
||||
S9xSetCPU(hdma_byte, 0x420c);
|
||||
GFX.InterlaceFrame = Timings.InterlaceField;
|
||||
GFX.DoInterlace = 0;
|
||||
|
||||
S9xGraphicsScreenResize();
|
||||
|
||||
if (Settings.FastSavestates == 0)
|
||||
memset(GFX.Screen,0,GFX.Pitch * MAX_SNES_HEIGHT);
|
||||
|
||||
// TODO: this seems to be a relic from 1.43 changes, completely remove if no issues in the future
|
||||
/*uint8 hdma_byte = Memory.FillRAM[0x420c];
|
||||
S9xSetCPU(hdma_byte, 0x420c);*/
|
||||
|
||||
S9xControlPostLoadState(&ctl_snap);
|
||||
|
||||
@ -1935,12 +1950,6 @@ int S9xUnfreezeFromStream (STREAM stream)
|
||||
|
||||
delete ssi;
|
||||
}
|
||||
else
|
||||
{
|
||||
// couldn't load graphics, so black out the screen instead
|
||||
for (uint32 y = 0; y < (uint32) (IMAGE_HEIGHT); y++)
|
||||
memset(GFX.Screen + y * GFX.RealPPL, 0, GFX.RealPPL * 2);
|
||||
}
|
||||
}
|
||||
|
||||
if (local_cpu) delete [] local_cpu;
|
||||
|
||||
@ -198,7 +198,8 @@
|
||||
#define SNAPSHOT_MAGIC "#!s9xsnp"
|
||||
#define SNAPSHOT_VERSION_IRQ 7
|
||||
#define SNAPSHOT_VERSION_BAPU 8
|
||||
#define SNAPSHOT_VERSION 10
|
||||
#define SNAPSHOT_VERSION_IRQ_2018 11 // irq changes were introduced earlier, since this we store NextIRQTimer directly
|
||||
#define SNAPSHOT_VERSION 11
|
||||
|
||||
#define SUCCESS 1
|
||||
#define WRONG_FORMAT (-1)
|
||||
|
||||
@ -194,7 +194,7 @@
|
||||
#define _SNES9X_H_
|
||||
|
||||
#ifndef VERSION
|
||||
#define VERSION "1.56.2"
|
||||
#define VERSION "1.57"
|
||||
#endif
|
||||
|
||||
#include "port.h"
|
||||
@ -276,7 +276,7 @@
|
||||
#define SNES_HDMA_START_HC 1106 // FIXME: not true
|
||||
#define SNES_HBLANK_END_HC 4 // H=1
|
||||
#define SNES_HDMA_INIT_HC 20 // FIXME: not true
|
||||
#define SNES_RENDER_START_HC (48 * ONE_DOT_CYCLE) // FIXME: Snes9x renders a line at a time.
|
||||
#define SNES_RENDER_START_HC (128 * ONE_DOT_CYCLE) // FIXME: Snes9x renders a line at a time.
|
||||
|
||||
#define SNES_TR_MASK (1 << 4)
|
||||
#define SNES_TL_MASK (1 << 5)
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -498,7 +498,7 @@ void SPC7110Decomp::reset() {
|
||||
}
|
||||
|
||||
SPC7110Decomp::SPC7110Decomp() {
|
||||
decomp_buffer = new uint8_t[decomp_buffer_size];
|
||||
decomp_buffer = new uint8[decomp_buffer_size];
|
||||
reset();
|
||||
|
||||
//initialize reverse morton lookup tables
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
@ -253,6 +253,24 @@ std::string Stream::getline (bool &eof)
|
||||
return (ret);
|
||||
}
|
||||
|
||||
size_t Stream::pos_from_origin_offset(uint8 origin, int32 offset)
|
||||
{
|
||||
size_t position = 0;
|
||||
switch (origin)
|
||||
{
|
||||
case SEEK_SET:
|
||||
position = offset;
|
||||
break;
|
||||
case SEEK_END:
|
||||
position = size() + offset;
|
||||
break;
|
||||
case SEEK_CUR:
|
||||
position = pos() + offset;
|
||||
break;
|
||||
}
|
||||
return position;
|
||||
}
|
||||
|
||||
// snes9x.h FSTREAM Stream
|
||||
|
||||
fStream::fStream (FSTREAM f)
|
||||
@ -299,9 +317,9 @@ size_t fStream::size (void)
|
||||
return sz;
|
||||
}
|
||||
|
||||
int fStream::revert (size_t from, size_t offset)
|
||||
int fStream::revert (uint8 origin, int32 offset)
|
||||
{
|
||||
return (REVERT_FSTREAM(fp, offset, from));
|
||||
return (REVERT_FSTREAM(fp, offset, origin));
|
||||
}
|
||||
|
||||
void fStream::closeStream()
|
||||
@ -428,9 +446,9 @@ size_t unzStream::size (void)
|
||||
return info.uncompressed_size;
|
||||
}
|
||||
|
||||
int unzStream::revert (size_t from, size_t offset)
|
||||
int unzStream::revert (uint8 origin, int32 offset)
|
||||
{
|
||||
size_t target_pos = from + offset;
|
||||
size_t target_pos = pos_from_origin_offset(origin, offset);
|
||||
|
||||
// new pos inside buffered data
|
||||
if (target_pos >= buf_pos_in_unzipped && target_pos < buf_pos_in_unzipped + bytes_in_buf)
|
||||
@ -547,9 +565,9 @@ size_t memStream::size (void)
|
||||
return msize;
|
||||
}
|
||||
|
||||
int memStream::revert (size_t from, size_t offset)
|
||||
int memStream::revert (uint8 origin, int32 offset)
|
||||
{
|
||||
size_t pos = from + offset;
|
||||
size_t pos = pos_from_origin_offset(origin, offset);
|
||||
|
||||
if(pos > msize)
|
||||
return -1;
|
||||
@ -610,9 +628,10 @@ size_t nulStream::size (void)
|
||||
return bytes_written;
|
||||
}
|
||||
|
||||
int nulStream::revert (size_t from, size_t offset)
|
||||
int nulStream::revert (uint8 origin, int32 offset)
|
||||
{
|
||||
bytes_written = from + offset;
|
||||
size_t target_pos = pos_from_origin_offset(origin, offset);
|
||||
bytes_written = target_pos;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -208,8 +208,11 @@ class Stream
|
||||
virtual size_t write (void *, size_t) = 0;
|
||||
virtual size_t pos (void) = 0;
|
||||
virtual size_t size (void) = 0;
|
||||
virtual int revert (size_t from, size_t offset) = 0;
|
||||
virtual int revert (uint8 origin, int32 offset) = 0;
|
||||
virtual void closeStream() = 0;
|
||||
|
||||
protected:
|
||||
size_t pos_from_origin_offset(uint8 origin, int32 offset);
|
||||
};
|
||||
|
||||
class fStream : public Stream
|
||||
@ -223,7 +226,7 @@ class fStream : public Stream
|
||||
virtual size_t write (void *, size_t);
|
||||
virtual size_t pos (void);
|
||||
virtual size_t size (void);
|
||||
virtual int revert (size_t from, size_t offset);
|
||||
virtual int revert (uint8 origin, int32 offset);
|
||||
virtual void closeStream();
|
||||
|
||||
private:
|
||||
@ -250,7 +253,7 @@ class unzStream : public Stream
|
||||
virtual size_t write (void *, size_t);
|
||||
virtual size_t pos (void);
|
||||
virtual size_t size (void);
|
||||
virtual int revert (size_t from, size_t offset);
|
||||
virtual int revert (uint8 origin, int32 offset);
|
||||
virtual void closeStream();
|
||||
|
||||
private:
|
||||
@ -279,7 +282,7 @@ class memStream : public Stream
|
||||
virtual size_t write (void *, size_t);
|
||||
virtual size_t pos (void);
|
||||
virtual size_t size (void);
|
||||
virtual int revert (size_t from, size_t offset);
|
||||
virtual int revert (uint8 origin, int32 offset);
|
||||
virtual void closeStream();
|
||||
|
||||
private:
|
||||
@ -304,7 +307,7 @@ class nulStream : public Stream
|
||||
virtual size_t write (void *, size_t);
|
||||
virtual size_t pos (void);
|
||||
virtual size_t size (void);
|
||||
virtual int revert (size_t from, size_t offset);
|
||||
virtual int revert (uint8 origin, int32 offset);
|
||||
virtual void closeStream();
|
||||
|
||||
private:
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
@ -474,7 +489,6 @@ static uint8 ConvertTile4h_even (uint8 *pCache, uint32 TileAddr, uint32 Tile)
|
||||
#undef DOBIT
|
||||
|
||||
// First-level include: Get all the renderers.
|
||||
|
||||
#include "tile.cpp"
|
||||
|
||||
// Functions to select which converter and renderer to use.
|
||||
@ -697,13 +711,11 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
}
|
||||
|
||||
#define IS_BLANK_TILE() \
|
||||
(BG.Buffered[TileNumber] == BLANK_TILE)
|
||||
( ( (Tile & H_FLIP) ? BG.BufferedFlip[TileNumber] : BG.Buffered[TileNumber]) == BLANK_TILE)
|
||||
|
||||
#define SELECT_PALETTE() \
|
||||
if (BG.DirectColourMode) \
|
||||
{ \
|
||||
if (IPPU.DirectColourMapsNeedRebuild) \
|
||||
S9xBuildDirectColourMaps(); \
|
||||
GFX.RealScreenColors = DirectColourMaps[(Tile >> 10) & 7]; \
|
||||
} \
|
||||
else \
|
||||
@ -749,6 +761,7 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
if (!(Tile & (V_FLIP | H_FLIP))) \
|
||||
{ \
|
||||
bp = pCache + BPSTART; \
|
||||
OFFSET_IN_LINE; \
|
||||
for (l = LineCount; l > 0; l--, bp += 8 * PITCH, Offset += GFX.PPL) \
|
||||
{ \
|
||||
DRAW_PIXEL(0, Pix = bp[0]); \
|
||||
@ -765,6 +778,7 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
if (!(Tile & V_FLIP)) \
|
||||
{ \
|
||||
bp = pCache + BPSTART; \
|
||||
OFFSET_IN_LINE; \
|
||||
for (l = LineCount; l > 0; l--, bp += 8 * PITCH, Offset += GFX.PPL) \
|
||||
{ \
|
||||
DRAW_PIXEL(0, Pix = bp[7]); \
|
||||
@ -781,6 +795,7 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
if (!(Tile & H_FLIP)) \
|
||||
{ \
|
||||
bp = pCache + 56 - BPSTART; \
|
||||
OFFSET_IN_LINE; \
|
||||
for (l = LineCount; l > 0; l--, bp -= 8 * PITCH, Offset += GFX.PPL) \
|
||||
{ \
|
||||
DRAW_PIXEL(0, Pix = bp[0]); \
|
||||
@ -796,6 +811,7 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
else \
|
||||
{ \
|
||||
bp = pCache + 56 - BPSTART; \
|
||||
OFFSET_IN_LINE; \
|
||||
for (l = LineCount; l > 0; l--, bp -= 8 * PITCH, Offset += GFX.PPL) \
|
||||
{ \
|
||||
DRAW_PIXEL(0, Pix = bp[7]); \
|
||||
@ -840,18 +856,19 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
if (!(Tile & (V_FLIP | H_FLIP))) \
|
||||
{ \
|
||||
bp = pCache + BPSTART; \
|
||||
OFFSET_IN_LINE; \
|
||||
for (l = LineCount; l > 0; l--, bp += 8 * PITCH, Offset += GFX.PPL) \
|
||||
{ \
|
||||
w = Width; \
|
||||
switch (StartPixel) \
|
||||
{ \
|
||||
case 0: DRAW_PIXEL(0, Pix = bp[0]); if (!--w) break; \
|
||||
case 1: DRAW_PIXEL(1, Pix = bp[1]); if (!--w) break; \
|
||||
case 2: DRAW_PIXEL(2, Pix = bp[2]); if (!--w) break; \
|
||||
case 3: DRAW_PIXEL(3, Pix = bp[3]); if (!--w) break; \
|
||||
case 4: DRAW_PIXEL(4, Pix = bp[4]); if (!--w) break; \
|
||||
case 5: DRAW_PIXEL(5, Pix = bp[5]); if (!--w) break; \
|
||||
case 6: DRAW_PIXEL(6, Pix = bp[6]); if (!--w) break; \
|
||||
case 0: DRAW_PIXEL(0, Pix = bp[0]); if (!--w) break; /* Fall through */ \
|
||||
case 1: DRAW_PIXEL(1, Pix = bp[1]); if (!--w) break; /* Fall through */ \
|
||||
case 2: DRAW_PIXEL(2, Pix = bp[2]); if (!--w) break; /* Fall through */ \
|
||||
case 3: DRAW_PIXEL(3, Pix = bp[3]); if (!--w) break; /* Fall through */ \
|
||||
case 4: DRAW_PIXEL(4, Pix = bp[4]); if (!--w) break; /* Fall through */ \
|
||||
case 5: DRAW_PIXEL(5, Pix = bp[5]); if (!--w) break; /* Fall through */ \
|
||||
case 6: DRAW_PIXEL(6, Pix = bp[6]); if (!--w) break; /* Fall through */ \
|
||||
case 7: DRAW_PIXEL(7, Pix = bp[7]); break; \
|
||||
} \
|
||||
} \
|
||||
@ -860,18 +877,19 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
if (!(Tile & V_FLIP)) \
|
||||
{ \
|
||||
bp = pCache + BPSTART; \
|
||||
OFFSET_IN_LINE; \
|
||||
for (l = LineCount; l > 0; l--, bp += 8 * PITCH, Offset += GFX.PPL) \
|
||||
{ \
|
||||
w = Width; \
|
||||
switch (StartPixel) \
|
||||
{ \
|
||||
case 0: DRAW_PIXEL(0, Pix = bp[7]); if (!--w) break; \
|
||||
case 1: DRAW_PIXEL(1, Pix = bp[6]); if (!--w) break; \
|
||||
case 2: DRAW_PIXEL(2, Pix = bp[5]); if (!--w) break; \
|
||||
case 3: DRAW_PIXEL(3, Pix = bp[4]); if (!--w) break; \
|
||||
case 4: DRAW_PIXEL(4, Pix = bp[3]); if (!--w) break; \
|
||||
case 5: DRAW_PIXEL(5, Pix = bp[2]); if (!--w) break; \
|
||||
case 6: DRAW_PIXEL(6, Pix = bp[1]); if (!--w) break; \
|
||||
case 0: DRAW_PIXEL(0, Pix = bp[7]); if (!--w) break; /* Fall through */ \
|
||||
case 1: DRAW_PIXEL(1, Pix = bp[6]); if (!--w) break; /* Fall through */ \
|
||||
case 2: DRAW_PIXEL(2, Pix = bp[5]); if (!--w) break; /* Fall through */ \
|
||||
case 3: DRAW_PIXEL(3, Pix = bp[4]); if (!--w) break; /* Fall through */ \
|
||||
case 4: DRAW_PIXEL(4, Pix = bp[3]); if (!--w) break; /* Fall through */ \
|
||||
case 5: DRAW_PIXEL(5, Pix = bp[2]); if (!--w) break; /* Fall through */ \
|
||||
case 6: DRAW_PIXEL(6, Pix = bp[1]); if (!--w) break; /* Fall through */ \
|
||||
case 7: DRAW_PIXEL(7, Pix = bp[0]); break; \
|
||||
} \
|
||||
} \
|
||||
@ -880,18 +898,19 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
if (!(Tile & H_FLIP)) \
|
||||
{ \
|
||||
bp = pCache + 56 - BPSTART; \
|
||||
OFFSET_IN_LINE; \
|
||||
for (l = LineCount; l > 0; l--, bp -= 8 * PITCH, Offset += GFX.PPL) \
|
||||
{ \
|
||||
w = Width; \
|
||||
switch (StartPixel) \
|
||||
{ \
|
||||
case 0: DRAW_PIXEL(0, Pix = bp[0]); if (!--w) break; \
|
||||
case 1: DRAW_PIXEL(1, Pix = bp[1]); if (!--w) break; \
|
||||
case 2: DRAW_PIXEL(2, Pix = bp[2]); if (!--w) break; \
|
||||
case 3: DRAW_PIXEL(3, Pix = bp[3]); if (!--w) break; \
|
||||
case 4: DRAW_PIXEL(4, Pix = bp[4]); if (!--w) break; \
|
||||
case 5: DRAW_PIXEL(5, Pix = bp[5]); if (!--w) break; \
|
||||
case 6: DRAW_PIXEL(6, Pix = bp[6]); if (!--w) break; \
|
||||
case 0: DRAW_PIXEL(0, Pix = bp[0]); if (!--w) break; /* Fall through */ \
|
||||
case 1: DRAW_PIXEL(1, Pix = bp[1]); if (!--w) break; /* Fall through */ \
|
||||
case 2: DRAW_PIXEL(2, Pix = bp[2]); if (!--w) break; /* Fall through */ \
|
||||
case 3: DRAW_PIXEL(3, Pix = bp[3]); if (!--w) break; /* Fall through */ \
|
||||
case 4: DRAW_PIXEL(4, Pix = bp[4]); if (!--w) break; /* Fall through */ \
|
||||
case 5: DRAW_PIXEL(5, Pix = bp[5]); if (!--w) break; /* Fall through */ \
|
||||
case 6: DRAW_PIXEL(6, Pix = bp[6]); if (!--w) break; /* Fall through */ \
|
||||
case 7: DRAW_PIXEL(7, Pix = bp[7]); break; \
|
||||
} \
|
||||
} \
|
||||
@ -899,18 +918,19 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
else \
|
||||
{ \
|
||||
bp = pCache + 56 - BPSTART; \
|
||||
OFFSET_IN_LINE; \
|
||||
for (l = LineCount; l > 0; l--, bp -= 8 * PITCH, Offset += GFX.PPL) \
|
||||
{ \
|
||||
w = Width; \
|
||||
switch (StartPixel) \
|
||||
{ \
|
||||
case 0: DRAW_PIXEL(0, Pix = bp[7]); if (!--w) break; \
|
||||
case 1: DRAW_PIXEL(1, Pix = bp[6]); if (!--w) break; \
|
||||
case 2: DRAW_PIXEL(2, Pix = bp[5]); if (!--w) break; \
|
||||
case 3: DRAW_PIXEL(3, Pix = bp[4]); if (!--w) break; \
|
||||
case 4: DRAW_PIXEL(4, Pix = bp[3]); if (!--w) break; \
|
||||
case 5: DRAW_PIXEL(5, Pix = bp[2]); if (!--w) break; \
|
||||
case 6: DRAW_PIXEL(6, Pix = bp[1]); if (!--w) break; \
|
||||
case 0: DRAW_PIXEL(0, Pix = bp[7]); if (!--w) break; /* Fall through */ \
|
||||
case 1: DRAW_PIXEL(1, Pix = bp[6]); if (!--w) break; /* Fall through */ \
|
||||
case 2: DRAW_PIXEL(2, Pix = bp[5]); if (!--w) break; /* Fall through */ \
|
||||
case 3: DRAW_PIXEL(3, Pix = bp[4]); if (!--w) break; /* Fall through */ \
|
||||
case 4: DRAW_PIXEL(4, Pix = bp[3]); if (!--w) break; /* Fall through */ \
|
||||
case 5: DRAW_PIXEL(5, Pix = bp[2]); if (!--w) break; /* Fall through */ \
|
||||
case 6: DRAW_PIXEL(6, Pix = bp[1]); if (!--w) break; /* Fall through */ \
|
||||
case 7: DRAW_PIXEL(7, Pix = bp[0]); break; \
|
||||
} \
|
||||
} \
|
||||
@ -955,6 +975,7 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
\
|
||||
if (Pix) \
|
||||
{ \
|
||||
OFFSET_IN_LINE; \
|
||||
for (l = LineCount; l > 0; l--, Offset += GFX.PPL) \
|
||||
{ \
|
||||
for (w = Width - 1; w >= 0; w--) \
|
||||
@ -991,6 +1012,7 @@ void S9xSelectTileConverter (int depth, bool8 hires, bool8 sub, bool8 mosaic)
|
||||
GFX.RealScreenColors = IPPU.ScreenColors; \
|
||||
GFX.ScreenColors = GFX.ClipColors ? BlackColourMap : GFX.RealScreenColors; \
|
||||
\
|
||||
OFFSET_IN_LINE; \
|
||||
for (l = GFX.StartY; l <= GFX.EndY; l++, Offset += GFX.PPL) \
|
||||
{ \
|
||||
for (x = Left; x < Right; x++) \
|
||||
@ -1036,8 +1058,6 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
\
|
||||
if (DCMODE) \
|
||||
{ \
|
||||
if (IPPU.DirectColourMapsNeedRebuild) \
|
||||
S9xBuildDirectColourMaps(); \
|
||||
GFX.RealScreenColors = DirectColourMaps[0]; \
|
||||
} \
|
||||
else \
|
||||
@ -1051,6 +1071,7 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
uint32 Offset = GFX.StartY * GFX.PPL; \
|
||||
struct SLineMatrixData *l = &LineMatrixData[GFX.StartY]; \
|
||||
\
|
||||
OFFSET_IN_LINE; \
|
||||
for (uint32 Line = GFX.StartY; Line <= GFX.EndY; Line++, Offset += GFX.PPL, l++) \
|
||||
{ \
|
||||
int yy, starty; \
|
||||
@ -1133,8 +1154,6 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
\
|
||||
if (DCMODE) \
|
||||
{ \
|
||||
if (IPPU.DirectColourMapsNeedRebuild) \
|
||||
S9xBuildDirectColourMaps(); \
|
||||
GFX.RealScreenColors = DirectColourMaps[0]; \
|
||||
} \
|
||||
else \
|
||||
@ -1166,6 +1185,7 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
uint32 Offset = StartY * GFX.PPL; \
|
||||
struct SLineMatrixData *l = &LineMatrixData[StartY]; \
|
||||
\
|
||||
OFFSET_IN_LINE; \
|
||||
for (uint32 Line = StartY; Line <= GFX.EndY; Line += VMosaic, Offset += VMosaic * GFX.PPL, l += VMosaic) \
|
||||
{ \
|
||||
if (Line + VMosaic > GFX.EndY) \
|
||||
@ -1341,6 +1361,7 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
|
||||
// The 1x1 pixel plotter, for speedhacking modes.
|
||||
|
||||
#define OFFSET_IN_LINE
|
||||
#define DRAW_PIXEL(N, M) \
|
||||
if (Z1 > GFX.DB[Offset + N] && (M)) \
|
||||
{ \
|
||||
@ -1375,6 +1396,7 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
|
||||
#undef NAME2
|
||||
#undef DRAW_PIXEL
|
||||
#undef OFFSET_IN_LINE
|
||||
|
||||
// Hires pixel plotter, this combines the main and subscreen pixels as appropriate to render hires or pseudo-hires images.
|
||||
// Use it only on the main screen, subscreen should use Normal2x1 instead.
|
||||
@ -1388,11 +1410,16 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
#define DRAW_PIXEL_H2x1(N, M) \
|
||||
if (Z1 > GFX.DB[Offset + 2 * N] && (M)) \
|
||||
{ \
|
||||
GFX.S[Offset + 2 * N] = MATH((GFX.ClipColors ? 0 : GFX.SubScreen[Offset + 2 * N]), GFX.RealScreenColors[Pix], GFX.SubZBuffer[Offset + 2 * N]); \
|
||||
GFX.S[Offset + 2 * N + 1] = MATH(GFX.ScreenColors[Pix], GFX.SubScreen[Offset + 2 * N], GFX.SubZBuffer[Offset + 2 * N]); \
|
||||
if ((OffsetInLine + 2 * N ) != (SNES_WIDTH - 1) << 1) \
|
||||
GFX.S[Offset + 2 * N + 2] = MATH((GFX.ClipColors ? 0 : GFX.SubScreen[Offset + 2 * N + 2]), GFX.RealScreenColors[Pix], GFX.SubZBuffer[Offset + 2 * N]); \
|
||||
if ((OffsetInLine + 2 * N) == 0 || (OffsetInLine + 2 * N) == GFX.RealPPL) \
|
||||
GFX.S[Offset + 2 * N] = MATH((GFX.ClipColors ? 0 : GFX.SubScreen[Offset + 2 * N]), GFX.RealScreenColors[Pix], GFX.SubZBuffer[Offset + 2 * N]); \
|
||||
GFX.DB[Offset + 2 * N] = GFX.DB[Offset + 2 * N + 1] = Z2; \
|
||||
}
|
||||
|
||||
#define OFFSET_IN_LINE \
|
||||
uint32 OffsetInLine = Offset % GFX.RealPPL;
|
||||
#define DRAW_PIXEL(N, M) DRAW_PIXEL_H2x1(N, M)
|
||||
#define NAME2 Hires
|
||||
|
||||
@ -1402,6 +1429,7 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
|
||||
#undef NAME2
|
||||
#undef DRAW_PIXEL
|
||||
#undef OFFSET_IN_LINE
|
||||
|
||||
// Interlace: Only draw every other line, so we'll redefine BPSTART and PITCH to do so.
|
||||
// Otherwise, it's the same as Normal2x1/Hires2x1.
|
||||
@ -1414,6 +1442,7 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
|
||||
#ifndef NO_INTERLACE
|
||||
|
||||
#define OFFSET_IN_LINE
|
||||
#define DRAW_PIXEL(N, M) DRAW_PIXEL_N2x1(N, M)
|
||||
#define NAME2 Interlace
|
||||
|
||||
@ -1423,7 +1452,10 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
|
||||
#undef NAME2
|
||||
#undef DRAW_PIXEL
|
||||
#undef OFFSET_IN_LINE
|
||||
|
||||
#define OFFSET_IN_LINE \
|
||||
uint32 OffsetInLine = Offset % GFX.RealPPL;
|
||||
#define DRAW_PIXEL(N, M) DRAW_PIXEL_H2x1(N, M)
|
||||
#define NAME2 HiresInterlace
|
||||
|
||||
@ -1433,6 +1465,7 @@ extern struct SLineMatrixData LineMatrixData[240];
|
||||
|
||||
#undef NAME2
|
||||
#undef DRAW_PIXEL
|
||||
#undef OFFSET_IN_LINE
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -17,13 +17,20 @@
|
||||
|
||||
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
|
||||
Nach (n-a-c-h@users.sourceforge.net),
|
||||
zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
|
||||
|
||||
(c) Copyright 2006 - 2007 nitsuja
|
||||
|
||||
(c) Copyright 2009 - 2010 BearOso,
|
||||
(c) Copyright 2009 - 2018 BearOso,
|
||||
OV2
|
||||
|
||||
(c) Copyright 2017 qwertymodo
|
||||
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
BS-X C emulator code
|
||||
(c) Copyright 2005 - 2006 Dreamer Nom,
|
||||
@ -117,6 +124,9 @@
|
||||
Sound emulator code used in 1.52+
|
||||
(c) Copyright 2004 - 2007 Shay Green (gblargg@gmail.com)
|
||||
|
||||
S-SMP emulator code used in 1.54+
|
||||
(c) Copyright 2016 byuu
|
||||
|
||||
SH assembler code partly based on x86 assembler code
|
||||
(c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
|
||||
|
||||
@ -130,7 +140,7 @@
|
||||
(c) Copyright 2006 - 2007 Shay Green
|
||||
|
||||
GTK+ GUI code
|
||||
(c) Copyright 2004 - 2010 BearOso
|
||||
(c) Copyright 2004 - 2018 BearOso
|
||||
|
||||
Win32 GUI code
|
||||
(c) Copyright 2003 - 2006 blip,
|
||||
@ -138,11 +148,16 @@
|
||||
Matthew Kendora,
|
||||
Nach,
|
||||
nitsuja
|
||||
(c) Copyright 2009 - 2010 OV2
|
||||
(c) Copyright 2009 - 2018 OV2
|
||||
|
||||
Mac OS GUI code
|
||||
(c) Copyright 1998 - 2001 John Stiles
|
||||
(c) Copyright 2001 - 2010 zones
|
||||
(c) Copyright 2001 - 2011 zones
|
||||
|
||||
Libretro port
|
||||
(c) Copyright 2011 - 2017 Hans-Kristian Arntzen,
|
||||
Daniel De Matteis
|
||||
(Under no circumstances will commercial rights be given)
|
||||
|
||||
|
||||
Specific ports contains the works of other authors. See headers in
|
||||
|
||||
Loading…
Reference in New Issue
Block a user