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

coleco 'noskip' checkin... tested through M's so far

This commit is contained in:
beirich 2012-11-23 05:51:16 +00:00
parent 32d0b546e0
commit 2382781627
4 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation/CPUs/Z80/Execute.cs
View File

@ -11648,8 +11648,6 @@ namespace BizHawk.Emulation.CPUs.Z80
public string State()
{
ushort tempPC = RegPC.Word;
//ushort pc = RegPC.Word;
//string str = disasm.Disassemble(() => ReadMemory(pc++));
string a = string.Format("{0:X4} {1:X2} {2} ", RegPC.Word, ReadMemory(RegPC.Word), Disassembler.Disassemble(() => ReadMemory(tempPC++)).PadRight(41));
string b = string.Format("AF:{0:X4} BC:{1:X4} DE:{2:X4} HL:{3:X4} IX:{4:X4} IY:{5:X4} SP:{6:X4} Cy:{7}", RegAF.Word, RegBC.Word, RegDE.Word, RegHL.Word, RegIX.Word, RegIY.Word, RegSP.Word, TotalExecutedCycles);
string val = a + b + " ";

19
BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
View File

@ -27,7 +27,7 @@ namespace BizHawk.Emulation.Consoles.Coleco
Cpu.WriteMemory = WriteMemory;
Cpu.ReadHardware = ReadPort;
Cpu.WriteHardware = WritePort;
Cpu.Logger = (s) => Console.WriteLine(s);
Cpu.Logger = (s) => Log.Error("COL", s);
//Cpu.Debug = true;
VDP = new TMS9918A(Cpu);
@ -38,11 +38,13 @@ namespace BizHawk.Emulation.Consoles.Coleco
CoreOutputComm = new CoreOutputComm();
CoreInputComm = new CoreInputComm();
if (game["NoSkip"])
skipbios = false;
Console.WriteLine("skipbios = {0}", skipbios);
LoadRom(rom, skipbios);
this.game = game;
SetupMemoryDomains();
Reset();
}
public IList<MemoryDomain> MemoryDomains { get { return memoryDomains; } }
@ -94,16 +96,9 @@ namespace BizHawk.Emulation.Consoles.Coleco
}
}
void Reset()
{
/*Cpu.RegisterPC = Cpu.ReadWord(0x800A);
Console.WriteLine("code start vector = {0:X4}", Cpu.RegisterPC);*/
}
byte ReadPort(ushort port)
{
port &= 0xFF;
//Console.WriteLine("Read port {0:X2}", port);
if (port >= 0xA0 && port < 0xC0)
{
@ -152,8 +147,6 @@ namespace BizHawk.Emulation.Consoles.Coleco
PSG.WritePsgData(value, Cpu.TotalExecutedCycles);
return;
}
//Console.WriteLine("Write port {0:X2}:{1:X2}", port, value);
}
public byte[] ReadSaveRam() { return null; }
@ -253,4 +246,4 @@ namespace BizHawk.Emulation.Consoles.Coleco
public bool StartAsyncSound() { return true; }
public void EndAsyncSound() { }
}
}
}

17
BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs
View File

