Changeset 182 for branches/virtualcpu4/UInstructionWriter.pas

Timestamp:

Apr 13, 2019, 1:32:32 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Allow to use multiple prefix instructions in row.

File:

• branches/virtualcpu4/UInstructionWriter.pas (modified) (13 diffs)

branches/virtualcpu4/UInstructionWriter.pas

@@ -14 +14 @@
   TInstructionWriter = class
   private
-    DataSizeLast: TBitWidth;
-    DataSizePrefix: TBitWidth;
-    AddrSizeLast: TBitWidth;
-    AddrSizePrefix: TBitWidth;
     procedure PrefixBegin;
     procedure PrefixEnd;
@@ -24 +20 @@
     IP: Integer;
     DataSize: TBitWidth;
+    DataSizeBase: TBitWidth;
     AddrSize: TBitWidth;
+    AddrSizeBase: TBitWidth;
+    Prefix: Boolean;
     procedure Init;
     procedure Write8(Value: Byte);
@@ -162 +161 @@
   Write8(Byte(opJumpRelZero));
   WriteAddressSigned(Int64(Addr) - Int64(NextIP));
-  if AddrSizeLast <> bwNone then AddrSize := AddrSizeLast;
   PrefixEnd;
 end;
@@ -199 +197 @@
 procedure TInstructionWriter.DataPrefix8;
 begin
-  DataSizePrefix := bw8;
+  Prefix := True;
+  DataSize := bw8;
   Write8(Byte(opDataPrefix8));
 end;
@@ -205 +204 @@
 procedure TInstructionWriter.DataPrefix16;
 begin
-  DataSizePrefix := bw16;
+  Prefix := True;
+  DataSize := bw16;
   Write8(Byte(opDataPrefix16));
 end;
@@ -211 +211 @@
 procedure TInstructionWriter.DataPrefix32;
 begin
-  DataSizePrefix := bw32;
+  Prefix := True;
+  DataSize := bw32;
   Write8(Byte(opDataPrefix32));
 end;
@@ -217 +218 @@
 procedure TInstructionWriter.DataPrefix64;
 begin
-  DataSizePrefix := bw64;
+  Prefix := True;
+  DataSize := bw64;
   Write8(Byte(opDataPrefix64));
 end;
@@ -223 +225 @@
 procedure TInstructionWriter.AddrPrefix8;
 begin
-  AddrSizePrefix := bw8;
+  Prefix := True;
+  AddrSize := bw8;
   Write8(Byte(opAddrPrefix8));
 end;
@@ -229 +232 @@
 procedure TInstructionWriter.AddrPrefix16;
 begin
-  AddrSizePrefix := bw16;
+  Prefix := True;
+  AddrSize := bw16;
   Write8(Byte(opAddrPrefix16));
 end;
@@ -235 +239 @@
 procedure TInstructionWriter.AddrPrefix32;
 begin
-  AddrSizePrefix := bw32;
+  Prefix := True;
+  AddrSize := bw32;
   Write8(Byte(opAddrPrefix32));
 end;
@@ -241 +246 @@
 procedure TInstructionWriter.AddrPrefix64;
 begin
-  AddrSizePrefix := bw64;
+  Prefix := True;
+  AddrSize := bw64;
   Write8(Byte(opAddrPrefix64));
 end;
@@ -297 +303 @@
 procedure TInstructionWriter.PrefixBegin;
 begin
-  if DataSizePrefix <> bwNone then begin
-    DataSizeLast := DataSize;
-    DataSize := DataSizePrefix;
-    DataSizePrefix := bwNone;
-  end;
-  if AddrSizePrefix <> bwNone then begin
-    AddrSizeLast := AddrSize;
-    AddrSize := AddrSizePrefix;
-    AddrSizePrefix := bwNone;
-  end;
+  Prefix := False;
 end;
 
 procedure TInstructionWriter.PrefixEnd;
 begin
-  if DataSizeLast <> bwNone then begin
-    DataSize := DataSizeLast;
-    DataSizeLast := bwNone;
-  end;
-  if AddrSizeLast <> bwNone then begin
-    AddrSize := AddrSizeLast;
-    AddrSizeLast := bwNone;
+  if not Prefix then begin
+    DataSize := DataSizeBase;
+    AddrSize := AddrSizeBase;
   end;
 end;
@@ -323 +316 @@
 procedure TInstructionWriter.Init;
 begin
-  DataSize := Cpu.DataSize;
-  AddrSize := Cpu.AddrSize;
+  DataSizeBase := Cpu.DataSizeBase;
+  DataSize := DataSizeBase;
+  AddrSizeBase := Cpu.AddrSizeBase;
+  AddrSize := AddrSizeBase;
 end;