Changeset 59 for branches/ByteArray/Disassembler.pas

Timestamp:

Nov 25, 2023, 11:47:52 PM (5 months ago)

Author:

chronos

Message:

• Fixed: Assembler and disassembler to work correctly with supported instructions.

File:

• branches/ByteArray/Disassembler.pas (modified) (6 diffs)

branches/ByteArray/Disassembler.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Cpu, Instructions, StrUtils, Memory;
+  Classes, SysUtils, Cpu, Instructions, StrUtils, Memory, BigInt;
 
 type
@@ -12 +12 @@
   TDisassembler = class
   private
-    function RegToStr(RegIndex: Byte): string;
+    InstText: string;
+    InstBytes: string;
+    InstDataWidth: TBigIntSize;
+    InstAddressWidth: TBigIntSize;
+    procedure DisassembleData;
+    procedure DisassembleAddress;
+    procedure DisassembleRegister;
+    procedure DisassembleRegisterIndirect;
+    procedure DisassembleRegisterIndirectIndex;
+    procedure DisassembleDataWidth;
+    procedure DisassembleAddressWidth;
   public
-    InstructionSet: TInstructionSet;
+    InstructionSet: TInstructionInfos;
     Memory: TMemory;
+    DataWidth: TBigIntSize;
+    AddressWidth: TBigIntSize;
     procedure Disassemble(Lines: TStrings);
     procedure SaveToFile(FileName: string);
@@ -25 +37 @@
 implementation
 
-uses
-  BigInt;
+procedure TDisassembler.DisassembleData;
+var
+  Text: string;
+begin
+  Text := IntToHex(Memory.ReadPos(InstDataWidth));
+  if not (Copy(Text, 1, 1)[1] in ['0'..'9']) then Text := '0' + Text;
+  InstText := InstText + Text + 'h';
+end;
 
-function TDisassembler.RegToStr(RegIndex: Byte): string;
+procedure TDisassembler.DisassembleAddress;
+var
+  Text: string;
 begin
-  Result := Chr(Ord('A') + RegIndex);
+  Text := IntToHex(Memory.ReadPos(InstAddressWidth));
+  if not (Copy(Text, 1, 1)[1] in ['0'..'9']) then Text := '0' + Text;
+  InstText := InstText + Text + 'h';
+end;
+
+procedure TDisassembler.DisassembleRegister;
+begin
+  InstText := InstText + 'R' + IntToStr(Byte(Memory.ReadPos(1)));
+end;
+
+procedure TDisassembler.DisassembleRegisterIndirect;
+begin
+  InstText := InstText + '(R' + IntToStr(Byte(Memory.ReadPos(1))) + ')';
+end;
+
+procedure TDisassembler.DisassembleRegisterIndirectIndex;
+begin
+  InstText := InstText + '(R' + IntToStr(Byte(Memory.ReadPos(1))) +
+    ' + ';
+  DisassembleAddress;
+  InstText := InstText + ')';
+end;
+
+procedure TDisassembler.DisassembleDataWidth;
+begin
+  InstDataWidth := Memory.ReadPos(1);
+  InstText := InstText + 'D' + IntToStr(InstDataWidth);
+end;
+
+procedure TDisassembler.DisassembleAddressWidth;
+begin
+  InstAddressWidth := Memory.ReadPos(1);
+  InstText := InstText + 'A' + IntToStr(InstAddressWidth);
 end;
 
 procedure TDisassembler.Disassemble(Lines: TStrings);
 var
-  I: Integer;
   J: Integer;
   Value: TBigInt;
@@ -41 +92 @@
   InstructionInfo: TInstructionInfo;
   Line: string;
-  InstText: string;
-  InstBytes: string;
+  MemoryPos: Integer;
+  InstructionByteSize: Integer;
+  I: Integer;
 begin
   Memory.Position := 0;
   while Memory.Position < Memory.Size do begin
     Line := IntToHex(Memory.Position, 8) + ' ';
+    MemoryPos := Memory.Position;
     Value := Memory.ReadPos(1);
     InstBytes := IntToHex(Value, 2) + ' ';
     InstText := '';
+    InstAddressWidth := AddressWidth;
+    InstDataWidth := DataWidth;
     if (Value >= 0) and (Value <= Integer(High(TInstruction))) then begin
       Instruction := TInstruction(Int64(Value));
@@ -56 +111 @@
         InstText := InstructionInfo.Name;
         for J := 0 to Length(InstructionInfo.Params) - 1 do begin
-          Value := Memory.ReadPos(1);
-          InstBytes := InstBytes + IntToHex(Value, 2) + ' ';
           if J > 0 then
             InstText := InstText + ', ' else
             InstText := InstText + ' ';
-          if InstructionInfo.Params[J] = ptNumber then begin
-            InstText := InstText + IntToHex(Value) + 'h';
-          end else
-          if InstructionInfo.Params[J] = ptReg then begin
-            InstText := InstText + RegToStr(Value);
-          end else
-          if InstructionInfo.Params[J] = ptRegIndirect then begin
-            InstText := InstText + '(' + RegToStr(Value) + ')';
-          end else
-          if InstructionInfo.Params[J] = ptRegIndirectIndex then begin
-            InstText := InstText + '(' + RegToStr(Value);
-            Value := Memory.ReadPos(1);
-            InstBytes := InstBytes + IntToHex(Value, 2) + ' ';
-            InstText := InstText + ' + ' + IntToStr(Value) + ')';
+          case InstructionInfo.Params[J] of
+            ptData: DisassembleData;
+            ptAddress: DisassembleAddress;
+            ptReg: DisassembleRegister;
+            ptRegIndirect: DisassembleRegisterIndirect;
+            ptRegIndirectIndex: DisassembleRegisterIndirectIndex;
+            ptDataWidth: DisassembleDataWidth;
+            ptAddressWidth: DisassembleAddressWidth;
           end;
         end;
-        InstBytes := InstBytes + DupeString(' ', 13 - Length(InstBytes));
       end;
     end;
+
+    // Instruction bytes to hex string
+    InstructionByteSize := Memory.Position - MemoryPos;
+    Memory.Position := MemoryPos;
+    InstBytes := '';
+    for I := 0 to InstructionByteSize - 1 do
+      InstBytes := InstBytes + IntToHex(Memory.ReadPos(1), 2) + ' ';
+    InstBytes := InstBytes + DupeString(' ', 13 - Length(InstBytes));
+
     Line := Line + InstBytes + InstText;
     Lines.Add(Line);
@@ -97 +152 @@
 constructor TDisassembler.Create;
 begin
-  InstructionSet := TInstructionSet.Create;
+  InstructionSet := TInstructionInfos.Create;
+  InstructionSet.Init;
+  DataWidth := 1;
+  AddressWidth := 1;
 end;