Changeset 31 for branches/UltimatOS

Timestamp:

Jul 6, 2022, 1:05:27 AM (2 years ago)

Author:

chronos

Message:

• Modified: Code parsing and execution improvements.

Location:

branches/UltimatOS

Files:

• Graphics.asm (modified) (10 diffs)
• UCpu.pas (modified) (3 diffs)
• UInstructionWriter.pas (modified) (7 diffs)
• UMachine.pas (modified) (2 diffs)

branches/UltimatOS/Graphics.asm

@@ +1 @@
+ColorText: .dd $ffffff 
+ColorBackground: .dd 0
+
 Rectangle: ; R0 - Color, R1 - X, R2 - Y, R3 - Width, R4 - Height   
   PUSH R5 ; loop X
@@ -17 +20 @@
   COPY R5, R3
 Line:
-  OUT  ScreenWriteData, R7
+  OUT  (ScreenWriteData), R7
   DEC  R5
   JPNZ R5, Line
@@ -34 +37 @@
 SetPixelAddr: ; R0 - X, R1 - Y
   PUSH R2
-  IN   R2, ScreenGetWidth
+  IN   R2, (ScreenGetWidth)
   SHL  R2, 2 ; multiply by 4
-  SHL  R0, 2
+  SHL  R0, 2 ; multiply by 4
   MUL  R1, R2
   ADD  R0, R1
-  OUT  ScreenSetAddr, R0
+  OUT  (ScreenSetAddr), R0
   POP  R2
   RET
@@ -57 +60 @@
   PUSH R11 ; Background color
   PUSH R12 ; temp value
-  PUSH R13 ; bit mask
   COPY R5, R1
   COPY R6, R2
@@ -63 +65 @@
   SHL  R0, 3
   ADD  R3, R0
-  IN   R8, ScreenGetWidth
+  IN   R8, (ScreenGetWidth)
   SET  R4, CharHeight
-  SET  R10, $ffffff
-  SET  R11, 5
-  SET  R13, 1
+  LDI  R10, (ColorText)
+  LDI  R11, (ColorBackground)
 WriteCharLoopY:
   COPY R0, R5
@@ -76 +77 @@
 WriteCharLoopX:
   COPY R12, R7
-  AND  R12, R13
+  ANDI R12, 1
   JPZ  R12, WriteCharNext
-  OUT  ScreenWriteData, R10
+  OUT  (ScreenWriteData), R10
   JP   WriteCharNext2
 WriteCharNext:
-  OUT  ScreenWriteData, R11
+  OUT  (ScreenWriteData), R11
 WriteCharNext2:
   DEC  R9
@@ -90 +91 @@
   INC  R3
   JPNZ R4, WriteCharLoopY
-  POP  R13
   POP  R12
   POP  R11
@@ -106 +106 @@
   PUSH R3 ; loop variable
   PUSH R4 ; character width
-  PUSH R5 ; byte mask
   PUSH R6 ; X
   PUSH R7 ; Y
@@ -115 +114 @@
   COPY R7, R2
   COPY R3, R0
-  SET  R5, $ff
   SET  R4, CharWidth  
 TextOutLoop:
   LD   R0, (R3)
-  AND  R0, R5
+  ANDI R0, $ff
   JPZ  R0, TextOutLoop2
   COPY R1, R6
@@ -133 +131 @@
   POP  R7
   POP  R6
-  POP  R5
   POP  R4
   POP  R3

branches/UltimatOS/UCpu.pas

@@ -9 +9 @@
   TInstruction = (inNop, inHalt, inSet, inInput, inOutput, inInc, inDec, inJp,
     inJpz, inJpnz, inAdd, inSub, inCall, inRet, inPush, inPop, inCopy,
-    inShl, inShr, inLoad, inStore, inMul, inAnd, inOr, inXor);
+    inShl, inShr, inLoad, inLoadi, inStore, inMul, inAnd, inAndi, inOr, inXor);
   TAddress = Integer;
   PAddress = ^TAddress;
@@ -107 +107 @@
       R[RegIndex] := PData(@Memory.Data[R[RegIndex2]])^;
     end;
+    inLoadi: begin
+      RegIndex := ReadByte;
+      Address := ReadAddress;
+      R[RegIndex] := PData(@Memory.Data[Address])^;
+    end;
     inStore: begin
       RegIndex := ReadByte;
@@ -194 +199 @@
       RegIndex2 := ReadByte;
       R[RegIndex] := R[RegIndex] and R[RegIndex2];
+    end;
+    inAndi: begin
+      RegIndex := ReadByte;
+      R[RegIndex] := R[RegIndex] and ReadData;
     end;
     inOr: begin

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);

branches/UltimatOS/UMachine.pas

@@ -27 +27 @@
     function GetSize: TPoint;
     procedure SetSize(AValue: TPoint);
-    procedure Reset; override;
   public
     Memory: TMemory;
     PendingRefresh: Boolean;
+    procedure Reset; override;
     procedure SetPointer(Value: Integer);
     procedure WriteData(Value: Integer);
@@ -81 +81 @@
 implementation
 
-uses
-  UInstructionWriter;
-
 { TDevice }