Changeset 184 for branches/virtualcpu4/UDisassembler.pas

Timestamp:

Apr 25, 2019, 4:20:43 PM (6 years ago)

Author:

chronos

Message:

• Added: Basic assembler window.

File:

• branches/virtualcpu4/UDisassembler.pas (modified) (9 diffs)

branches/virtualcpu4/UDisassembler.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UMemory, fgl, UCpu, UInstructionReader, Math;
+  Classes, SysUtils, UMemory, fgl, UCpu, UInstructionReader, Math, UOpcode;
 
 type
@@ -19 +19 @@
   TDisassembler = class(TInstructionReader)
   private
+    OpcodeDefs: TOpcodeDefs;
   public
     Output: TFPGObjectList<TDisassemblerLine>;
@@ -48 +49 @@
   AddressRel: TAddressSigned;
   Reg: TRegIndex;
+  OpcodeDef: TOpcodeDef;
 begin
   Init;
@@ -57 +59 @@
     Opcode := Read8;
     if Opcode <= Integer(High(TOpcode)) then begin
-      Prefix := OpcodeDef[TOpcode(Opcode)].Prefix;
+      OpcodeDef := OpcodeDefs.SearchByOpcode(TOpcode(Opcode));
+      Prefix := OpcodeDef.Prefix;
       case TOpcode(Opcode) of
         opDataPrefix8: DataSize := bw8;
@@ -71 +74 @@
       Line.Address := IP - 1;
       Line.Opcode := IntToHex(Opcode, 2);
-      Line.Instruction := OpcodeDef[TOpcode(Opcode)].Name;
-      case OpcodeDef[TOpcode(Opcode)].Param1 of
+      Line.Instruction := OpcodeDef.Name;
+      case OpcodeDef.Param1 of
         prReg: begin
           Reg := Read8;
@@ -94 +97 @@
         end;
       end;
-      case OpcodeDef[TOpcode(Opcode)].Param2 of
+      case OpcodeDef.Param2 of
         prReg: begin
           Reg := Read8;
@@ -116 +119 @@
         end;
       end;
-      case OpcodeDef[TOpcode(Opcode)].Param3 of
+      case OpcodeDef.Param3 of
         prReg: begin
           Reg := Read8;
@@ -156 +159 @@
 constructor TDisassembler.Create;
 begin
+  OpcodeDefs := TOpcodeDefs.Create;
   Output := TFPGObjectList<TDisassemblerLine>.Create;
 end;
@@ -161 +165 @@
 destructor TDisassembler.Destroy;
 begin
-  Output.Free;
+  FreeAndNil(Output);
+  FreeAndNil(OpcodeDefs);
   inherited Destroy;
 end;