Changeset 8

Timestamp:

Apr 19, 2026, 9:00:16 PM (7 days ago)

Author:

chronos

Message:

• Modified: Implemented more instructions.
• Added: Hardware emulation of 8255 and 8253 chips.

Location:

trunk

Files:

• I8253.pas (added)
• I8255.pas (added)
• SharpMz800.pas (modified) (7 diffs)
• Z80/Z80.pas (modified) (57 diffs)
• mzxemu.lpi (modified) (1 diff)
• mzxemu.lpr (modified) (1 diff)

trunk/SharpMz800.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Z80, Memory, Base;
+  Classes, SysUtils, Z80, Memory, Base, I8255, I8253;
 
 type
@@ -38 +38 @@
     MappedMemory: TMemoryMapped;
     MappedIO: TMemoryIO;
+    I8255: T8255;
+    I8253: T8253;
     procedure PowerOn;
     procedure PowerOff;
@@ -65 +67 @@
 begin
   Result := 0;
+  case Address of
+    $e0..$e6: Result := MemoryBankControl[Address - $e0];
+    $d0..$d3: Result := I8255.Read(Address - $d0);
+    $d4..$d7: Result := I8253.Read(Address - $d4);
+    else MesssageExecute('Unsupported I/O port read from ' + IntToHex(Address, 4));
+  end;
 end;
 
@@ -79 +87 @@
     end;
     $e0..$e6: MemoryBankControl[Address - $e0] := Data;
-    else MesssageExecute('Unsupported I/O port ' + IntToHex(Address, 4) + ' data ' + IntToHex(Data, 2));
+    $d0..$d3: I8255.Write(Address - $d0, Data);
+    $d4..$d7: I8253.Write(Address - $d4, Data);
+    else MesssageExecute('Unsupported I/O port write to ' + IntToHex(Address, 4) + ' data ' + IntToHex(Data, 2));
   end;
 end;
@@ -97 +107 @@
       VideoRam.Size := $1000;
       MappedMemory.Areas.AddNew($e000, MappedIO);
-      MappedMemory.Areas.AddNew($e010, ExtendedRom);
+      MappedMemory.Areas.AddNew($e000, ExtendedRom);
     end;
     md800: begin
@@ -133 +143 @@
   Mode := md800;
   Resolution := rs320x200;
+  I8255 := T8255.Create;
+  I8253 := T8253.Create;
   Memory := TMemoryData.Create;
   Memory.Title := 'Main memory';
@@ -176 +188 @@
   FreeAndNil(Memory);
   FreeAndNil(MappedIO);
+  FreeAndNil(I8255);
+  FreeAndNil(I8253);
   inherited;
 end;

trunk/Z80/Z80.pas

@@ -48 +48 @@
     FThread: TCpuThread;
     Instruction: TInstruction;
+    InstructionAddress: Word;
     MessageText: string;
+    procedure Error(Message: string);
     procedure SetRunning(AValue: Boolean);
     function DoRead(Address: Word): Byte;
+    function DoReadWord(Address: Word): Word;
     procedure DoWrite(Address: Word; Data: Byte);
+    procedure DoWriteWord(Address: Word; Data: Word);
     function DoInput(Address: Word): Byte;
     procedure DoOutput(Address: Word; Data: Byte);
@@ -61 +65 @@
     function PopWord: Word;
     procedure Call(Address: Word);
+    procedure CallCond(Address: Word; Condition: Boolean);
     procedure Cp(Data: Byte);
     procedure Jr(Condition: Boolean);
     procedure Djnz;
     procedure Jp(Condition: Boolean);
-    //procedure Halt;
     procedure RetCond(Condition: Boolean);
     procedure NotImplemented;
+    procedure AddByte(var Target: Byte; Second: Byte);
+    procedure AddWord(var Target: Word; Second: Word);
+    procedure AdcByte(var Target: Byte; Second: Byte);
+    procedure AdcWord(var Target: Word; Second: Word);
+    procedure SubByte(var Target: Byte; Second: Byte);
+    procedure SbcByte(var Target: Byte; Second: Byte);
+    procedure SbcWord(var Target: Word; Second: Word);
+    procedure XorByte(var Target: Byte; Second: Byte);
+    procedure OrByte(var Target: Byte; Second: Byte);
 
     // Instruction methods
@@ -777 +790 @@
     Carry: Boolean;
     Zero: Boolean;
+    ParityOverflow: Boolean;
+    SignNegative: Boolean;
     Memory: TMemory;
     Ticks: Cardinal;
@@ -818 +833 @@
 { TCpuZ80 }
 
