Changeset 175 for branches/virtualcpu4/UCpu.pas

Timestamp:

Apr 12, 2019, 1:34:47 AM (6 years ago)

Author:

chronos

Message:

• Added: Drawing to video memory.

File:

• branches/virtualcpu4/UCpu.pas (modified) (6 diffs)

branches/virtualcpu4/UCpu.pas

@@ -153 +153 @@
 
 procedure TCpu.InstLoadImmediate;
-begin
-  case DataSize of
-    bw8: Registers[Read8].B := Read8;
-    bw16: Registers[Read8].W := Read16;
-    bw32: Registers[Read8].D := Read32;
-    bw64: Registers[Read8].Q := Read64;
+var
+  R: TRegIndex;
+begin
+  R := Read8;
+  case DataSize of
+    bw8: Registers[R].B := Read8;
+    bw16: Registers[R].W := Read16;
+    bw32: Registers[R].D := Read32;
+    bw64: Registers[R].Q := Read64;
   end;
 end;
@@ -219 +222 @@
 
 procedure TCpu.InstLoadMem;
-begin
-  case DataSize of
-    bw8: Registers[Read8].B := PByte(Memory + PAddress(@Registers[Read8])^)^;
-    bw16: Registers[Read8].W := PWord(Memory + PAddress(@Registers[Read8])^)^;
-    bw32: Registers[Read8].D := PDWord(Memory + PAddress(@Registers[Read8])^)^;
-    bw64: Registers[Read8].Q := PQWord(Memory + PAddress(@Registers[Read8])^)^;
+var
+  R1, R2: TRegIndex;
+begin
+  R1 := Read8;
+  R2 := Read8;
+  case AddressSize of
+    bw8: case DataSize of
+      bw8: Registers[R1].B := PByte(Memory + PByte(@Registers[R2])^)^;
+      bw16: Registers[R1].W := PWord(Memory + PByte(@Registers[R2])^)^;
+      bw32: Registers[R1].D := PDWord(Memory + PByte(@Registers[R2])^)^;
+      bw64: Registers[R1].Q := PQWord(Memory + PByte(@Registers[R2])^)^;
+    end;
+    bw16: case DataSize of
+      bw8: Registers[R1].B := PByte(Memory + PWord(@Registers[R2])^)^;
+      bw16: Registers[R1].W := PWord(Memory + PWord(@Registers[R2])^)^;
+      bw32: Registers[R1].D := PDWord(Memory + PWord(@Registers[R2])^)^;
+      bw64: Registers[R1].Q := PQWord(Memory + PWord(@Registers[R2])^)^;
+    end;
+    bw32: case DataSize of
+      bw8: Registers[R1].B := PByte(Memory + PDWord(@Registers[R2])^)^;
+      bw16: Registers[R1].W := PWord(Memory + PDWord(@Registers[R2])^)^;
+      bw32: Registers[R1].D := PDWord(Memory + PDWord(@Registers[R2])^)^;
+      bw64: Registers[R1].Q := PQWord(Memory + PDWord(@Registers[R2])^)^;
+    end;
+    bw64: case DataSize of
+      bw8: Registers[R1].B := PByte(Memory + PQWord(@Registers[R2])^)^;
+      bw16: Registers[R1].W := PWord(Memory + PQWord(@Registers[R2])^)^;
+      bw32: Registers[R1].D := PDWord(Memory + PQWord(@Registers[R2])^)^;
+      bw64: Registers[R1].Q := PQWord(Memory + PQWord(@Registers[R2])^)^;
+    end;
   end;
 end;
 
 procedure TCpu.InstStoreMem;