@ -54,7 +54,6 @@ namespace BizHawk.Emulation.Consoles.Coleco
InterruptPending = true;
if (EnableInterrupts)
Cpu.NonMaskableInterrupt = true;
//Console.WriteLine("Set NMI / VSYNC");
}
Cpu.ExecuteCycles(228);
@ -97,20 +96,14 @@ namespace BizHawk.Emulation.Consoles.Coleco
VdpWaitingForLatchByte = true;
VdpBuffer = value;
// Write VRAM and update pre-computed pattern buffer.
//UpdatePatternBuffer((ushort)(VdpAddress & 0x3FFF), value);
//Console.WriteLine("VRAM[{0:X4}] = {1:X2}", VdpAddress & 0x3FFF, value);
VRAM[VdpAddress & 0x3FFF] = value;
VdpAddress++;
}
void WriteRegister(int reg, byte data)
{
if (reg >= 8) return;
Log.Error("COL","Write register {0} : {1:X2}", reg, data);
Console.WriteLine("Write register {0} : {1:X2}", reg, data);
Registers[reg] = data;
switch (reg)
{
@ -120,7 +113,9 @@ namespace BizHawk.Emulation.Consoles.Coleco
case 1: // Mode Control Register 2
CheckVideoMode();
Cpu.NonMaskableInterrupt = (EnableInterrupts && InterruptPending);
Console.WriteLine("4k bit " + Mode4k);
if (Mode4k == false)
//throw new Exception("4k bit is false! tell vec where you saw this happen pls!");
Console.WriteLine("4k bit is false! tell vec where you saw this happen pls!");
break;
case 2: // Name Table Base Address
TmsPatternNameTableBase = (Registers[2] << 10) & 0x3C00;
@ -147,7 +142,6 @@ namespace BizHawk.Emulation.Consoles.Coleco
StatusByte &= 0x1F;
Cpu.NonMaskableInterrupt = false;
//Console.WriteLine("Clear NMI / read status");
return returnValue;
}
@ -167,7 +161,10 @@ namespace BizHawk.Emulation.Consoles.Coleco
else if (Mode3Bit) TmsMode = 3;
else TmsMode = 0;
Console.WriteLine("video mode {0}", TmsMode);
if (TmsMode == 1)
throw new Exception("TMS video mode 1! please tell vecna which game uses this!");
if (TmsMode == 3)
throw new Exception("TMS video mode 3! please tell vecna which game uses this!");
}
void RenderScanline(int scanLine)

20
BizHawk.MultiClient/output/gamedb/gamedb_coleco.txt
View File