+procedure TCpuZ80.Error(Message: string);
+begin
+  PC := InstructionAddress;
+  DoMessage(Message + ' on address ' + IntToHex(Word(PC), 4));
+  Halt;
+end;
+
 procedure TCpuZ80.SetRunning(AValue: Boolean);
 begin
@@ -841 +863 @@
 end;
 
+function TCpuZ80.DoReadWord(Address: Word): Word;
+begin
+  Result := DoRead(Address) or (DoRead(Address + 1) shl 8);
+end;
+
 procedure TCpuZ80.DoWrite(Address: Word; Data: Byte);
 begin
   if Assigned(FOnRead) then FOnWrite(Address, Data);
+end;
+
+procedure TCpuZ80.DoWriteWord(Address: Word; Data: Word);
+begin
+  DoWrite(Address, Data and $ff);
+  DoWrite(Address + 1, Data shr 8);
 end;
 
@@ -897 +930 @@
   PushWord(PC);
   PC := Address;
+end;
+
+procedure TCpuZ80.CallCond(Address: Word; Condition: Boolean);
+begin
+  if Condition then begin
+    PushWord(PC);
+    PC := Address;
+  end;
 end;
 
@@ -948 +989 @@
 procedure TCpuZ80.NotImplemented;
 begin
-  Dec(PC);
-  DoMessage('Not implemented instruction ' + IntToHex(Word(Instruction), 4) +
-    ' on address ' + IntToHex(Word(PC), 4));
-  Halt;
+  Error('Not implemented instruction ' + IntToHex(Word(Instruction), 4));
+end;
+
+procedure TCpuZ80.AddByte(var Target: Byte; Second: Byte);
+begin
+  Target := Target + Second;
+end;
+
+procedure TCpuZ80.AddWord(var Target: Word; Second: Word);
+begin
+  Target := Target + Second;
+end;
+
+procedure TCpuZ80.AdcByte(var Target: Byte; Second: Byte);
+begin
+  Target := Target + Second;
+end;
+
+procedure TCpuZ80.AdcWord(var Target: Word; Second: Word);
+begin
+  Target := Target - Second;
+end;
+
+procedure TCpuZ80.SubByte(var Target: Byte; Second: Byte);
+begin
+  Target := Target - Second;
+end;
+
+procedure TCpuZ80.SbcByte(var Target: Byte; Second: Byte);
+begin
+  Target := Target - Second;
+end;
+
+procedure TCpuZ80.SbcWord(var Target: Word; Second: Word);
+begin
+  Target := Target - Second;
+end;
+
+procedure TCpuZ80.XorByte(var Target: Byte; Second: Byte);
+begin
+  Target := Target xor Second;
+end;
+
+procedure TCpuZ80.OrByte(var Target: Byte; Second: Byte);
+begin
+  Target := Target or Second;
 end;
 
@@ -1656 +1739 @@
 procedure TCpuZ80.NOP;
 begin
-  // No opearation
+  // No operation
 end;
 
@@ -1707 +1790 @@
 procedure TCpuZ80.LD_A_BC_Indirect;
 begin
-  NotImplemented;
+  A := DoRead(BC.Value);
 end;
 
 procedure TCpuZ80.DEC_BC;
 begin
-  NotImplemented;
+  Dec(BC.Value);
 end;
 
 procedure TCpuZ80.INC_C;
 begin
-  NotImplemented;
+  Inc(BC.C);
 end;
 
 procedure TCpuZ80.DEC_C;
 begin
-  NotImplemented;
+  Dec(BC.C);
 end;
 
 procedure TCpuZ80.LD_C_N;
 begin
-  NotImplemented;
+  BC.C := ReadByte;
 end;
 
@@ -1747 +1830 @@
 procedure TCpuZ80.LD_DE_Indirect_A;
 begin
-  NotImplemented;
+  DoWrite(DE.Value, A);
 end;
 
 procedure TCpuZ80.INC_DE;
 begin
-  NotImplemented;
+  Inc(DE.Value);
 end;
 
 procedure TCpuZ80.INC_D;
 begin
-  NotImplemented;
+  Inc(DE.D);
 end;
 
 procedure TCpuZ80.DEC_D;
 begin
-  NotImplemented;
+  Dec(DE.D);
 end;
 
 procedure TCpuZ80.LD_D_N;
 begin
-  NotImplemented;
+  DE.D := ReadByte;
 end;
 
@@ -1782 +1865 @@
 procedure TCpuZ80.ADD_HL_DE;
 begin
-  NotImplemented;
+  AddWord(HL.Value, DE.Value);
 end;
 
 procedure TCpuZ80.LD_A_DE_Indirect;
 begin