-begin
-  case DataSize of
-    bw8: PByte(Memory + PAddress(@Registers[Read8])^)^ := Registers[Read8].B;
-    bw16: PWord(Memory + PAddress(@Registers[Read8])^)^ := Registers[Read8].W;
-    bw32: PDWord(Memory + PAddress(@Registers[Read8])^)^ := Registers[Read8].D;
-    bw64: PQWord(Memory + PAddress(@Registers[Read8])^)^ := Registers[Read8].Q;
+var
+  R1, R2: TRegIndex;
+begin
+  R1 := Read8;
+  R2 := Read8;
+  case AddressSize of
+    bw8: case DataSize of
+      bw8: PByte(Memory + PByte(@Registers[R1])^)^ := Registers[R2].B;
+      bw16: PWord(Memory + PByte(@Registers[R1])^)^ := Registers[R2].W;
+      bw32: PDWord(Memory + PByte(@Registers[R1])^)^ := Registers[R2].D;
+      bw64: PQWord(Memory + PByte(@Registers[R1])^)^ := Registers[R2].Q;
+    end;
+    bw16: case DataSize of
+      bw8: PByte(Memory + PWord(@Registers[R1])^)^ := Registers[R2].B;
+      bw16: PWord(Memory + PWord(@Registers[R1])^)^ := Registers[R2].W;
+      bw32: PDWord(Memory + PWord(@Registers[R1])^)^ := Registers[R2].D;
+      bw64: PQWord(Memory + PWord(@Registers[R1])^)^ := Registers[R2].Q;
+    end;
+    bw32: case DataSize of
+      bw8: PByte(Memory + PDWord(@Registers[R1])^)^ := Registers[R2].B;
+      bw16: PWord(Memory + PDWord(@Registers[R1])^)^ := Registers[R2].W;
+      bw32: PDWord(Memory + PDWord(@Registers[R1])^)^ := Registers[R2].D;
+      bw64: PQWord(Memory + PDWord(@Registers[R1])^)^ := Registers[R2].Q;
+    end;
+    bw64: case DataSize of
+      bw8: PByte(Memory + PQWord(@Registers[R1])^)^ := Registers[R2].B;
+      bw16: PWord(Memory + PQWord(@Registers[R1])^)^ := Registers[R2].W;
+      bw32: PDWord(Memory + PQWord(@Registers[R1])^)^ := Registers[R2].D;
+      bw64: PQWord(Memory + PQWord(@Registers[R1])^)^ := Registers[R2].Q;
+    end;
   end;
 end;
@@ -436 +487 @@
 procedure TCpu.InstDec;
 var
-  R1: TRegIndex;
-begin
-  R1 := Read8;
-  case DataSize of
-    bw8: Registers[R1].B := Registers[R1].B - 1;
-    bw16: Registers[R1].W := Registers[R1].W - 1;
-    bw32: Registers[R1].D := Registers[R1].D - 1;
-    bw64: Registers[R1].Q := Registers[R1].Q - 1;
+  R: TRegIndex;
+begin
+  R := Read8;
+  case DataSize of
+    bw8: Registers[R].B := Registers[R].B - 1;
+    bw16: Registers[R].W := Registers[R].W - 1;
+    bw32: Registers[R].D := Registers[R].D - 1;
+    bw64: Registers[R].Q := Registers[R].Q - 1;
   end;
 end;
@@ -450 +501 @@
 begin
   case AddressSize of
-    bw8: if Z then IP := Read8;
-    bw16: if Z then IP := Read16;
-    bw32: if Z then IP := Read32;
-    bw64: if Z then IP := Read64;
+    bw8: if Z then IP := Read8 else Read8;
+    bw16: if Z then IP := Read16 else Read16;
+    bw32: if Z then IP := Read32 else Read32;
+    bw64: if Z then IP := Read64 else Read64;
   end;
 end;
@@ -460 +511 @@
 begin
   case AddressSize of
-    bw8: if not Z then IP := Read8;
-    bw16: if not Z then IP := Read16;
-    bw32: if not Z then IP := Read32;
-    bw64: if not Z then IP := Read64;
+    bw8: if not Z then IP := Read8 else Read8;
+    bw16: if not Z then IP := Read16 else Read16;
+    bw32: if not Z then IP := Read32 else Read32;
+    bw64: if not Z then IP := Read64 else Read64;
   end;
 end;
@@ -913 +964 @@
     if Assigned(Instructions[TOpcode(Opcode)]) then Instructions[TOpcode(Opcode)]
       else raise Exception.Create('Missing instruction handler for opcode '+ IntToStr(Opcode));
-  end else raise Exception.Create('Unsupported opcode ' + IntToStr(Opcode) + ' at address ' + IntToHex(IP, 8) + '.');
+  end else raise Exception.Create('Unsupported opcode ' + IntToStr(Opcode) + ' at address ' + IntToHex(IP - 1, 8) + '.');
   if DataSizeLast <> bwNone then begin
     DataSize := DataSizeLast;