Changeset 185 for branches/virtualcpu4/UOpcode.pas

Timestamp:

May 1, 2019, 9:48:46 PM (6 years ago)

Author:

chronos

Message:

• Added: Assembler labels reference address calculation.
• Fixed: Displaying address/data hex numbers in opcode and instruction.

File:

• branches/virtualcpu4/UOpcode.pas (modified) (3 diffs)

branches/virtualcpu4/UOpcode.pas

@@ -29 +29 @@
   end;
 
+  function IntToHexEx(Value: Int64; Digits: ShortInt; Prefix: string = ''): string; overload;
+  function IntToHexEx(Value: QWord; Digits: ShortInt; Prefix: string = ''): string; overload;
+
 
 implementation
+
+const
+  HexChars: array[0..15] of Char = '0123456789ABCDEF';
+
+function IntToHexEx(Value: Int64; Digits: ShortInt; Prefix: string = ''): string;
+var
+  I: Integer;
+  Negative: Boolean;
+begin
+  Negative := Value < 0;
+  if Negative then Value := -Value;
+  Result := '';
+  if Digits >= 0 then begin
+    for I := 0 to Digits - 1 do begin
+      Result := HexChars[Value and $f] + Result;
+      Value := Value shr 4;
+    end;
+  end else begin
+    if Value <> 0 then begin
+      while QWord(Value) > 0 do begin
+        Result := HexChars[Value and $f] + Result;
+        Value := Value shr 4;
+      end;
+    end else Result := '0';
+  end;
+  Result := Prefix + Result;
+  if Negative then Result := '-' + Result;
+end;
+
+function IntToHexEx(Value: QWord; Digits: ShortInt; Prefix: string = ''): string;
+var
+  I: Integer;
+begin
+  Result := '';
+  if Digits >= 0 then begin
+    for I := 0 to Digits - 1 do begin
+      Result := HexChars[Value and $f] + Result;
+      Value := Value shr 4;
+    end;
+  end else begin
+    if Value <> 0 then begin
+      while Value > 0 do begin
+        Result := HexChars[Value and $f] + Result;
+        Value := Value shr 4;
+      end;
+    end else Result := '0';
+  end;
+  Result := Prefix + Result;
+end;
 
 { TOpcodeDefs }
@@ -100 +152 @@
   AddNew(opShr, 'SHR', prReg, prReg, prNone, False);
   AddNew(opDataPrefix8, 'DP8', prNone, prNone, prNone, True);
-  AddNew(opDataPrefix16, 'DP16', prNone, prNone, prNone, False);
+  AddNew(opDataPrefix16, 'DP16', prNone, prNone, prNone, True);
   AddNew(opDataPrefix32, 'DP32', prNone, prNone, prNone, True);
   AddNew(opDataPrefix64, 'DP64', prNone, prNone, prNone, True);
@@ -117 +169 @@
   AddNew(opAddrPrefix16, 'AP16', prNone, prNone, prNone, True);
   AddNew(opAddrPrefix32, 'AP32', prNone, prNone, prNone, True);
-  AddNew(opDataPrefix64, 'AP64', prNone, prNone, prNone, True);
+  AddNew(opAddrPrefix64, 'AP64', prNone, prNone, prNone, True);
   AddNew(opConvert, 'CON', prReg, prNone, prNone, True);
 end;