-  NotImplemented;
+  A := DoRead(DE.Value);
 end;
 
 procedure TCpuZ80.DEC_DE;
 begin
-  NotImplemented;
+  Dec(DE.Value);
 end;
 
 procedure TCpuZ80.INC_E;
 begin
-  NotImplemented;
+  Inc(DE.E);
 end;
 
 procedure TCpuZ80.DEC_E;
 begin
-  NotImplemented;
+  Dec(DE.E);
 end;
 
 procedure TCpuZ80.LD_E_N;
 begin
-  NotImplemented;
+  DE.E := ReadByte;
 end;
 
@@ -1827 +1910 @@
 procedure TCpuZ80.LD_NN_Indirect_HL;
 begin
-  NotImplemented;
+  DoWrite(ReadWord, HL.Value);
 end;
 
@@ -1837 +1920 @@
 procedure TCpuZ80.INC_H;
 begin
-  NotImplemented;
+  Inc(HL.H);
 end;
 
 procedure TCpuZ80.DEC_H;
 begin
-  NotImplemented;
+  Dec(HL.H);
 end;
 
 procedure TCpuZ80.LD_H_N;
 begin
-  NotImplemented;
+  HL.H := ReadByte;
 end;
 
@@ -1857 +1940 @@
 procedure TCpuZ80.JR_Z_D;
 begin
-  NotImplemented;
+  Jr(Zero);
 end;
 
 procedure TCpuZ80.ADD_HL_HL;
 begin
-  NotImplemented;
+  AddWord(Hl.Value, HL.Value);
 end;
 
 procedure TCpuZ80.LD_HL_NN_Indirect;
 begin
-  NotImplemented;
+  HL.Value := DoRead(ReadWord);
 end;
 
@@ -1877 +1960 @@
 procedure TCpuZ80.INC_L;
 begin
-  NotImplemented;
+  Inc(HL.L);
 end;
 
 procedure TCpuZ80.DEC_L;
 begin
-  NotImplemented;
+  Dec(HL.L);
 end;
 
 procedure TCpuZ80.LD_L_N;
 begin
-  NotImplemented;
+  HL.L := ReadByte;
 end;
 
@@ -1912 +1995 @@
 procedure TCpuZ80.INC_SP;
 begin
-  NotImplemented;
+  Inc(SP);
 end;
 
 procedure TCpuZ80.INC_HL_Indirect;
 begin
-  NotImplemented;
+  DoWrite(HL.Value, DoRead(HL.Value) + 1);
 end;
 
 procedure TCpuZ80.DEC_HL_Indirect;
 begin
-  NotImplemented;
+  DoWrite(HL.Value, DoRead(HL.Value) - 1);
 end;
 
@@ -1937 +2020 @@
 procedure TCpuZ80.JR_C_D;
 begin
-  NotImplemented;
+  Jr(Carry);
 end;
 
 procedure TCpuZ80.ADD_HL_SP;
 begin
-  NotImplemented;
+  AddWord(HL.Value, SP);
 end;
 
@@ -1952 +2035 @@
 procedure TCpuZ80.DEC_SP;
 begin
-  NotImplemented;
+  Dec(SP);
 end;
 
 procedure TCpuZ80.INC_A;
 begin
-  NotImplemented;
+  Inc(A);
 end;
 
 procedure TCpuZ80.DEC_A;
 begin
-  NotImplemented;
+  Dec(A);
 end;
 
@@ -1972 +2055 @@
 procedure TCpuZ80.CCF;
 begin
-  NotImplemented;
+  Carry := not Carry;
 end;
 
 procedure TCpuZ80.LD_B_B;
 begin
-  NotImplemented;
+  BC.B := BC.B;
 end;
 
 procedure TCpuZ80.LD_B_C;
 begin
-  NotImplemented;
+  BC.B := BC.C;
 end;
 
 procedure TCpuZ80.LD_B_D;
 begin
-  NotImplemented;
+  BC.B := DE.D;
 end;
 
 procedure TCpuZ80.LD_B_E;
 begin
-  NotImplemented;
+  BC.B := DE.E;
 end;
 
 procedure TCpuZ80.LD_B_H;
 begin
-  NotImplemented;
+  BC.B := HL.H;
 end;
 
 procedure TCpuZ80.LD_B_L;
 begin
-  NotImplemented;
+  BC.B := HL.L;
 end;
 
 procedure TCpuZ80.LD_B_HL_Indirect;
 begin
-  NotImplemented;
+  BC.B := DoRead(HL.Value);
 end;
 
@@ -2017 +2100 @@
 procedure TCpuZ80.LD_C_B;
 begin
-  NotImplemented;
+  BC.C := BC.B;
 end;
 
 procedure TCpuZ80.LD_C_C;
 begin
