Changeset 138 for branches/virt simple/UMachine.pas

Timestamp:

Jan 4, 2018, 2:00:49 PM (6 years ago)

Author:

chronos

Message:

• Modified: Preparation for support for multiple memory types.

File:

• branches/virt simple/UMachine.pas (modified) (9 diffs)

branches/virt simple/UMachine.pas

@@ -24 +24 @@
   TParamType = (ptNone, ptConst, ptRegister, ptSpecialRegister);
   TCondition = (cdZero, cdNotZero, cdNegative, cdPositive);
+  TMemoryType = (mtNone, mtData);
 
   TValue = Integer;
@@ -33 +34 @@
   TParam = class
     ParamType: TParamType;
-    Memory: Boolean;
+    MemoryType: TMemoryType;
     Value: TValue;
     function GetString: string;
+    procedure SetParam(ParamType: TParamType; MemoryType: TMemoryType; Value: TValue);
   end;
 
@@ -51 +53 @@
     procedure AddInst(Opcode: TOpcode); overload;
     procedure AddInst(Opcode: TOpcode;
-      ParamType1: TParamType; Indirect1: Boolean; Value1: TValue);  overload;
+      ParamType1: TParamType; Indirect1: TMemoryType; Value1: TValue);  overload;
     procedure AddInst(Opcode: TOpcode;
-      ParamType1: TParamType; Indirect1: Boolean; Value1: TValue;
-      ParamType2: TParamType; Indirect2: Boolean; Value2: TValue);  overload;
+      ParamType1: TParamType; Indirect1: TMemoryType; Value1: TValue;
+      ParamType2: TParamType; Indirect2: TMemoryType; Value2: TValue);  overload;
   end;
 
@@ -146 +148 @@
       else Result := 'S' + IntToStr(Value);
   end;
-  if Memory then Result := '[' + Result + ']';
+  if MemoryType = mtData then Result := '[' + Result + ']';
+end;
+
+procedure TParam.SetParam(ParamType: TParamType; MemoryType: TMemoryType;
+  Value: TValue);
+begin
+  Self.ParamType := ParamType;
+  Self.MemoryType := MemoryType;
+  Self.Value := Value;
 end;
 
@@ -183 +193 @@
   NewInst := TInstruction.Create;
   NewInst.Opcode := Opcode;
-  NewInst.Params[0].ParamType := ptNone;
-  NewInst.Params[0].Memory := False;
-  NewInst.Params[0].Value := 0;
-  NewInst.Params[1].ParamType := ptNone;
-  NewInst.Params[1].Memory := False;
-  NewInst.Params[1].Value := 0;
+  NewInst.Params[0].SetParam(ptNone, mtNone, 0);
+  NewInst.Params[1].SetParam(ptNone, mtNone, 0);
   Add(NewInst);
 end;
 
 procedure TInstructions.AddInst(Opcode: TOpcode; ParamType1: TParamType;
-  Indirect1: Boolean; Value1: TValue);
+  Indirect1: TMemoryType; Value1: TValue);
 var
   NewInst: TInstruction;
@@ -199 +205 @@
   NewInst := TInstruction.Create;
   NewInst.Opcode := Opcode;
-  NewInst.Params[0].ParamType := ParamType1;
-  NewInst.Params[0].Memory := Indirect1;
-  NewInst.Params[0].Value := Value1;
-  NewInst.Params[1].ParamType := ptNone;
-  NewInst.Params[1].Memory := False;
-  NewInst.Params[1].Value := 0;
+  NewInst.Params[0].SetParam(ParamType1, Indirect1, Value1);
+  NewInst.Params[1].SetParam(ptNone, mtNone, 0);
   Add(NewInst);
 end;
 
 procedure TInstructions.AddInst(Opcode: TOpcode;
-  ParamType1: TParamType; Indirect1: Boolean; Value1: TValue;
-  ParamType2: TParamType; Indirect2: Boolean; Value2: TValue);
+  ParamType1: TParamType; Indirect1: TMemoryType; Value1: TValue;
+  ParamType2: TParamType; Indirect2: TMemoryType; Value2: TValue);
 var
   NewInst: TInstruction;
@@ -216 +218 @@
   NewInst := TInstruction.Create;
   NewInst.Opcode := Opcode;
-  NewInst.Params[0].ParamType := ParamType1;
-  NewInst.Params[0].Memory := Indirect1;
-  NewInst.Params[0].Value := Value1;
-  NewInst.Params[1].ParamType := ParamType2;
-  NewInst.Params[1].Memory := Indirect2;
-  NewInst.Params[1].Value := Value2;
+  NewInst.Params[0].SetParam(ParamType1, Indirect1, Value1);
+  NewInst.Params[1].SetParam(ParamType2, Indirect2, Value2);
   Add(NewInst);
 end;
@@ -469 +467 @@
   end else if Param.ParamType = ptNone then raise Exception.Create('Read from not set parameter')
   else raise Exception.Create('Unsupported parameter type ' + IntToStr(Integer(Param.ParamType)));
-  if Param.Memory then Result := Memory[Result];
+  if Param.MemoryType = mtData then Result := Memory[Result];
 end;
 
@@ -475 +473 @@
 begin
   if Param.ParamType = ptRegister then begin
-    if Param.Memory then Memory[Registers[Param.Value]] := Value
+    if Param.MemoryType = mtData then Memory[Registers[Param.Value]] := Value
       else Registers[Param.Value] := Value;
-  end else if Param.ParamType = ptConst then begin
-    if Param.Memory then Memory[Param.Value] := Value
+  end else
+  if Param.ParamType = ptConst then begin
+    if Param.MemoryType = mtData then Memory[Param.Value] := Value
       else raise Exception.Create('Cannot assign to constant parameter');
-  end else if Param.ParamType = ptSpecialRegister then begin
+  end else
+  if Param.ParamType = ptSpecialRegister then begin
     if Param.Value = Integer(srIP) then begin
-      if Param.Memory then Memory[IP] := Value
+      if Param.MemoryType = mtData then Memory[IP] := Value
         else IP := Value;
     end else if Param.Value = Integer(srSP) then begin
-      if Param.Memory then Memory[SP] := Value
+      if Param.MemoryType = mtData then Memory[SP] := Value
         else SP := Value;
     end else raise Exception.Create('Unsupported special register ' + IntToStr(Integer(Param.Value)));
-  end else if Param.ParamType = ptNone then raise Exception.Create('Write to not set parameter')
-  else raise Exception.Create('Unsupported parameter type ' + IntToStr(Integer(Param.ParamType)));
+  end else
+  if Param.ParamType = ptNone then begin
+    raise Exception.Create('Write to not set parameter')
+  end else
+  raise Exception.Create('Unsupported parameter type ' + IntToStr(Integer(Param.ParamType)));
 end;