6502
/
EightBitNet
mirror of https://github.com/MoleskiCoder/EightBitNet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fuse fixes: Correct bus read/write order of XHTL 

Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2019-08-15 14:31:23 +01:00
parent 84284d62b5
commit e35dabd130
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Intel8080/Intel8080.cs
View File

@ -513,7 +513,7 @@ namespace EightBit
this.Tick(11);
break;
case 4: // EX (SP),HL
this.XHTL();
this.XHTL(this.HL);
this.Tick(19);
break;
case 5: // EX DE,HL
@ -809,15 +809,18 @@ namespace EightBit
private void CMC() => this.F = ClearBit(this.F, StatusBits.CF, this.F & (byte)StatusBits.CF);
private void XHTL()
private void XHTL(Register16 exchange)
{
this.MEMPTR.Low = this.BusRead(this.SP);
this.BusWrite(this.L);
this.L = this.MEMPTR.Low;
this.MEMPTR.Low = this.BusRead(this.SP.Word);
++this.Bus.Address.Word;
this.MEMPTR.High = this.BusRead();
this.BusWrite(this.H);
this.H = this.MEMPTR.High;
this.Bus.Data = exchange.High;
this.BusWrite();
exchange.High = this.MEMPTR.High;
--this.Bus.Address.Word;
this.Bus.Data = exchange.Low;
this.BusWrite();
exchange.Low = this.MEMPTR.Low;
}
private void WritePort(byte port)

19
Z80/Z80.cs
View File

@ -1269,7 +1269,7 @@ namespace EightBit
this.Tick(11);
break;
case 4: // EX (SP),HL
this.XHTL();
this.XHTL(this.HL2());
this.Tick(19);
break;
case 5: // EX DE,HL
@ -1788,19 +1788,18 @@ namespace EightBit
this.F = AdjustXY(this.F, this.A = (byte)~this.A);
}
private void XHTL()
private void XHTL(Register16 exchange)
{
var hl2 = this.HL2();
this.Bus.Address.Word = this.SP.Word;
this.MEMPTR.Low = this.BusRead();
this.Bus.Data = hl2.Low;
this.BusWrite();
hl2.Low = this.MEMPTR.Low;
this.MEMPTR.Low = this.BusRead(this.SP.Word);
++this.Bus.Address.Word;
this.MEMPTR.High = this.BusRead();
this.Bus.Data = hl2.High;
this.Bus.Data = exchange.High;
this.BusWrite();
hl2.High = this.MEMPTR.High;
exchange.High = this.MEMPTR.High;
--this.Bus.Address.Word;
this.Bus.Data = exchange.Low;
this.BusWrite();
exchange.Low = this.MEMPTR.Low;
}
private void BlockCompare(ushort source, ushort counter)