-  NotImplemented;
+  BC.C := BC.C;
 end;
 
 procedure TCpuZ80.LD_C_D;
 begin
-  NotImplemented;
+  BC.C := DE.D;
 end;
 
 procedure TCpuZ80.LD_C_E;
 begin
-  NotImplemented;
+  BC.C := DE.E;
 end;
 
 procedure TCpuZ80.LD_C_H;
 begin
-  NotImplemented;
+  BC.C := HL.H;
 end;
 
 procedure TCpuZ80.LD_C_L;
 begin
-  NotImplemented;
+  BC.C := HL.L;
 end;
 
@@ -2057 +2140 @@
 procedure TCpuZ80.LD_D_B;
 begin
-  NotImplemented;
+  DE.D := BC.B;
 end;
 
 procedure TCpuZ80.LD_D_C;
 begin
-  NotImplemented;
+  DE.D := BC.C;
 end;
 
 procedure TCpuZ80.LD_D_D;
 begin
-  NotImplemented;
+  DE.D := DE.D;
 end;
 
 procedure TCpuZ80.LD_D_E;
 begin
-  NotImplemented;
+  DE.D := DE.E;
 end;
 
 procedure TCpuZ80.LD_D_H;
 begin
-  NotImplemented;
+  DE.D := HL.H;
 end;
 
 procedure TCpuZ80.LD_D_L;
 begin
-  NotImplemented;
+  DE.D := HL.L;
 end;
 
 procedure TCpuZ80.LD_D_HL_Indirect;
 begin
-  NotImplemented;
+  DE.D := DoRead(HL.Value);
 end;
 
 procedure TCpuZ80.LD_D_A;
 begin
-  NotImplemented;
+  DE.D := A;
 end;
 
 procedure TCpuZ80.LD_E_B;
 begin
-  NotImplemented;
+  DE.E := BC.B;
 end;
 
 procedure TCpuZ80.LD_E_C;
 begin
-  NotImplemented;
+  DE.E := BC.C;
 end;
 
 procedure TCpuZ80.LD_E_D;
 begin
-  NotImplemented;
+  DE.E := DE.D;
 end;
 
 procedure TCpuZ80.LD_E_E;
 begin
-  NotImplemented;
+  DE.E := DE.E;
 end;
 
 procedure TCpuZ80.LD_E_H;
 begin
-  NotImplemented;
+  DE.E := HL.H;
 end;
 
 procedure TCpuZ80.LD_E_L;
 begin
-  NotImplemented;
+  DE.E := HL.L;
 end;
 
 procedure TCpuZ80.LD_E_HL_Indirect;
 begin
-  NotImplemented;
+  DE.E := DoRead(HL.Value);
 end;
 
 procedure TCpuZ80.LD_E_A;
 begin
-  NotImplemented;
+  DE.E := A;
 end;
 
@@ -2142 +2225 @@
 procedure TCpuZ80.LD_H_C;
 begin
-  NotImplemented;
+  HL.H := BC.C;
 end;
 
 procedure TCpuZ80.LD_H_D;
 begin
-  NotImplemented;
+  HL.H := DE.D;
 end;
 
 procedure TCpuZ80.LD_H_E;
 begin
-  NotImplemented;
+  HL.H := DE.E;
 end;
 
 procedure TCpuZ80.LD_H_H;
 begin
-  NotImplemented;
+  HL.H := HL.H;
 end;
 
 procedure TCpuZ80.LD_H_L;
 begin
-  NotImplemented;
+  HL.H := HL.L;
 end;
 
 procedure TCpuZ80.LD_H_HL_Indirect;
 begin
-  NotImplemented;
+  HL.H := DoRead(HL.Value);
 end;
 
 procedure TCpuZ80.LD_H_A;
 begin
-  NotImplemented;
+  HL.H := A;
 end;
 
 procedure TCpuZ80.LD_L_B;
 begin
-  NotImplemented;
+  HL.L := BC.B;
 end;
 
@@ -2187 +2270 @@
 procedure TCpuZ80.LD_L_D;
 begin
-  NotImplemented;
+  HL.L := DE.D;
 end;
 
 procedure TCpuZ80.LD_L_E;
 begin
-  NotImplemented;
+  HL.L := DE.E;
 end;
 
 procedure TCpuZ80.LD_L_H;
 begin
-  NotImplemented;
+  HL.L := HL.H;
 end;
 
 procedure TCpuZ80.LD_L_L;
 begin
-  NotImplemented;
+  HL.L := HL.L;
 end;
 
 procedure TCpuZ80.LD_L_HL_Indirect;
 begin
