Changeset 9 for trunk/Z80/Z80.pas

Timestamp:

Apr 19, 2026, 10:27:31 PM (7 days ago)

Author:

chronos

Message:

• Modified: More instructions implemented.

File:

• trunk/Z80/Z80.pas (modified) (54 diffs)

trunk/Z80/Z80.pas

@@ -14 +14 @@
     Cpu: TCpuZ80;
     procedure Execute; override;
+  end;
+
+  TRegAF = record
+    case Byte of
+      0: (F, A: Byte);
+      1: (Value: Word);
   end;
 
@@ -68 +74 @@
     procedure Cp(Data: Byte);
     procedure Jr(Condition: Boolean);
-    procedure Djnz;
     procedure Jp(Condition: Boolean);
     procedure RetCond(Condition: Boolean);
@@ -81 +86 @@
     procedure XorByte(var Target: Byte; Second: Byte);
     procedure OrByte(var Target: Byte; Second: Byte);
+    procedure AndByte(var Target: Byte; Second: Byte);
+    procedure IncByte(var Reg: Byte);
+    procedure IncWord(var Reg: Word);
+    procedure DecByte(var Reg: Byte);
+    procedure DecWord(var Reg: Word);
+    procedure RlcByte(var Data: Byte);
+    procedure RrcByte(var Data: Byte);
 
     // Instruction methods
@@ -782 +794 @@
     procedure InitInstructions;
   public
-    A: Byte;
     PC: Word;
     SP: Word;
+    AF: TRegAF;
     BC: TRegBC;
     DE: TRegDE;
     HL: TRegHL;
+    AF2: TRegAF;
+    BC2: TRegBC;
+    DE2: TRegDE;
+    HL2: TRegHL;
+    IX: Word;
+    IY: Word;
+    RegI: Byte;
+    RegR: Byte;
     Carry: Boolean;
     Zero: Boolean;
@@ -928 +948 @@
 procedure TCpuZ80.Call(Address: Word);
 begin
+  if DebugMode = dmStepOver then begin
+    DebugStopAddress := PC;
+    DebugMode := dmStopAddress;
+  end;
   PushWord(PC);
   PC := Address;
@@ -934 +958 @@
 procedure TCpuZ80.CallCond(Address: Word; Condition: Boolean);
 begin
+  if DebugMode = dmStepOver then begin
+    DebugStopAddress := PC;
+    DebugMode := dmStopAddress;
+  end;
   if Condition then begin
     PushWord(PC);
@@ -944 +972 @@
   TempByte: Byte;
 begin
-  Carry := Data > A;
-  TempByte := Byte(ShortInt(A) - ShortInt(Data));
+  Carry := Data > AF.A;
+  TempByte := Byte(ShortInt(AF.A) - ShortInt(Data));
   Zero := TempByte = 0;
 end;
@@ -955 +983 @@
   Temp := ShortInt(ReadByte);
   if Condition then
-    PC := PC + Temp;
-end;
-
-procedure TCpuZ80.Djnz;
-var
-  Temp: ShortInt;
-begin
-  Dec(BC.B);
-  Temp := ShortInt(ReadByte);
-  if BC.B <> 0 then
     PC := PC + Temp;
 end;
@@ -994 +1012 @@
 procedure TCpuZ80.AddByte(var Target: Byte; Second: Byte);
 begin
