Changeset 7 for trunk/Z80/InstructionSetGen.pas

Timestamp:

Apr 19, 2026, 12:16:19 PM (8 days ago)

Author:

chronos

Message:

• Modified: Updated instruction info with all instructions.

File:

• trunk/Z80/InstructionSetGen.pas (modified) (10 diffs)

trunk/Z80/InstructionSetGen.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils;
+  Classes, SysUtils, Common, Z80InstructionInfo, TypInfo;
 
 type
@@ -28 +28 @@
   InitInstructions: TStringList;
   Combined: TStringList;
+  Info: TStringList;
   Cell: string;
   Source: string;
@@ -34 +35 @@
   Bytes: string;
   Cycles: string;
+  CyclesFalseCond: string;
   FlagC: string;
   FlagN: string;
@@ -43 +45 @@
   Ident: string;
   Prefix: string;
+  NameOnly: string;
+  Params: string;
+  ParamsPart: string;
+  InfoParams: string;
+  ParamType: TParamType;
+  NewCycles: string;
 const
   CellStart = '<td  >';
@@ -68 +76 @@
   InitInstructions := TStringList.Create;
   InitInstructions.Add('procedure TCpuZ80.InitInstructions;');
-  InitInstructions.Add('begin;');
+  InitInstructions.Add('begin');
+  Info := TStringList.Create;
+  Info.Add('constructor TInstructionSet.Create;');
+  Info.Add('begin');
   repeat
     Cell := GetBlock(Source, CellStart, CellEnd);
@@ -74 +85 @@
       Name := GetBlock(Cell, CodeStart, CodeEnd).Trim;
       if Name = '' then Continue;
+      Name := StringReplace(Name, '<var>', '', [rfReplaceAll]);
+      Name := StringReplace(Name, '</var>', '', [rfReplaceAll]);
+      Params := Name;
+      NameOnly := GetStringPart(Params, ' ');
+
       Ident := StringReplace(Name.ToUpper, ' ', '_', [rfReplaceAll]);
       Ident := StringReplace(Ident, ',', '_', [rfReplaceAll]);
-      Ident := StringReplace(Ident, '<VAR>', '', [rfReplaceAll]);
-      Ident := StringReplace(Ident, '</VAR>', '', [rfReplaceAll]);
       Ident := StringReplace(Ident, '''', '_Pair', [rfReplaceAll]);
       Ident := StringReplace(Ident, '+', '_Plus_', [rfReplaceAll]);
@@ -89 +103 @@
         Opcode := Copy(Opcode, 3, MaxInt).Trim;
         if Prefix = 'CB' then Opcode := '1' + Opcode
-        else if Prefix = 'ED' then Opcode := '2' + Opcode
-        else if Prefix = 'DD' then Opcode := '3' + Opcode
+        else if Prefix = 'DD' then Opcode := '2' + Opcode
+        else if Prefix = 'ED' then Opcode := '3' + Opcode
         else if Prefix = 'FD' then Opcode := '4' + Opcode;
       end;
       Bytes := GetBlock(Cell, DataStart, DataEnd).Trim;
       Cycles := GetBlock(Cell, DataStart, DataEnd).Trim;
+      if Pos('/', Cycles) >= 1 then begin
+        NewCycles := GetStringPart(Cycles, '/');
+        CyclesFalseCond := Cycles;
+        Cycles := NewCycles;
+      end else CyclesFalseCond := '0';
+
       FlagC := GetBlock(Cell, DataStart, DataEnd).Trim;
       FlagN := GetBlock(Cell, DataStart, DataEnd).Trim;
@@ -102 +122 @@
       FlagS := GetBlock(Cell, DataStart, DataEnd).Trim;
       Description := GetBlock(Cell, DataStart, DataEnd).Trim;
+      Description := StringReplace(Description, '<var>', '', [rfReplaceAll]);
+      Description := StringReplace(Description, '</var>', '', [rfReplaceAll]);
+
+      InfoParams := '';
+      Params := Params.ToUpper;
+      while Params <> '' do begin
+        ParamsPart := GetStringPart(Params, ',');
+        ParamType := StrToParamType(ParamsPart);
+        if ParamType <> ptNone then
+          InfoParams := InfoParams + ', ' + GetEnumName(TypeInfo(TParamType), Integer(ParamType));
+      end;
+      if Copy(InfoParams, 1, 2) = ', ' then Delete(InfoParams, 1, 2);
+
+      Info.Add('  AddNew(in_' + Ident + ', ''' + NameOnly.ToUpper + ''', [' + InfoParams + '], ''' +
+        StringReplace(Description, '''', '''''', [rfReplaceAll]) + ''', ' +
+        Cycles + ', ' + CyclesFalseCond + ');');
       Instruction.Add('    in_' + Ident + ' = $' + Opcode + ',');
       InitInstructions.Add('  Instructions[in_' + Ident + '] := ' + Ident + ';');
-      Head.Add('  procedure ' + Ident + ';');
+      Head.Add('    procedure ' + Ident + ';');
       Body.Add('procedure TCpuZ80.' + Ident + ';');
       Body.Add('begin');
+      Body.Add('  NotImplemented;');
       Body.Add('end;');
       Body.Add('');
@@ -113 +150 @@
   Instruction.Add('  );');
   Head.Add('end;');
-  InitInstructions.Add('end;')
-  ;
+  InitInstructions.Add('end;');
+  Info.Add('end;');
+
   ForceDirectories(Generated);
   Instruction.SaveToFile(Generated + DirectorySeparator + 'Instruction.pas');
   Head.SaveToFile(Generated + DirectorySeparator + 'Head.pas');
   Body.SaveToFile(Generated + DirectorySeparator + 'Body.pas');
-  InitInstructions.SaveToFile(Generated + DirectorySeparator + 'Body.pas');
+  InitInstructions.SaveToFile(Generated + DirectorySeparator + 'InitInstructions.pas');
+  Info.SaveToFile(Generated + DirectorySeparator + 'Info.pas');
 
   Combined.Add(Instruction.Text);
@@ -133 +172 @@
   Body.Free;
   InitInstructions.Free;
+  Info.Free;
   Lines.Free;
 end;