@ -1,4 +1,4 @@
sha1:B1621D39A2A6D1CDA7ECEB882A612A4BAF3DA70C 2010 - The Graphic Action Game (1984) (Coleco).col Coleco
sha1:B1621D39A2A6D1CDA7ECEB882A612A4BAF3DA70C 2010 - The Graphic Action Game (1984) (Coleco).col Coleco NoSkip
sha1:9EF2974A04F5982BD034F39D1741666B6D117D24 Adam's Musicbox Demo (1987) (Coleco).col Coleco
sha1:EAB0CB4C8B2459342D5D3EFDED14E0F1D2E35145 Adventurium3 Demo (2000) (PD).col Coleco
sha1:B3F191439440E9682183E703F9018F29FD1355F0 Air Battle V0.4 by Daniel Bienvenu (July 10) (2000) (PD).col Coleco
@ -42,8 +42,8 @@ sha1:6DCF2F3ACC4B221666DEFC6EBBC09286238E7A1B Cabbage Patch Kids - Adventure in
sha1:8ED72BCBEB4858EF8AA3C219234F1865622C1F01 Cabbage Patch Kids - Adventures in the Park (1983) (Proto).col Coleco
sha1:27E5FBB1DBACE06C6A48DBAF1142D374E704506A Cabbage Patch Kids Picture Show (1984).col Coleco
sha1:AC21FB23A4A4DDE1D850264572924AC0CF9849B9 Campaign '84 (1983) (Sunrise).col Coleco
sha1:41E08352DF00D4EA4F8B52CE2A81CD0C1581CE93 Carnival (1982) [a1].col Coleco
sha1:B1B84B64D252EF145DD367FD393F477976CE7285 Carnival (1982).col Coleco
sha1:41E08352DF00D4EA4F8B52CE2A81CD0C1581CE93 Carnival (1982) [a1].col Coleco NoSkip
sha1:B1B84B64D252EF145DD367FD393F477976CE7285 Carnival (1982).col Coleco NoSkip
sha1:D89C49BBBF002E075C5964CA74D7C94A502740FF Centipede (1983) (Atarisoft).col Coleco
sha1:0029FE15165165E95DB2A5702CB162C770170637 Chateau du Dragon, Le by Daniel Bienvenu (2001) (PD).col Coleco
sha1:A90BCAC7DA24B518002971CAEC342FFDD43B2348 B Choplifter (1982-84) (Broderbund) [b1].col Coleco
@ -55,7 +55,7 @@ sha1:D4C5A513B0E94B5E8EF23086DA6A20C1DC0FA681 ColecoVision Noise Generator by M
sha1:796118B875CEEC83FC52AAA951F1F11E15600EDC Congo Bongo (1984).col Coleco
sha1:C8C2A70D3EAB8A68AB1DB04E766A6C70F02F02CA Cosmic Avenger (1982) (Universal) [a1].col Coleco
sha1:F31EBCB7429030AF0FCB651D172724F392CC6F87 Cosmic Avenger (1982) (Universal).col Coleco
sha1:EA9B79AC1B51F4337C2E2E24AD0D765D25E73FDE Cosmic Crisis (1983) (Bit Corp).col Coleco
sha1:EA9B79AC1B51F4337C2E2E24AD0D765D25E73FDE Cosmic Crisis (1983) (Bit Corp).col Coleco NoSkip
sha1:D9ADAAE3FF8DCE384C00790999F2FD1F9B29213E Cosmo Challenge by Marcel de Kogel (1997) (PD).col Coleco
sha1:91D986581B0928483F81186AA878441A53F63157 Cosmo Challenge-Trainer Menu by Marcel de Kogel (1997) (PD).col Coleco
sha1:E9F07B63332EA11B03ABCEE70536A05DB93C5942 Cosmo Fighter 2 by Marcel de Kogel (1996-97) (PD).col Coleco
@ -77,7 +77,7 @@ sha1:6F65BBE13F13A70AEE79CE7970095AEF280ABEAA Dance Fantasy (1984) (Fisher-Pric
sha1:5B35EE46585B2FF07EE8D730B519F12E58BDA5E7 Decathlon (1983) (Activision).col Coleco
sha1:B07F4D6747411D3DF5819735C7BF051F902CBF0F Defender (1983) (Atarisoft).col Coleco
sha1:BC1814053155D054203DACAE0B8158753AB27004 Demon2 Demo by Yannick Proulx (2001) (PD).col Coleco
sha1:35283C51F448D877625049266C0C4687BF57AB42 Destructor (1984) (Coleco).col Coleco
sha1:35283C51F448D877625049266C0C4687BF57AB42 Destructor (1984) (Coleco).col Coleco NoSkip;DrivingController
sha1:D74F3FA9231B26E68BA5CA38763291E1724474F4 O Dig Dug (1983) (Atarisoft) (Prototype) [o1].col Coleco
sha1:04BCE7D5EBD54F094D5F9F9B1880AE6507A5450D Dig Dug (1983) (Atarisoft) (Prototype).col Coleco
sha1:46B7AA1CEDAC273F2B96BAD4A0768554733972BF Donkey Kong (1982).col Coleco
@ -92,7 +92,7 @@ sha1:ACC3F1F3A7C129D736C3625667A3C1D942F12BBE Evolution (1983) (Sydney).col Col
sha1:490CE706697C0B370A6A2FE65CCAADA2BAC0A946 Facemaker (1983) (Spinnaker) [!].col Coleco
sha1:2CB0F3E63A6A0F754738D3306AE5FFE05AE6511D B Facemaker (1983) (Spinnaker) [b1].col Coleco
sha1:4158A3296DCD876B1EA5B1DD8B236A8B6F2F5304 Fall Guy (1983) (20th Century Fox) (Prototype).col Coleco
sha1:3F5F92DEC13860BD1EB56CF77FBE3556246291C4 Fathom (1983) (Imagic).col Coleco
sha1:3F5F92DEC13860BD1EB56CF77FBE3556246291C4 Fathom (1983) (Imagic).col Coleco NoSkip
sha1:D28F866A931FB8B8C82509F3A563C4452302857A Final Test Cartridge (19xx).col Coleco
sha1:3B5823BD966E042DF81CF42DC07AEF990E41FD88 Flipper Slipper (1983) (Spectravideo).col Coleco
sha1:DD3461F5B79FE581B8E14685A5B8810B18D84DFE Fortune Builder (1984) (Circuits and Systems).col Coleco
@ -130,8 +130,8 @@ sha1:16F08D667334332A69CC09762DEA5BB2A06AC82B Juke Box (1984) (Spinnaker).col C
sha1:B9C4B8A6D5921927BA200E1F4EFE0CAAF82802C5 Jumpman Junior (1984) (Epyx) [a1].col Coleco
sha1:B79D4312E2D5FC30E37EE46916DC31908C84590E Jumpman Junior (1984) (Epyx).col Coleco
sha1:D41BEC8F571F3250668BB1CEC5DC0BF7DE74BB7D Jungle Hunt (1983) (Atarisoft).col Coleco
sha1:35030BD17EF2BCCFC1D4117650B039D4996E7D18 B Ken Uston's Blackjack-Poker (1983) [b1].col Coleco
sha1:282C8B5186A7DBBB69B4B7DACD2095E1EAA5B4CD Ken Uston's Blackjack-Poker (1983).col Coleco
sha1:35030BD17EF2BCCFC1D4117650B039D4996E7D18 B Ken Uston's Blackjack-Poker (1983) [b1].col Coleco NoSkip
sha1:282C8B5186A7DBBB69B4B7DACD2095E1EAA5B4CD Ken Uston's Blackjack-Poker (1983).col Coleco NoSkip
sha1:2C9491B998AB3C27DD1191405FD57B4A15DE1AB8 Kevtris by Kevin Horton (1996) (PD) [a1].col Coleco
sha1:5DE3BD9B7234A0EEA7551DDBEDD7F55CD47AA9F7 Kevtris by Kevin Horton (1996) (PD).col Coleco
sha1:77CD01E29071DECE70D18CF9E7E2D2CE455D001F Keystone Kapers (1983-84) (Activision).col Coleco
@ -164,8 +164,8 @@ sha1:FAA3301B9758C5C4A218B7CE1CBB760C26DAEE10 Mountain King (1983-84) (Sunrise)
sha1:46602DF46117513D7166EBA81E2E3546246ADF94 Mountain King (1983-84) (Sunrise) [a1].col Coleco
sha1:BDE8F3E4BE86D175B544225B129B9BD41DCE0D78 Mousetrap (1982) (Exidy) [o1].col Coleco
sha1:36686B5F84C8ECFE9E6468CA0F2402CE0C03150C Mousetrap (1982) (Exidy).col Coleco
sha1:EE98A2307E280D1C9B644AE9CE4AAA1EF954189F Mr. Do! (1983) (Universal) [a1].col Coleco
sha1:D40A69F4D010636DE50FDC1D43A0682141286CBD Mr. Do! (1983) (Universal).col Coleco
sha1:EE98A2307E280D1C9B644AE9CE4AAA1EF954189F Mr. Do! (1983) (Universal) [a1].col Coleco NoSkip
sha1:D40A69F4D010636DE50FDC1D43A0682141286CBD Mr. Do! (1983) (Universal).col Coleco NoSkip
sha1:E94E5D8DD549CAE8B70D02170502ECA4E90A3C30 B Mr. Do's Castle (1983) (Parker Bros) [b1].col Coleco
sha1:E2AE664CE84F59CD904DE49FED68657E7278D501 Mr. Do's Castle (1983) (Parker Bros).col Coleco
sha1:891444B0F3D311CE09C6553027BDAB39A95839DD Ms. Space Fury (Digital Press) (2001).col Coleco