Changeset 31 for branches/UltimatOS/UInstructionWriter.pas

Timestamp:

Jul 6, 2022, 1:05:27 AM (23 months ago)

Author:

chronos

Message:

• Modified: Code parsing and execution improvements.

File:

• branches/UltimatOS/UInstructionWriter.pas (modified) (7 diffs)

branches/UltimatOS/UInstructionWriter.pas

@@ -8 +8 @@
 type
   TInstructionParam = (ipNone, ipRegIndex, ipAddress, ipData, ipIndex,
-    ipRegIndexRel);
+    ipRegIndexRel, ipAddressRel);
 
   TInstructionDef = class
@@ -72 +72 @@
     procedure WriteReg(Index: Byte);
     procedure WriteByte(Value: Byte);
+    procedure WriteWord(Value: Word);
+    procedure WriteCardinal(Value: Cardinal);
     constructor Create;
     destructor Destroy; override;
@@ -190 +192 @@
         end;
       end;
+    end;
+    ipAddressRel: begin
+      Address := Trim(ParseText(Text, ','));
+      if Address.StartsWith('(') and Address.EndsWith(')') then begin
+        Address := Copy(Address, 2, Length(Address) - 2);
+        if TryStrToInt(Address, Value) then begin
+          WriteAddress(Value);
+        end else begin
+          FoundConstant := Constants.SearchByName(UpperCase(Address));
+          if Assigned(FoundConstant) then begin
+            WriteAddress(FoundConstant.Value);
+            Exit;
+          end;
+          FoundLabel := Labels.SearchByName(UpperCase(Address));
+          if Assigned(FoundLabel) then begin
+            // Existing label
+            WriteAddress(FoundLabel.Address);
+          end else begin
+            // Forward label reference
+            with Labels.AddNew(UpperCase(Address), -1) do begin
+              SetLength(ForwardRefs, Length(ForwardRefs) + 1);
+              ForwardRefs[Length(ForwardRefs) - 1] := IP;
+            end;
+            WriteAddress(0);
+          end;
+        end;
+      end else Error('Expected indirect address ' + Address);
     end;
     ipRegIndex: begin
@@ -333 +362 @@
         end else WriteByte(StrToInt(Param));
       end;
+    end else
+    if InstructionName = 'dw' then begin
+      while Text <> '' do begin
+        Param := ParseText(Text, ',');
+        if Param.StartsWith('"') and Param.EndsWith('"') then begin
+          Param := Copy(Param, 2, Length(Param) - 2);
+          for I := 1 to Length(Param) do
+            WriteWord(Ord(Param[I]));
+        end else WriteWord(StrToInt(Param));
+      end;
+    end else
+    if InstructionName = 'dd' then begin
+      while Text <> '' do begin
+        Param := ParseText(Text, ',');
+        if Param.StartsWith('"') and Param.EndsWith('"') then begin
+          Param := Copy(Param, 2, Length(Param) - 2);
+          for I := 1 to Length(Param) do
+            WriteCardinal(Ord(Param[I]));
+        end else WriteCardinal(StrToInt(Param));
+      end;
     end else Error('Unsupported directive name ' + InstructionName);
   end else begin
@@ -383 +432 @@
 end;
 
+procedure TInstructionWriter.WriteWord(Value: Word);
+begin
+  PWord(@Memory.Data[IP])^ := Value;
+  Inc(IP, SizeOf(Word));
+end;
+
+procedure TInstructionWriter.WriteCardinal(Value: Cardinal);
+begin
+  PCardinal(@Memory.Data[IP])^ := Value;
+  Inc(IP, SizeOf(Cardinal));
+end;
+
 constructor TInstructionWriter.Create;
 begin
@@ -392 +453 @@
     AddNew(inHalt, 'HALT');
     AddNew(inSet, 'SET', ipRegIndex, ipData);
-    AddNew(inInput, 'IN', ipRegIndex, ipAddress);
-    AddNew(inOutput, 'OUT', ipAddress, ipRegIndex);
+    AddNew(inInput, 'IN', ipRegIndex, ipAddressRel);
+    AddNew(inOutput, 'OUT', ipAddressRel, ipRegIndex);
     AddNew(inInc, 'INC', ipRegIndex);
     AddNew(inDec, 'DEC', ipRegIndex);
@@ -409 +470 @@
     AddNew(inShr, 'SHR', ipRegIndex, ipIndex);
     AddNew(inLoad, 'LD', ipRegIndex, ipRegIndexRel);
+    AddNew(inLoadi, 'LDI', ipRegIndex, ipAddressRel);
     AddNew(inStore, 'ST', ipRegIndexRel, ipRegIndex);
     AddNew(inMul, 'MUL', ipRegIndex, ipRegIndex);
     AddNew(inAnd, 'AND', ipRegIndex, ipRegIndex);
+    AddNew(inAndi, 'ANDI', ipRegIndex, ipData);
     AddNew(inOr, 'OR', ipRegIndex, ipRegIndex);
     AddNew(inXor, 'XOR', ipRegIndex, ipRegIndex);