-  NotImplemented;
+  HL.L := DoRead(HL.Value);
 end;
 
 procedure TCpuZ80.LD_L_A;
 begin
-  NotImplemented;
+  HL.L := A;
 end;
 
 procedure TCpuZ80.LD_HL_Indirect_B;
 begin
-  NotImplemented;
+  DoWrite(HL.Value, BC.B);
 end;
 
 procedure TCpuZ80.LD_HL_Indirect_C;
 begin
-  NotImplemented;
+  DoWrite(HL.Value, BC.C);
 end;
 
@@ -2237 +2320 @@
 procedure TCpuZ80.LD_HL_Indirect_H;
 begin
-  NotImplemented;
+  DoWrite(HL.Value, HL.H);
 end;
 
 procedure TCpuZ80.LD_HL_Indirect_L;
 begin
-  NotImplemented;
+  DoWrite(HL.Value, HL.L);
 end;
 
@@ -2252 +2335 @@
 procedure TCpuZ80.LD_HL_Indirect_A;
 begin
-  NotImplemented;
+  DoWrite(HL.Value, A);
 end;
 
 procedure TCpuZ80.LD_A_B;
 begin
-  NotImplemented;
+  A := BC.B;
 end;
 
@@ -2267 +2350 @@
 procedure TCpuZ80.LD_A_D;
 begin
-  NotImplemented;
+  A := DE.D;
 end;
 
 procedure TCpuZ80.LD_A_E;
 begin
-  NotImplemented;
+  A := DE.E;
 end;
 
 procedure TCpuZ80.LD_A_H;
 begin
-  NotImplemented;
+  A := HL.H;
 end;
 
 procedure TCpuZ80.LD_A_L;
 begin
-  NotImplemented;
+  A := HL.L;
 end;
 
@@ -2292 +2375 @@
 procedure TCpuZ80.LD_A_A;
 begin
-  NotImplemented;
+  A := A;
 end;
 
 procedure TCpuZ80.ADD_A_B;
 begin
-  NotImplemented;
+  AddByte(A, BC.B);
 end;
 
 procedure TCpuZ80.ADD_A_C;
 begin
-  NotImplemented;
+  AddByte(A, BC.C);
 end;
 
 procedure TCpuZ80.ADD_A_D;
 begin
-  NotImplemented;
+  AddByte(A, DE.D);
 end;
 
 procedure TCpuZ80.ADD_A_E;
 begin
-  NotImplemented;
+  AddByte(A, DE.E);
 end;
 
 procedure TCpuZ80.ADD_A_H;
 begin
-  NotImplemented;
+  AddByte(A, HL.H);
 end;
 
 procedure TCpuZ80.ADD_A_L;
 begin
-  NotImplemented;
+  AddByte(A, HL.L);
 end;
 
 procedure TCpuZ80.ADD_A_HL_Indirect;
 begin
