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

Rewrite some expressions to avoid type checker edge cases

This commit is contained in:
YoshiRulz 2021-03-04 20:11:18 +10:00
parent 28241e3042
commit 6afb3be98c
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
6 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
View File

@ -513,7 +513,9 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
{ {
return _peek(addr, firstOffset, size); return _peek(addr, firstOffset, size);
}, },
read == "rom" ? (Action<long, byte>) null : (addr, val) => _poke(addr, val, firstOffset, size), read == "rom"
? null
: (long addr, byte val) => _poke(addr, val, firstOffset, size),
dataWidth)); dataWidth));
} }
} }

16
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/HW_Registers.cs
View File

@ -213,15 +213,23 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
break; break;
case 0xFF76: case 0xFF76:
byte ret1 = audio.SQ1_output >= Audio.DAC_OFST ? (byte)(audio.SQ1_output - Audio.DAC_OFST) : 0; var ret1 = audio.SQ1_output >= Audio.DAC_OFST
byte ret2 = audio.SQ2_output >= Audio.DAC_OFST ? (byte)(audio.SQ2_output - Audio.DAC_OFST) : 0; ? (byte) (audio.SQ1_output - Audio.DAC_OFST)
: (byte) 0;
var ret2 = audio.SQ2_output >= Audio.DAC_OFST
? (byte) (audio.SQ2_output - Audio.DAC_OFST)
: (byte) 0;
if (is_GBC) { ret = (byte)(ret1 | (ret2 << 4)); } if (is_GBC) { ret = (byte)(ret1 | (ret2 << 4)); }
else { ret = 0xFF; } else { ret = 0xFF; }
break; break;
case 0xFF77: case 0xFF77:
byte retN = audio.NOISE_output >= Audio.DAC_OFST ? (byte)(audio.NOISE_output - Audio.DAC_OFST) : 0; var retN = audio.NOISE_output >= Audio.DAC_OFST
byte retW = audio.WAVE_output >= Audio.DAC_OFST ? (byte)(audio.WAVE_output - Audio.DAC_OFST) : 0; ? (byte) (audio.NOISE_output - Audio.DAC_OFST)
: (byte) 0;
var retW = audio.WAVE_output >= Audio.DAC_OFST
? (byte) (audio.WAVE_output - Audio.DAC_OFST)
: (byte) 0;
if (is_GBC) { ret = (byte)(retN | (retW << 4)); } if (is_GBC) { ret = (byte)(retN | (retW << 4)); }
else { ret = 0xFF; } else { ret = 0xFF; }
break; break;

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Default.cs
View File

@ -23,7 +23,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
} }
else else
{ {
return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8) ? 0xFF : Core.bus_value; return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8)
? (byte) 0xFF
: Core.bus_value;
} }
} }

8
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs
View File

@ -58,12 +58,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
} }
else else
{ {
return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8) ? 0xFF : Core.bus_value; return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8)
? (byte) 0xFF
: Core.bus_value;
} }
} }
else else
{ {
return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8) ? 0xFF : Core.bus_value; return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8)
? (byte) 0xFF
: Core.bus_value;
} }
} }

8
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1_Multi.cs
View File

@ -58,13 +58,17 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
} }
else else
{ {
return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8) ? 0xFF : Core.bus_value; return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8)
? (byte) 0xFF
: Core.bus_value;
} }
} }
else else
{ {
return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8) ? 0xFF : Core.bus_value; return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8)
? (byte) 0xFF
: Core.bus_value;
} }
} }

8
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
View File

@ -69,7 +69,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
} }
else else
{ {
return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8) ? 0xFF : Core.bus_value; return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8)
? (byte) 0xFF
: Core.bus_value;
} }
} }
@ -85,7 +87,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
} }
else else
{ {
return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8) ? 0xFF : Core.bus_value; return Core.cpu.TotalExecutedCycles > (Core.bus_access_time + 8)
? (byte) 0xFF
: Core.bus_value;
} }
} }