+  Target := Byte(Target + Second);
+end;
+
+procedure TCpuZ80.AddWord(var Target: Word; Second: Word);
+begin
+  Target := Word(Target + Second);
+end;
+
+procedure TCpuZ80.AdcByte(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
@@ -1014 +1032 @@
 procedure TCpuZ80.SubByte(var Target: Byte; Second: Byte);
 begin
+  Target := Byte(Target - Second);
+end;
+
+procedure TCpuZ80.SbcByte(var Target: Byte; Second: Byte);
+begin
   Target := Target - Second;
 end;
 
-procedure TCpuZ80.SbcByte(var Target: Byte; Second: Byte);
+procedure TCpuZ80.SbcWord(var Target: Word; Second: Word);
 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
@@ -1035 +1053 @@
 begin
   Target := Target or Second;
+end;
+
+procedure TCpuZ80.AndByte(var Target: Byte; Second: Byte);
+begin
+  Target := Target and Second;
+end;
+
+procedure TCpuZ80.IncByte(var Reg: Byte);
+begin
+  if Reg = High(Reg) then Reg := 0
+    else Inc(Reg);
+end;
+
+procedure TCpuZ80.IncWord(var Reg: Word);
+begin
+  if Reg = High(Reg) then Reg := 0
+    else Inc(Reg);
+end;
+
+procedure TCpuZ80.DecByte(var Reg: Byte);
+begin
+  if Reg = 0 then Reg := High(Reg)
+    else Dec(Reg)
+end;
+
+procedure TCpuZ80.DecWord(var Reg: Word);
+begin
+  if Reg = 0 then Reg := High(Reg)
+    else Dec(Reg)
+end;
+
+procedure TCpuZ80.RlcByte(var Data: Byte);
+begin
+  Carry := (Data and $80) <> 0;
+  Data := (Data shl 1) or Byte(Carry);
+end;
+
+procedure TCpuZ80.RrcByte(var Data: Byte);
+begin
+  Carry := (Data and 1) > 0;
+  Data := (Data shr 1) or ($80 * Byte(Carry));
 end;
 
@@ -1749 +1808 @@
 procedure TCpuZ80.LD_BC_Indirect_A;
 begin
-  DoWrite(BC.Value, A);
+  DoWrite(BC.Value, AF.A);
 end;
 
 procedure TCpuZ80.INC_BC;
 begin
-  Inc(BC.Value);
+  IncWord(BC.Value);
 end;
 
 procedure TCpuZ80.INC_B;
 begin
-  Inc(BC.B);
+  IncByte(BC.B);
 end;
 
 procedure TCpuZ80.DEC_B;
 begin
+  DecByte(BC.B);
+end;
+
+procedure TCpuZ80.LD_B_N;
+begin
+  BC.B := ReadByte;
+end;
+
+procedure TCpuZ80.RLCA;
+begin
+  RlcByte(AF.A);
+end;
+
+procedure TCpuZ80.EX_AF_AF_Pair;
+var
+  Temp: Word;
+begin
+  Temp := AF.Value;
+  AF2.Value := AF.Value;
+  AF.Value := Temp;
+end;
+
+procedure TCpuZ80.ADD_HL_BC;
+begin
+  AddWord(HL.Value, BC.Value);
+end;
+
+procedure TCpuZ80.LD_A_BC_Indirect;
+begin
+  AF.A := DoRead(BC.Value);
+end;
+
+procedure TCpuZ80.DEC_BC;
+begin
+  DecWord(BC.Value);
+end;
+
+procedure TCpuZ80.INC_C;
+begin
+  IncByte(BC.C);
+end;
+
+procedure TCpuZ80.DEC_C;
+begin
+  DecByte(BC.C);
+end;
+
+procedure TCpuZ80.LD_C_N;
+begin
+  BC.C := ReadByte;
+end;
+
+procedure TCpuZ80.RRCA;
+begin
+  RrcByte(AF.A);
+end;
+
+procedure TCpuZ80.DJNZ_D;
+var
+  Temp: ShortInt;
+begin
   Dec(BC.B);
-end;
-
-procedure TCpuZ80.LD_B_N;
-begin
-  BC.B := ReadByte;
-end;
-
-procedure TCpuZ80.RLCA;
-begin
-  Carry := (A and $80) <> 0;
-  A := A shl 1;
-end;
-
-procedure TCpuZ80.EX_AF_AF_Pair;
-begin
-  NotImplemented;
-end;
-
-procedure TCpuZ80.ADD_HL_BC;
-begin
-  HL.Value := HL.Value + BC.Value;
-end;
-
-procedure TCpuZ80.LD_A_BC_Indirect;
-begin
-  A := DoRead(BC.Value);
-end;
-
-procedure TCpuZ80.DEC_BC;
-begin
-  Dec(BC.Value);
-end;
-
-procedure TCpuZ80.INC_C;
-begin
-  Inc(BC.C);
-end;
-
-procedure TCpuZ80.DEC_C;
-begin
-  Dec(BC.C);
-end;
-
-procedure TCpuZ80.LD_C_N;
-begin
-  BC.C := ReadByte;
-end;
-
-procedure TCpuZ80.RRCA;
-begin
-  NotImplemented;
-end;
-
-procedure TCpuZ80.DJNZ_D;
-begin
-  Djnz;
+  Temp := ShortInt(ReadByte);
+  if BC.B <> 0 then
+    PC := PC + Temp;
 end;
 
@@ -1830 +1897 @@
 procedure TCpuZ80.LD_DE_Indirect_A;
 begin
-  DoWrite(DE.Value, A);
+  DoWrite(DE.Value, AF.A);
 end;
 
 procedure TCpuZ80.INC_DE;
 begin
-  Inc(DE.Value);
+  IncWord(DE.Value);
 end;
 
 procedure TCpuZ80.INC_D;
 begin
-  Inc(DE.D);
+  IncByte(DE.D);
 end;
 
 procedure TCpuZ80.DEC_D;
 begin
-  Dec(DE.D);
+  DecByte(DE.D);
 end;
 
@@ -1854 +1921 @@
 
 procedure TCpuZ80.RLA;
-begin
-  NotImplemented;
+var
+  NewCarry: Boolean;
+begin
+  NewCarry := (AF.A and $80) > 0;
+  AF.A := (AF.A shl 1) or Byte(Carry);
+  Carry := NewCarry;
 end;
 
@@ -1870 +1941 @@
 procedure TCpuZ80.LD_A_DE_Indirect;
 begin
-  A := DoRead(DE.Value);
+  AF.A := DoRead(DE.Value);
 end;
 
 procedure TCpuZ80.DEC_DE;
 begin
-  Dec(DE.Value);
+  DecWord(DE.Value);
 end;
 
 procedure TCpuZ80.INC_E;
 begin
-  Inc(DE.E);
+  IncByte(DE.E);
 end;
 
 procedure TCpuZ80.DEC_E;
 begin
-  Dec(DE.E);
+  DecByte(DE.E);
 end;
 
@@ -1894 +1965 @@
 
 procedure TCpuZ80.RRA;
-begin
-  NotImplemented;
+var
+  NewCarry: Boolean;
+begin
+  NewCarry := (AF.A and 1) > 0;
+  AF.A := (AF.A shr 1) or ($80 * Byte(Carry));
+  Carry := NewCarry;
 end;
 
@@ -1910 +1985 @@
 procedure TCpuZ80.LD_NN_Indirect_HL;
 begin
-  DoWrite(ReadWord, HL.Value);
+  DoWriteWord(ReadWord, HL.Value);
 end;
 
 procedure TCpuZ80.INC_HL;
 begin
-  Inc(HL.Value);
+  IncWord(HL.Value);
 end;
 
 procedure TCpuZ80.INC_H;
 begin
-  Inc(HL.H);
+  IncByte(HL.H);
 end;
 
 procedure TCpuZ80.DEC_H;
 begin
-  Dec(HL.H);
+  DecByte(HL.H);
 end;
 
@@ -1950 +2025 @@
 procedure TCpuZ80.LD_HL_NN_Indirect;
 begin
-  HL.Value := DoRead(ReadWord);
+  HL.Value := DoReadWord(ReadWord);
 end;
 
 procedure TCpuZ80.DEC_HL;
 begin
-  Dec(HL.Value);
+  DecWord(HL.Value);
 end;
 
 procedure TCpuZ80.INC_L;
 begin
-  Inc(HL.L);
+  IncByte(HL.L);
 end;
 
 procedure TCpuZ80.DEC_L;
 begin
-  Dec(HL.L);
+  DecByte(HL.L);
 end;
 
@@ -1975 +2050 @@
 procedure TCpuZ80.CPL;
 begin
-  NotImplemented;
+  AF.A := AF.A xor $ff;
 end;
 
@@ -1990 +2065 @@
 procedure TCpuZ80.LD_NN_Indirect_A;
 begin
-  DoWrite(ReadWord, A);
+  DoWrite(ReadWord, AF.A);
 end;
 
 procedure TCpuZ80.INC_SP;
 begin
-  Inc(SP);
+  IncWord(SP);
 end;
 
 procedure TCpuZ80.INC_HL_Indirect;
-begin
-  DoWrite(HL.Value, DoRead(HL.Value) + 1);
+var
+  Temp: Byte;
+begin
+  Temp := DoRead(HL.Value);
+  IncByte(Temp);
+  DoWrite(HL.Value, Temp);
 end;
 
 procedure TCpuZ80.DEC_HL_Indirect;
-begin
-  DoWrite(HL.Value, DoRead(HL.Value) - 1);
+var
+  Temp: Byte;
+begin
+  Temp := DoRead(HL.Value);
+  DecByte(Temp);
+  DoWrite(HL.Value, Temp);
 end;
 
@@ -2015 +2098 @@
 procedure TCpuZ80.SCF;
 begin
-  NotImplemented;
+  Carry := True;
 end;
 
@@ -2030 +2113 @@
 procedure TCpuZ80.LD_A_NN_Indirect;
 begin
-  A := DoRead(ReadWord);
+  AF.A := DoRead(ReadWord);
 end;
 
 procedure TCpuZ80.DEC_SP;
 begin
-  Dec(SP);
+  DecWord(SP);
 end;
 
 procedure TCpuZ80.INC_A;
 begin
-  Inc(A);
+  IncByte(AF.A);
 end;
 
 procedure TCpuZ80.DEC_A;
 begin
-  Dec(A);
+  DecByte(AF.A);
 end;
 
 procedure TCpuZ80.LD_A_N;
 begin
-  A := ReadByte;
+  AF.A := ReadByte;
 end;
 
@@ -2095 +2178 @@
 procedure TCpuZ80.LD_B_A;
 begin
-  BC.B := A;
+  BC.B := AF.A;
 end;
 
@@ -2135 +2218 @@
 procedure TCpuZ80.LD_C_A;
 begin
-  BC.C := A;
+  BC.C := AF.A;
 end;
 
@@ -2175 +2258 @@
 procedure TCpuZ80.LD_D_A;
 begin
-  DE.D := A;
+  DE.D := AF.A;
 end;
 
@@ -2215 +2298 @@
 procedure TCpuZ80.LD_E_A;
 begin
-  DE.E := A;
+  DE.E := AF.A;
 end;
 
@@ -2255 +2338 @@
 procedure TCpuZ80.LD_H_A;
 begin
-  HL.H := A;
+  HL.H := AF.A;
 end;
 
@@ -2295 +2378 @@
 procedure TCpuZ80.LD_L_A;
 begin
-  HL.L := A;
+  HL.L := AF.A;
 end;
 
@@ -2335 +2418 @@
 procedure TCpuZ80.LD_HL_Indirect_A;
 begin
-  DoWrite(HL.Value, A);
+  DoWrite(HL.Value, AF.A);
 end;
 
 procedure TCpuZ80.LD_A_B;
 begin
-  A := BC.B;
+  AF.A := BC.B;
 end;
 
 procedure TCpuZ80.LD_A_C;
 begin
-  A := BC.C;
+  AF.A := BC.C;
 end;
 
 procedure TCpuZ80.LD_A_D;
 begin
-  A := DE.D;
+  AF.A := DE.D;
 end;
 
 procedure TCpuZ80.LD_A_E;
 begin
-  A := DE.E;
+  AF.A := DE.E;
 end;
 
 procedure TCpuZ80.LD_A_H;
 begin
-  A := HL.H;
+  AF.A := HL.H;
 end;
 
 procedure TCpuZ80.LD_A_L;
 begin
-  A := HL.L;
+  AF.A := HL.L;
 end;
 
 procedure TCpuZ80.LD_A_HL_Indirect;
 begin
-  A := DoRead(HL.Value);
+  AF.A := DoRead(HL.Value);
 end;
 
 procedure TCpuZ80.LD_A_A;
 begin
-  A := A;
+  AF.A := AF.A;
 end;
 
 procedure TCpuZ80.ADD_A_B;
 begin
-  AddByte(A, BC.B);
+  AddByte(AF.A, BC.B);
 end;
 
 procedure TCpuZ80.ADD_A_C;
 begin
-  AddByte(A, BC.C);
+  AddByte(AF.A, BC.C);
 end;
 
 procedure TCpuZ80.ADD_A_D;
 begin
-  AddByte(A, DE.D);
+  AddByte(AF.A, DE.D);
 end;
 
 procedure TCpuZ80.ADD_A_E;
 begin
-  AddByte(A, DE.E);
+  AddByte(AF.A, DE.E);
 end;
 
 procedure TCpuZ80.ADD_A_H;
 begin
-  AddByte(A, HL.H);
+  AddByte(AF.A, HL.H);
 end;
 
 procedure TCpuZ80.ADD_A_L;
 begin
-  AddByte(A, HL.L);
+  AddByte(AF.A, HL.L);
 end;
 
 procedure TCpuZ80.ADD_A_HL_Indirect;
 begin
-  AddByte(A, DoRead(HL.Value));
+  AddByte(AF.A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.ADD_A_A;
 begin
-  AddByte(A, A);
+  AddByte(AF.A, AF.A);
 end;
 
 procedure TCpuZ80.ADC_A_B;
 begin
-  AdcByte(A, BC.B);
+  AdcByte(AF.A, BC.B);
 end;
 
 procedure TCpuZ80.ADC_A_C;
 begin
-  AdcByte(A, BC.C);
+  AdcByte(AF.A, BC.C);
 end;
 
 procedure TCpuZ80.ADC_A_D;
 begin
-  AdcByte(A, DE.D);
+  AdcByte(AF.A, DE.D);
 end;
 
 procedure TCpuZ80.ADC_A_E;
 begin
-  AdcByte(A, DE.E);
+  AdcByte(AF.A, DE.E);
 end;
 
 procedure TCpuZ80.ADC_A_H;
 begin
-  AdcByte(A, HL.H);
+  AdcByte(AF.A, HL.H);
 end;
 
 procedure TCpuZ80.ADC_A_L;
 begin
-  AdcByte(A, HL.L);
+  AdcByte(AF.A, HL.L);
 end;
 
 procedure TCpuZ80.ADC_A_HL_Indirect;
 begin
-  AdcByte(A, DoRead(HL.Value));
+  AdcByte(AF.A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.ADC_A_A;
 begin
-  AdcByte(A, A);
+  AdcByte(AF.A, AF.A);
 end;
 
 procedure TCpuZ80.SUB_B;
 begin
-  SubByte(A, BC.B);
+  SubByte(AF.A, BC.B);
 end;
 
 procedure TCpuZ80.SUB_C;
 begin
-  SubByte(A, BC.C);
+  SubByte(AF.A, BC.C);
 end;
 
 procedure TCpuZ80.SUB_D;
 begin
-  SubByte(A, DE.D);
+  SubByte(AF.A, DE.D);
 end;
 
 procedure TCpuZ80.SUB_E;
 begin
-  SubByte(A, DE.E);
+  SubByte(AF.A, DE.E);
 end;
 
 procedure TCpuZ80.SUB_H;
 begin
-  SubByte(A, HL.H);
+  SubByte(AF.A, HL.H);
 end;
 
 procedure TCpuZ80.SUB_L;
 begin
-  SubByte(A, HL.L);
+  SubByte(AF.A, HL.L);
 end;
 
 procedure TCpuZ80.SUB_HL_Indirect;
 begin
-  SubByte(A, DoRead(HL.Value));
+  SubByte(AF.A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.SUB_A;
 begin
-  SubByte(A, A);
+  SubByte(AF.A, AF.A);
 end;
 
 procedure TCpuZ80.SBC_A_B;
 begin
-  SbcByte(A, BC.B);
+  SbcByte(AF.A, BC.B);
 end;
 
 procedure TCpuZ80.SBC_A_C;
 begin
-  SbcByte(A, BC.C);
+  SbcByte(AF.A, BC.C);
 end;
 
 procedure TCpuZ80.SBC_A_D;
 begin
-  SbcByte(A, DE.D);
+  SbcByte(AF.A, DE.D);
 end;
 
 procedure TCpuZ80.SBC_A_E;
 begin
-  SbcByte(A, DE.E);
+  SbcByte(AF.A, DE.E);
 end;
 
 procedure TCpuZ80.SBC_A_H;
 begin
-  SbcByte(A, HL.H);
+  SbcByte(AF.A, HL.H);
 end;
 
 procedure TCpuZ80.SBC_A_L;
 begin
-  SbcByte(A, HL.L);
+  SbcByte(AF.A, HL.L);
 end;
 
 procedure TCpuZ80.SBC_A_HL_Indirect;
 begin
-  SbcByte(A, DoRead(HL.Value));
+  SbcByte(AF.A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.SBC_A_A;
 begin
-  SbcByte(A, A);
+  SbcByte(AF.A, AF.A);
 end;
 
 procedure TCpuZ80.AND_B;
 begin
-  NotImplemented;
+  AndByte(AF.A, BC.B);
 end;
 
 procedure TCpuZ80.AND_C;
 begin
-  NotImplemented;
+  AndByte(AF.A, BC.C);
 end;
 
 procedure TCpuZ80.AND_D;
 begin
-  NotImplemented;
+  AndByte(AF.A, DE.D);
 end;
 
 procedure TCpuZ80.AND_E;
 begin
-  NotImplemented;
+  AndByte(AF.A, DE.E);
 end;
 
 procedure TCpuZ80.AND_H;
 begin
-  NotImplemented;
+  AndByte(AF.A, HL.H);
 end;
 
 procedure TCpuZ80.AND_L;
 begin
-  NotImplemented;
+  AndByte(AF.A, HL.L);
 end;
 
 procedure TCpuZ80.AND_HL_Indirect;
 begin
-  NotImplemented;
+  AndByte(AF.A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.AND_A;
 begin
-  NotImplemented;
+  AndByte(AF.A, AF.A);
 end;
 
 procedure TCpuZ80.XOR_B;
 begin
-  A := A xor BC.B;
+  XorByte(AF.A, BC.B);
 end;
 
 procedure TCpuZ80.XOR_C;
 begin
-  A := A xor BC.C;
+  XorByte(AF.A, BC.C);
 end;
 
 procedure TCpuZ80.XOR_D;
 begin
-  A := A xor DE.D;
+  XorByte(AF.A, DE.D);
 end;
 
 procedure TCpuZ80.XOR_E;
 begin
-  A := A xor DE.E;
+  XorByte(AF.A, DE.E);
 end;
 
 procedure TCpuZ80.XOR_H;
 begin
-  A := A xor HL.H;
+  XorByte(AF.A, HL.H);
 end;
 
 procedure TCpuZ80.XOR_L;
 begin
-  A := A xor HL.L;
+  XorByte(AF.A, HL.L);
 end;
 
 procedure TCpuZ80.XOR_HL_Indirect;
 begin
-  A := A xor DoRead(HL.Value);
+  XorByte(AF.A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.XOR_A;
 begin
-  A := A xor A;
+  XorByte(AF.A, AF.A);
 end;
 
 procedure TCpuZ80.OR_B;
 begin
-  A := A or BC.B;
+  OrByte(AF.A, BC.B);
 end;
 
 procedure TCpuZ80.OR_C;
 begin
-  A := A or BC.C;
+  OrByte(AF.A, BC.C);
 end;
 
 procedure TCpuZ80.OR_D;
 begin
-  A := A or DE.D;
+  OrByte(AF.A, DE.D);
 end;
 
 procedure TCpuZ80.OR_E;
 begin
-  A := A or DE.E;
+  OrByte(AF.A, DE.E);
 end;
 
 procedure TCpuZ80.OR_H;
 begin
-  A := A or HL.H;
+  OrByte(AF.A, HL.H);
 end;
 
 procedure TCpuZ80.OR_L;
 begin
-  A := A or HL.L;
+  OrByte(AF.A, HL.L);
 end;
 
 procedure TCpuZ80.OR_HL_Indirect;
 begin
-  A := A or DoRead(HL.Value);
+  OrByte(AF.A, DoRead(HL.Value));
 end;
 
 procedure TCpuZ80.OR_A;
 begin
-  A := A or A;
+  OrByte(AF.A, AF.A);
 end;
 
@@ -2695 +2778 @@
 procedure TCpuZ80.CP_A;
 begin
-  CP(A);
+  CP(AF.A);
 end;
 
@@ -2730 +2813 @@
 procedure TCpuZ80.ADD_A_N;
 begin
-  AddByte(A, ReadByte);
+  AddByte(AF.A, ReadByte);
 end;
 
@@ -2759 +2842 @@
 
 procedure TCpuZ80.CALL_NN;
+begin
+  Call(ReadWord);
+end;
+
+procedure TCpuZ80.ADC_A_N;
+begin
+  AdcByte(AF.A, ReadByte);
+end;
+
+procedure TCpuZ80.RST_08H;
+begin
+  Call($08);
+end;
+
+procedure TCpuZ80.RET_NC;
+begin
+  RetCond(not Carry);
+end;
+
+procedure TCpuZ80.POP_DE;
+begin
+  DE.Value := PopWord;
+end;
+
+procedure TCpuZ80.JP_NC_NN;
+begin
+  Jp(not Carry);
+end;
+
+procedure TCpuZ80.OUT_N_Indirect_A;
+begin
+  DoOutput(ReadByte, AF.A);
+end;
+
+procedure TCpuZ80.CALL_NC_NN;
+begin
+  CallCond(ReadWord, not Carry);
+end;
+
+procedure TCpuZ80.PUSH_DE;
+begin
+  PushWord(DE.Value);
+end;
+
+procedure TCpuZ80.SUB_N;
+begin
+  SubByte(AF.A, ReadByte);
+end;
+
+procedure TCpuZ80.RST_10H;
+begin
+  Call($10);
+end;
+
+procedure TCpuZ80.RET_C;
+begin
+  RetCond(Carry);
+end;
+
+procedure TCpuZ80.EXX;
 var
-  TempWord: Word;
-begin
-  TempWord := ReadWord;
-  if DebugMode = dmStepOver then begin
-    DebugStopAddress := PC;
-    DebugMode := dmStopAddress;
-  end;
-  Call(TempWord);
-end;
-
-procedure TCpuZ80.ADC_A_N;
-begin
-  AdcByte(A, ReadByte);
-end;
-
-procedure TCpuZ80.RST_08H;
-begin
-  Call($08);
-end;
-
-procedure TCpuZ80.RET_NC;
-begin
-  RetCond(not Carry);
-end;
-
-procedure TCpuZ80.POP_DE;
-begin
-  DE.Value := PopWord;
-end;
-
-procedure TCpuZ80.JP_NC_NN;
-begin
-  Jp(not Carry);
-end;
-
-procedure TCpuZ80.OUT_N_Indirect_A;
-begin
-  DoOutput(ReadByte, A);
-end;
-
-procedure TCpuZ80.CALL_NC_NN;
-begin
-  CallCond(ReadWord, not Carry);
-end;
-
-procedure TCpuZ80.PUSH_DE;
-begin
-  PushWord(DE.Value);
-end;
-
-procedure TCpuZ80.SUB_N;
-begin
-  SubByte(A, ReadByte);
-end;
-
-procedure TCpuZ80.RST_10H;
-begin
-  Call($10);
-end;
-
-procedure TCpuZ80.RET_C;
-begin
-  RetCond(Carry);
-end;
-
-procedure TCpuZ80.EXX;
-begin
-  NotImplemented;
+  Temp: Word;
+begin
+  Temp := BC.Value;
+  BC.Value := BC2.Value;
+  BC2.Value := Temp;
+  Temp := DE.Value;
+  DE2.Value := DE2.Value;
+  DE2.Value := Temp;
+  Temp := HL.Value;
+  HL.Value := HL2.Value;
+  HL2.Value := Temp;
 end;
 
@@ -2837 +2923 @@
 procedure TCpuZ80.IN_A_N_Indirect;
 begin
-  NotImplemented;
+  AF.A := DoInput((AF.A shl 8) or ReadByte);
 end;
 
@@ -2847 +2933 @@
 procedure TCpuZ80.SBC_A_N;
 begin
-  SbcByte(A, ReadByte);
+  SbcByte(AF.A, ReadByte);
 end;
 
@@ -2867 +2953 @@
 procedure TCpuZ80.JP_PO_NN;
 begin
-  NotImplemented;
+  Jp(not ParityOverflow);
 end;
 
 procedure TCpuZ80.EX_SP_Indirect_HL;
-begin
-  NotImplemented;
+var
+  Temp: Word;
+begin
+  Temp := HL.Value;
+  HL.Value := DoReadWord(SP);
+  DoWriteWord(SP, Temp);
 end;
 
 procedure TCpuZ80.CALL_PO_NN;
 begin
-  NotImplemented;
+  CallCond(ReadWord, not ParityOverflow);
 end;
 
@@ -2887 +2977 @@
 procedure TCpuZ80.AND_N;
 begin
-  A := A and ReadByte;
+  AndByte(AF.A, ReadByte);
 end;
 
@@ -2897 +2987 @@
 procedure TCpuZ80.RET_PE;
 begin
-  NotImplemented;
+  RetCond(ParityOverflow);
 end;
 
@@ -2907 +2997 @@
 procedure TCpuZ80.JP_PE_NN;
 begin
-  NotImplemented;
+  Jp(ParityOverflow);
 end;
 
@@ -2921 +3011 @@
 procedure TCpuZ80.CALL_PE_NN;
 begin
-  NotImplemented;
+  CallCond(ReadWord, ParityOverflow);
 end;
 
 procedure TCpuZ80.XOR_N;
 begin
-  XorByte(A, ReadByte);
+  XorByte(AF.A, ReadByte);
 end;
 
@@ -2936 +3026 @@
 procedure TCpuZ80.RET_P;
 begin
-  NotImplemented;
+  RetCond(not SignNegative);
 end;
 
 procedure TCpuZ80.POP_AF;
 begin
-  A := PopWord and $ff;
+  AF.Value := PopWord;
 end;
 
 procedure TCpuZ80.JP_P_NN;
 begin
-  NotImplemented;
+  Jp(not SignNegative);
 end;
 
@@ -2956 +3046 @@
 procedure TCpuZ80.CALL_P_NN;
 begin
-  NotImplemented;
+  CallCond(ReadWord, not SignNegative);
 end;
 
 procedure TCpuZ80.PUSH_AF;
 begin
-  PushWord(A shl 8);
+  PushWord(AF.Value);
 end;
 
 procedure TCpuZ80.OR_N;
 begin
-  OrByte(A, ReadByte);
+  OrByte(AF.A, ReadByte);
 end;
 
@@ -2976 +3066 @@
 procedure TCpuZ80.RET_M;
 begin
-  NotImplemented;
+  RetCond(SignNegative);
 end;
 
@@ -2986 +3076 @@
 procedure TCpuZ80.JP_M_NN;
 begin
-  NotImplemented;
+  Jp(SignNegative);
 end;
 
@@ -2996 +3086 @@
 procedure TCpuZ80.CALL_M_NN;
 begin
-  NotImplemented;
+  CallCond(ReadWord, SignNegative);
 end;
 
@@ -3031 +3121 @@
 procedure TCpuZ80.NEG;
 begin
-  NotImplemented;
+  AF.A := AF.A xor $ff;
+  IncByte(AF.A);
 end;
 
@@ -3047 +3138 @@
 procedure TCpuZ80.LD_I_A;
 begin
-  NotImplemented;
+  RegI := AF.A;
 end;
 
 procedure TCpuZ80.IN_C_C_Indirect;
 begin
-  NotImplemented;
+  BC.C := DoInput(BC.Value);
 end;
 
 procedure TCpuZ80.OUT_C_Indirect_C;
 begin
-  NotImplemented;
+  DoOutput(BC.Value, BC.C);
 end;
 
 procedure TCpuZ80.ADC_HL_BC;
 begin
-  NotImplemented;
+  AdcWord(HL.Value, BC.Value);
 end;
 
 procedure TCpuZ80.LD_BC_NN_Indirect;
 begin
-  NotImplemented;
+  BC.Value := DoReadWord(ReadWord);
 end;
 
@@ -3078 +3169 @@
 procedure TCpuZ80.LD_R_A;
 begin
-  NotImplemented;
+  RegR := AF.A;
 end;
 
 procedure TCpuZ80.IN_D_C_Indirect;
 begin
-  NotImplemented;
+  DE.D := DoInput(BC.Value);
 end;
 
@@ -3108 +3199 @@
 procedure TCpuZ80.LD_A_I;
 begin
-  NotImplemented;
+  AF.A := RegI;
 end;
 
@@ -3138 +3229 @@
 procedure TCpuZ80.LD_A_R;
 begin
-  NotImplemented;
+  AF.A := RegR;
 end;
 
@@ -3193 +3284 @@
 procedure TCpuZ80.IN_A_C_Indirect;
 begin
-  A := DoInput(BC.Value);
+  AF.A := DoInput(BC.Value);
 end;
 
 procedure TCpuZ80.OUT_C_Indirect_A;
 begin
-  DoOutput(BC.Value, A);
+  DoOutput(BC.Value, AF.A);
 end;
 
@@ -3213 +3304 @@
 procedure TCpuZ80.LDI;
 begin
-  NotImplemented;
+  DoWrite(DE.Value, DoRead(HL.Value));
+  IncWord(HL.Value);
+  IncWord(DE.Value);
+  DecWord(BC.Value);
 end;
 
 procedure TCpuZ80.CPI;
 begin
-  NotImplemented;
+  Cp(DoRead(HL.Value));
+  IncWord(HL.Value);
+  DecWord(BC.Value);
 end;
 
 procedure TCpuZ80.INI;
 begin
-  NotImplemented;
+  DoWrite(HL.Value, DoInput(BC.Value));
+  DecByte(BC.B);
+  IncWord(HL.Value);
 end;
 
 procedure TCpuZ80.OUTI;
 begin
-  NotImplemented;
+  DoOutput(BC.Value, DoRead(HL.Value));
+  DecByte(BC.B);
+  IncWord(HL.Value);
 end;
 
 procedure TCpuZ80.LDD;
 begin
-  NotImplemented;
+  DoWrite(DE.Value, DoRead(HL.Value));
+  DecWord(HL.Value);
+  DecWord(DE.Value);
+  DecWord(BC.Value);
 end;
 
 procedure TCpuZ80.CPD;
 begin
-  NotImplemented;
+  Cp(DoRead(HL.Value));
+  DecWord(HL.Value);
+  DecWord(BC.Value);
 end;
 
 procedure TCpuZ80.IND;
 begin
-  NotImplemented;
+  DoWrite(HL.Value, DoInput(BC.Value));
+  DecByte(BC.B);
+  DecWord(HL.Value);
 end;
 
 procedure TCpuZ80.OUTD;
 begin
-  NotImplemented;
+  DoOutput(BC.Value, DoRead(HL.Value));
+  DecByte(BC.B);
+  DecWord(HL.Value);
 end;
 
 procedure TCpuZ80.LDIR;
 begin
-  NotImplemented;
+  repeat
+    LDI;
+  until BC.Value = 0;
 end;
 
 procedure TCpuZ80.CPIR;
 begin
-  NotImplemented;
+  repeat
+    CPI;
+  until (BC.Value = 0) or Zero;
 end;
 
 procedure TCpuZ80.INIR;
 begin
-  NotImplemented;
+  repeat
+    INI;
+  until (BC.B = 0);
 end;
 
 procedure TCpuZ80.OTIR;
 begin
-  NotImplemented;
+  repeat
+    OUTI;
+  until BC.B = 0;
 end;
 
 procedure TCpuZ80.LDDR;
 begin
-  NotImplemented;
+  repeat
+    LDD;
+  until BC.Value = 0;
 end;
 
 procedure TCpuZ80.CPDR;
 begin
-  NotImplemented;
+  repeat
+    CPD;
+  until (BC.Value = 0) or Zero;
 end;
 
 procedure TCpuZ80.INDR;
 begin
-  NotImplemented;
+  repeat
+    IND;
+  until (BC.B = 0);
 end;
 
 procedure TCpuZ80.OTDR;
 begin
-  NotImplemented;
+  repeat
+    OUTD;
+  until BC.B = 0;
 end;
 
 procedure TCpuZ80.RLC_B;
 begin
-  NotImplemented;
+  RlcByte(BC.B);
 end;
 
 procedure TCpuZ80.RLC_C;
 begin
-  NotImplemented;
+  RlcByte(BC.C);
 end;
 
 procedure TCpuZ80.RLC_D;
 begin
-  NotImplemented;
+  RlcByte(DE.D);
 end;
 
 procedure TCpuZ80.RLC_E;
 begin
-  NotImplemented;
+  RlcByte(DE.E);
 end;
 
 procedure TCpuZ80.RLC_H;
 begin
-  NotImplemented;
+  RlcByte(HL.H);
 end;
 
 procedure TCpuZ80.RLC_L;
 begin
-  NotImplemented;
+  RlcByte(HL.L);
 end;
 
 procedure TCpuZ80.RLC_HL_Indirect;
-begin
-  NotImplemented;
+var
+  Temp: Byte;
+begin
+  Temp := DoRead(HL.Value);
+  RlcByte(Temp);
+  DoWrite(HL.Value, Temp);
 end;
 
 procedure TCpuZ80.RLC_A;
 begin
-  NotImplemented;
+  RlcByte(AF.A);
 end;
 
 procedure TCpuZ80.RRC_B;
 begin
-  NotImplemented;
+  RrcByte(BC.B);
 end;
 
 procedure TCpuZ80.RRC_C;
 begin
-  NotImplemented;
+  RrcByte(BC.C);
 end;
 
 procedure TCpuZ80.RRC_D;
 begin
-  NotImplemented;
+  RrcByte(DE.D);
 end;
 
 procedure TCpuZ80.RRC_E;
 begin
-  NotImplemented;
+  RrcByte(DE.E);
 end;
 
 procedure TCpuZ80.RRC_H;
 begin
-  NotImplemented;
+  RrcByte(HL.H);
 end;
 
 procedure TCpuZ80.RRC_L;
 begin
-  NotImplemented;
+  RrcByte(HL.L);
 end;
 
 procedure TCpuZ80.RRC_HL_Indirect;
-begin
-  NotImplemented;
+var
+  Temp: Byte;
+begin
+  Temp := DoRead(HL.Value);
+  RrcByte(Temp);
+  DoWrite(HL.Value, Temp);
 end;
 
 procedure TCpuZ80.RRC_A;
 begin
-  NotImplemented;
+  RrcByte(AF.A);
 end;
 
@@ -4538 +4671 @@
 procedure TCpuZ80.ADD_IX_DE;
 begin
-  NotImplemented;
+  AddWord(IX, DE.Value);
 end;
 
 procedure TCpuZ80.LD_IX_NN;
 begin
-  NotImplemented;
+  IX := ReadWord;
 end;
 
@@ -4553 +4686 @@
 procedure TCpuZ80.INC_IX;
 begin
-  NotImplemented;
+  IncWord(IX);
 end;
 
 procedure TCpuZ80.ADD_IX_IX;
 begin
-  NotImplemented;
+  AddWord(IX, IX);
 end;
 
@@ -5262 +5395 @@
 procedure TCpuZ80.Reset;
 begin
-  A := 0;
   PC := 0;
+  AF.Value := 0;
   BC.Value := 0;
   DE.Value := 0;
   HL.Value := 0;
   SP := 0;
-  Carry := False;
-  Zero := False;
   InterruptEnabled := True;
   InterruptMode := 0;