-  NotImplemented;
+  AddByte(A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.ADD_A_A;
 begin
-  NotImplemented;
+  AddByte(A, A);
 end;
 
 procedure TCpuZ80.ADC_A_B;
 begin
-  NotImplemented;
+  AdcByte(A, BC.B);
 end;
 
 procedure TCpuZ80.ADC_A_C;
 begin
-  NotImplemented;
+  AdcByte(A, BC.C);
 end;
 
 procedure TCpuZ80.ADC_A_D;
 begin
-  NotImplemented;
+  AdcByte(A, DE.D);
 end;
 
 procedure TCpuZ80.ADC_A_E;
 begin
-  NotImplemented;
+  AdcByte(A, DE.E);
 end;
 
 procedure TCpuZ80.ADC_A_H;
 begin
-  NotImplemented;
+  AdcByte(A, HL.H);
 end;
 
 procedure TCpuZ80.ADC_A_L;
 begin
-  NotImplemented;
+  AdcByte(A, HL.L);
 end;
 
 procedure TCpuZ80.ADC_A_HL_Indirect;
 begin
-  NotImplemented;
+  AdcByte(A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.ADC_A_A;
 begin
-  NotImplemented;
+  AdcByte(A, A);
 end;
 
 procedure TCpuZ80.SUB_B;
 begin
-  NotImplemented;
+  SubByte(A, BC.B);
 end;
 
 procedure TCpuZ80.SUB_C;
 begin
-  NotImplemented;
+  SubByte(A, BC.C);
 end;
 
 procedure TCpuZ80.SUB_D;
 begin
-  NotImplemented;
+  SubByte(A, DE.D);
 end;
 
 procedure TCpuZ80.SUB_E;
 begin
-  NotImplemented;
+  SubByte(A, DE.E);
 end;
 
 procedure TCpuZ80.SUB_H;
 begin
-  NotImplemented;
+  SubByte(A, HL.H);
 end;
 
 procedure TCpuZ80.SUB_L;
 begin
-  NotImplemented;
+  SubByte(A, HL.L);
 end;
 
 procedure TCpuZ80.SUB_HL_Indirect;
 begin
-  NotImplemented;
+  SubByte(A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.SUB_A;
 begin
-  NotImplemented;
+  SubByte(A, A);
 end;
 
 procedure TCpuZ80.SBC_A_B;
 begin
-  NotImplemented;
+  SbcByte(A, BC.B);
 end;
 
 procedure TCpuZ80.SBC_A_C;
 begin
-  NotImplemented;
+  SbcByte(A, BC.C);
 end;
 
 procedure TCpuZ80.SBC_A_D;
 begin
-  NotImplemented;
+  SbcByte(A, DE.D);
 end;
 
 procedure TCpuZ80.SBC_A_E;
 begin
-  NotImplemented;
+  SbcByte(A, DE.E);
 end;
 
 procedure TCpuZ80.SBC_A_H;
 begin
-  NotImplemented;
+  SbcByte(A, HL.H);
 end;
 
 procedure TCpuZ80.SBC_A_L;
 begin
-  NotImplemented;
+  SbcByte(A, HL.L);
 end;
 
 procedure TCpuZ80.SBC_A_HL_Indirect;
 begin
-  NotImplemented;
+  SbcByte(A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.SBC_A_A;
 begin
-  NotImplemented;
+  SbcByte(A, A);
 end;
 
@@ -2502 +2585 @@
 procedure TCpuZ80.XOR_C;
 begin
-  NotImplemented;
+  A := A xor BC.C;
 end;
 
 procedure TCpuZ80.XOR_D;
 begin
-  NotImplemented;
+  A := A xor DE.D;
 end;
 
 procedure TCpuZ80.XOR_E;
 begin
-  NotImplemented;
+  A := A xor DE.E;
 end;
 
 procedure TCpuZ80.XOR_H;
 begin
-  NotImplemented;
+  A := A xor HL.H;
 end;
 
 procedure TCpuZ80.XOR_L;
 begin
-  NotImplemented;
+  A := A xor HL.L;
 end;
 
 procedure TCpuZ80.XOR_HL_Indirect;
 begin
-  NotImplemented;
+  A := A xor DoRead(HL.Value);
 end;
 
@@ -2537 +2620 @@
 procedure TCpuZ80.OR_B;
 begin
-  NotImplemented;
+  A := A or BC.B;
 end;
 
 procedure TCpuZ80.OR_C;
 begin
-  NotImplemented;
+  A := A or BC.C;
 end;
 
 procedure TCpuZ80.OR_D;
 begin
-  NotImplemented;
+  A := A or DE.D;
 end;
 
 procedure TCpuZ80.OR_E;
 begin
-  NotImplemented;
+  A := A or DE.E;
 end;
 
 procedure TCpuZ80.OR_H;
 begin
-  NotImplemented;
+  A := A or HL.H;
 end;
 
 procedure TCpuZ80.OR_L;
 begin
-  NotImplemented;
+  A := A or HL.L;
 end;
 
 procedure TCpuZ80.OR_HL_Indirect;
 begin
-  NotImplemented;
+  A := A or DoRead(HL.Value);
 end;
 
@@ -2577 +2660 @@
 procedure TCpuZ80.CP_B;
 begin
-  NotImplemented;
+  Cp(BC.B);
 end;
 
 procedure TCpuZ80.CP_C;
 begin
-  NotImplemented;
+  Cp(BC.C);
 end;
 
@@ -2597 +2680 @@
 procedure TCpuZ80.CP_H;
 begin
-  NotImplemented;
+  Cp(HL.H);
 end;
 
 procedure TCpuZ80.CP_L;
 begin
-  NotImplemented;
+  Cp(HL.L);
 end;
 
 procedure TCpuZ80.CP_HL_Indirect;
 begin
-  NotImplemented;
+  CP(DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.CP_A;
 begin
-  NotImplemented;
+  CP(A);
 end;
 
 procedure TCpuZ80.RET_NZ;
 begin
-  NotImplemented;
+  RetCond(not Zero);
 end;
 
 procedure TCpuZ80.POP_BC;
 begin
-  NotImplemented;
+  BC.Value := PopWord;
 end;
 
@@ -2637 +2720 @@
 procedure TCpuZ80.CALL_NZ_NN;
 begin
-  NotImplemented;
+  CallCond(ReadWord, not Zero);
 end;
 
@@ -2647 +2730 @@
 procedure TCpuZ80.ADD_A_N;
 begin
-  NotImplemented;
+  AddByte(A, ReadByte);
 end;
 
@@ -2667 +2750 @@
 procedure TCpuZ80.JP_Z_NN;
 begin
-  NotImplemented;
+  Jp(Zero);
 end;
 
 procedure TCpuZ80.CALL_Z_NN;
 begin
-  NotImplemented;
+  CallCond(ReadWord, Zero);
 end;
 
@@ -2689 +2772 @@
 procedure TCpuZ80.ADC_A_N;
 begin
-  NotImplemented;
+  AdcByte(A, ReadByte);
 end;
 
@@ -2699 +2782 @@
 procedure TCpuZ80.RET_NC;
 begin
-  NotImplemented;
+  RetCond(not Carry);
 end;
 
 procedure TCpuZ80.POP_DE;
 begin
-  NotImplemented;
+  DE.Value := PopWord;
 end;
 
 procedure TCpuZ80.JP_NC_NN;
 begin
-  NotImplemented;
+  Jp(not Carry);
 end;
 
@@ -2719 +2802 @@
 procedure TCpuZ80.CALL_NC_NN;
 begin
-  NotImplemented;
+  CallCond(ReadWord, not Carry);
 end;
 
@@ -2729 +2812 @@
 procedure TCpuZ80.SUB_N;
 begin
-  NotImplemented;
+  SubByte(A, ReadByte);
 end;
 
@@ -2739 +2822 @@
 procedure TCpuZ80.RET_C;
 begin
-  NotImplemented;
+  RetCond(Carry);
 end;
 
@@ -2749 +2832 @@
 procedure TCpuZ80.JP_C_NN;
 begin
-  NotImplemented;
+  Jp(Carry);
 end;
 
@@ -2759 +2842 @@
 procedure TCpuZ80.CALL_C_NN;
 begin
-  NotImplemented;
+  CallCond(ReadWord, Carry);
 end;
 
 procedure TCpuZ80.SBC_A_N;
 begin
-  NotImplemented;
+  SbcByte(A, ReadByte);
 end;
 
@@ -2774 +2857 @@
 procedure TCpuZ80.RET_PO;
 begin
-  NotImplemented;
+  RetCond(not ParityOverflow);
 end;
 
 procedure TCpuZ80.POP_HL;
 begin
-  NotImplemented;
+  HL.Value := PopWord;
 end;
 
@@ -2819 +2902 @@
 procedure TCpuZ80.JP_HL_Indirect;
 begin
-  NotImplemented;
+  PC := DoRead(HL.Value);
 end;
 
@@ -2843 +2926 @@
 procedure TCpuZ80.XOR_N;
 begin
-  NotImplemented;
+  XorByte(A, ReadByte);
 end;
 
@@ -2858 +2941 @@
 procedure TCpuZ80.POP_AF;
 begin
-  NotImplemented;
+  A := PopWord and $ff;
 end;
 
@@ -2883 +2966 @@
 procedure TCpuZ80.OR_N;
 begin
-  NotImplemented;
+  OrByte(A, ReadByte);
 end;
 
@@ -2898 +2981 @@
 procedure TCpuZ80.LD_SP_HL;
 begin
-  NotImplemented;
+  SP := HL.Value;
 end;
 
@@ -2928 +3011 @@
 procedure TCpuZ80.IN_B_C_Indirect;
 begin
-  NotImplemented;
+  BC.B := DoInput(BC.Value);
 end;
 
 procedure TCpuZ80.OUT_C_Indirect_B;
 begin
-  NotImplemented;
+  BC.C := DoInput(BC.Value);
 end;
 
 procedure TCpuZ80.SBC_HL_BC;
 begin
-  NotImplemented;
+  SbcWord(HL.Value, BC.Value);
 end;
 
 procedure TCpuZ80.LD_NN_Indirect_BC;
 begin
-  NotImplemented;
+  DoWrite(ReadWord, BC.Value);
 end;
 
@@ -2953 +3036 @@
 procedure TCpuZ80.RETN;
 begin
-  NotImplemented;
+  InterruptEnabled := False;
+  PC := PopWord;
 end;
 
 procedure TCpuZ80.IM_0;
 begin
-  NotImplemented;
+  InterruptMode := 0;
 end;
 
@@ -2988 +3072 @@
 procedure TCpuZ80.RETI;
 begin
-  NotImplemented;
+  InterruptEnabled := False;
+  PC := PopWord;
 end;
 
@@ -3003 +3088 @@
 procedure TCpuZ80.OUT_C_Indirect_D;
 begin
-  NotImplemented;
+  DoOutput(BC.Value, DE.D);
 end;
 
 procedure TCpuZ80.SBC_HL_DE;
 begin
-  HL.Value := HL.Value - DE.Value;
+  SbcWord(HL.Value, DE.Value);
 end;
 
 procedure TCpuZ80.LD_NN_Indirect_DE;
 begin
-  NotImplemented;
+  DoWriteWord(ReadWord, DE.Value);
 end;
 
@@ -3028 +3113 @@
 procedure TCpuZ80.IN_E_C_Indirect;
 begin
-  NotImplemented;
+  DE.E := DoInput(BC.Value);
 end;
 
 procedure TCpuZ80.OUT_C_Indirect_E;
 begin
-  NotImplemented;
+  DoOutput(BC.Value, DE.E);
 end;
 
 procedure TCpuZ80.ADC_HL_DE;
 begin
-  NotImplemented;
+  AdcWord(HL.Value, DE.Value);
 end;
 
 procedure TCpuZ80.LD_DE_NN_Indirect;
 begin
-  NotImplemented;
+  DE.Value := DoReadWord(ReadWord);
 end;
 
 procedure TCpuZ80.IM_2;
 begin
-  NotImplemented;
+  InterruptMode := 2;
 end;
 
@@ -3058 +3143 @@
 procedure TCpuZ80.IN_H_C_Indirect;
 begin
-  NotImplemented;
+  HL.H := DoInput(BC.Value);
 end;
 
 procedure TCpuZ80.OUT_C_Indirect_H;
 begin
-  NotImplemented;
+  DoOutput(BC.Value, HL.H);
 end;
 
 procedure TCpuZ80.SBC_HL_HL;
 begin
-  NotImplemented;
+  SbcWord(HL.Value, HL.Value);
 end;
 
@@ -3078 +3163 @@
 procedure TCpuZ80.IN_L_C_Indirect;
 begin
-  NotImplemented;
+  HL.L := DoInput(BC.Value);
 end;
 
 procedure TCpuZ80.OUT_C_Indirect_L;
 begin
-  NotImplemented;
+  DoOutput(BC.Value, HL.L);
 end;
 
 procedure TCpuZ80.ADC_HL_HL;
 begin
-  NotImplemented;
+  AdcWord(HL.Value, HL.Value);
 end;
 
@@ -3098 +3183 @@
 procedure TCpuZ80.SBC_HL_SP;
 begin
-  NotImplemented;
+  SbcWord(HL.Value, SP);
 end;
 
 procedure TCpuZ80.LD_NN_Indirect_SP;
 begin
-  NotImplemented;
+  DoWriteWord(ReadWord, SP);
 end;
 
 procedure TCpuZ80.IN_A_C_Indirect;
 begin
-  NotImplemented;
+  A := DoInput(BC.Value);
 end;
 
 procedure TCpuZ80.OUT_C_Indirect_A;
 begin
-  NotImplemented;
+  DoOutput(BC.Value, A);
 end;
 
 procedure TCpuZ80.ADC_HL_SP;
 begin
-  NotImplemented;
+  AdcWord(Hl.Value, SP);
 end;
 
 procedure TCpuZ80.LD_SP_NN_Indirect;
 begin
-  NotImplemented;
+  SP := DoReadWord(ReadWord);
 end;
 
@@ -5151 +5236 @@
   Proc: TEvent;
 begin
+  InstructionAddress := PC;
   Opcode := ReadByte;
   if Opcode = $CB then begin
@@ -5169 +5255 @@
   if Assigned(Proc) then Proc
   else begin
-    Dec(PC);
-    DoMessage('Unsupported instruction ' + IntToHex(Word(Instruction), 4) +
-      ' on address ' + IntToHex(Word(PC), 4));
-    Halt;
+    Error('Unsupported instruction ' + IntToHex(Word(Instruction), 4));
   end;
   Ticks := Cardinal(Ticks + 1);

trunk/mzxemu.lpi

@@ -165 +165 @@
         <IsPartOfProject Value="True"/>
       </Unit>
+      <Unit>
+        <Filename Value="I8253.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="I8255.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
     </Units>
   </ProjectOptions>

trunk/mzxemu.lpr

@@ -13 +13 @@
   Forms, FormMain, FormMemory, FormDisassembler, Z80, SharpMz800, Memory, Core,
   Z80InstructionInfo, Z80Instructions, Disassembler, FormCpu, FormScreen,
-  FormGoToAddress, FormMessages, Base, InstructionSetGen;
+  FormGoToAddress, FormMessages, Base, InstructionSetGen, I8253, I8255;
 
 {$if declared(UseHeapTrace)}