From aa784295d8acdf168c7b23bd7ca1982f95be0d27 Mon Sep 17 00:00:00 2001 From: beirich Date: Wed, 12 Jan 2011 06:08:17 +0000 Subject: [PATCH] extended video mode support; 2/3 CodeMasters games playable now... --- BizHawk.Emulation/BizHawk.Emulation.csproj | 1 + .../Consoles/Sega/SMS/Compat.txt | 9 +- BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs | 9 +- .../Consoles/Sega/SMS/VDP.Tables.cs | 50 ++++++++ BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs | 116 ++++++++++++------ 5 files changed, 140 insertions(+), 45 deletions(-) create mode 100644 BizHawk.Emulation/Consoles/Sega/SMS/VDP.Tables.cs diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj index 03bb1f7368..d6bcb17a73 100644 --- a/BizHawk.Emulation/BizHawk.Emulation.csproj +++ b/BizHawk.Emulation/BizHawk.Emulation.csproj @@ -49,6 +49,7 @@ + diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/Compat.txt b/BizHawk.Emulation/Consoles/Sega/SMS/Compat.txt index 6d81384a38..49d1daab4f 100644 --- a/BizHawk.Emulation/Consoles/Sega/SMS/Compat.txt +++ b/BizHawk.Emulation/Consoles/Sega/SMS/Compat.txt @@ -1,9 +1,10 @@ ======= Sega MasterSystem Compatibility Issues ======= -* CodeMasters games don't work: - + CodeMasters games use a custom mapper (implemented now). - + CodeMasters games use alternate video mode, not implemented. - + Games are: Cosmic Spacehead, Fantastic Dizzy, Micro Machines +* CodeMasters games use a custom mapper and special video modes (both implemented) + + Cosmic Spacehead and Micro Machines are playable but suffer from a graphic glitch on the + top part of the frame. In my defense, Kega, Cogwheel, and other emulators do the precise + same thing. + + Fantastic Dizzy crashes shortly after starting a new game. Investigating. * F16 Fighting Falcon uses old SG-1000 video mode, and doesn't work on a GG/Genesis either. diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs index 3f8b4a3990..6547cf8f0f 100644 --- a/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs +++ b/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs @@ -198,7 +198,7 @@ namespace BizHawk.Emulation.Consoles.Sega private void ProcessFrameInterrupt() { - if (Vdp.ScanLine == 193) + if (Vdp.ScanLine == Vdp.BufferHeight+1) Vdp.StatusByte |= 0x80; if ((Vdp.StatusByte & 0x80) != 0 && Vdp.EnableFrameInterrupts) @@ -207,7 +207,7 @@ namespace BizHawk.Emulation.Consoles.Sega private void ProcessLineInterrupt() { - if (Vdp.ScanLine <= 192) + if (Vdp.ScanLine <= Vdp.BufferHeight) { if (lineIntLinesRemaining-- <= 0) { @@ -236,12 +236,11 @@ namespace BizHawk.Emulation.Consoles.Sega ProcessFrameInterrupt(); ProcessLineInterrupt(); - if (Vdp.ScanLine < 192) - Vdp.RenderCurrentScanline(render); + Vdp.RenderCurrentScanline(render); Cpu.ExecuteCycles(IPeriod); - if (Vdp.ScanLine == 192) + if (Vdp.ScanLine == scanlinesPerFrame-1) Vdp.RenderBlankingRegions(); } PSG.EndFrame(Cpu.TotalExecutedCycles); diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/VDP.Tables.cs b/BizHawk.Emulation/Consoles/Sega/SMS/VDP.Tables.cs new file mode 100644 index 0000000000..e0feea54e1 --- /dev/null +++ b/BizHawk.Emulation/Consoles/Sega/SMS/VDP.Tables.cs @@ -0,0 +1,50 @@ +namespace BizHawk.Emulation.Consoles.Sega +{ + public partial class VDP + { + // TODO: PAL video modes, HCounter + + private readonly byte[] VLineCounterTableNTSC192 = + { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, + 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, + 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, + 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, + 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, + 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, + 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, + 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, + }; + + + private readonly byte[] VLineCounterTableNTSC240 = + { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, + 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, + 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, + 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, + 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, + 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, + 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 + }; + } +} diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs b/BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs index bd677022c6..9886b4f8de 100644 --- a/BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs +++ b/BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs @@ -21,7 +21,7 @@ namespace BizHawk.Emulation.Consoles.Sega /// /// Emulates the Texas Instruments TMS9918 VDP. /// - public sealed class VDP : IVideoProvider + public sealed partial class VDP : IVideoProvider { // VDP State public byte[] VRAM = new byte[0x4000]; //16kb video RAM @@ -41,6 +41,8 @@ namespace BizHawk.Emulation.Consoles.Sega public int ScanLine; + private int FrameHeight = 192; + public int[] FrameBuffer = new int[256*192]; public int[] GameGearFrameBuffer = new int[160*144]; @@ -59,30 +61,18 @@ namespace BizHawk.Emulation.Consoles.Sega public bool EnableFrameInterrupts { get { return (Registers[1] & 32) > 0; } } public bool Enable8x16Sprites { get { return (Registers[1] & 2) > 0; } } public byte BackdropColor { get { return (byte) (16 + (Registers[7] & 15)); } } - public int NameTableBase { get { return 1024 * (Registers[2] & 0x0E); } } public int SpriteAttributeTableBase { get { return ((Registers[5] >> 1) << 8) & 0x3FFF; } } public int SpriteTileBase { get { return (Registers[6] & 4) > 0 ? 256: 0; } } - - private readonly byte[] VLineCounterTable = - { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, - 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, - 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, - 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, - 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, - 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, - 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, - 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, - 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, - 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, - 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, - 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, - 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, - 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, - 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, - }; + + public int NameTableBase + { + get + { + if (FrameHeight == 192) + return 1024 * (Registers[2] & 0x0E); + return (1024 * (Registers[2] & 0x0C)) + 0x0700; + } + } public byte[] PatternBuffer = new byte[0x8000]; @@ -115,7 +105,7 @@ namespace BizHawk.Emulation.Consoles.Sega public byte ReadVLineCounter() { - return VLineCounterTable[ScanLine]; + return FrameHeight == 240 ? VLineCounterTableNTSC240[ScanLine] : VLineCounterTableNTSC192[ScanLine]; } public void WriteVdpRegister(byte value) @@ -144,7 +134,10 @@ namespace BizHawk.Emulation.Consoles.Sega vdpAddress = (ushort)(((value & 63) << 8) | vdpLatch); break; case 0x80: // VDP register write - Registers[value & 0x0F] = vdpLatch; + int reg = value & 0x0F; + Registers[reg] = vdpLatch; + if (reg == 1 || reg == 2) + CheckVideoMode(); break; case 0xC0: // write CRAM / modify palette vdpCommand = VdpCommand.CramWrite; @@ -199,6 +192,44 @@ namespace BizHawk.Emulation.Consoles.Sega } } + private void CheckVideoMode() + { + if ((Registers[0] & 6) == 6) // if Mode4 and Mode2 set, then check extension modes + { + switch (Registers[1] & 0x18) + { + case 0x00: + case 0x18: // 192-line mode + if (FrameHeight != 192) + { + FrameHeight = 192; + FrameBuffer = new int[256*192]; + } + break; + case 0x10: // 224-line mode + if (FrameHeight != 224) + { + FrameHeight = 224; + FrameBuffer = new int[256*224]; + } + break; + case 0x08: // 240-line mode + if (FrameHeight != 240) + { + FrameHeight = 240; + FrameBuffer = new int[256 * 240]; + } + break; + } + } else { // default to standard 192-line mode4 + if (FrameHeight != 192) + { + FrameHeight = 192; + FrameBuffer = new int[256*192]; + } + } + } + private static readonly byte[] pow2 = {1, 2, 4, 8, 16, 32, 64, 128}; private void UpdatePatternBuffer(ushort address, byte value) @@ -218,6 +249,9 @@ namespace BizHawk.Emulation.Consoles.Sega internal void RenderCurrentScanline(bool render) { + if (ScanLine >= FrameHeight) + return; + // TODO: make frameskip actually skip rendering RenderBackgroundCurrentLine(); RenderSpritesCurrentLine(); @@ -239,8 +273,15 @@ namespace BizHawk.Emulation.Consoles.Sega int mapBase = NameTableBase; int vertOffset = ScanLine + Registers[9]; - if (vertOffset >= 224) - vertOffset -= 224; + if (FrameHeight == 192) + { + if (vertOffset >= 224) + vertOffset -= 224; + } else + { + if (vertOffset >= 256) + vertOffset -= 256; + } byte horzOffset = (HorizScrollLock && ScanLine < 16) ? (byte) 0 : Registers[8]; int yTile = vertOffset/8; @@ -323,16 +364,17 @@ namespace BizHawk.Emulation.Consoles.Sega for (int c = 0; c < 256; c++) SpriteCollisionBuffer[c] = 0; - // 208 is a special terminator sprite. Lets find it... + // 208 is a special terminator sprite (in 192-line mode). Lets find it... int TerminalSprite = 64; - for (int i = 0; i < 64; i++) - { - if (VRAM[SpriteBase + i] == 208) + if (FrameHeight == 192) + for (int i = 0; i < 64; i++) { - TerminalSprite = i; - break; + if (VRAM[SpriteBase + i] == 208) + { + TerminalSprite = i; + break; + } } - } // Loop through these sprites and render the current scanline int SpritesDrawnThisScanline = 0; @@ -383,7 +425,7 @@ namespace BizHawk.Emulation.Consoles.Sega if (LeftBlanking) { - for (int y=0; y<192; y++) + for (int y=0; y