Changeset 220 for branches/CpuSingleSize/UAssembler.pas

Timestamp:

Oct 20, 2020, 1:10:09 AM (4 years ago)

Author:

chronos

Message:

• Added: Devices form with tree view of connected devices. Device control form can be opened by double click.
• Modifid: IN/OUT instructions now use also device group index to directly specify which device should be read/written.

File:

• branches/CpuSingleSize/UAssembler.pas (modified) (7 diffs)

branches/CpuSingleSize/UAssembler.pas

@@ -25 +25 @@
     FOnError: TErrorEvent;
     Parser: TParser;
+    function ParseVar: Boolean;
     function ParseDb: Boolean;
     function ParseOrg: Boolean;
@@ -36 +37 @@
     Labels: TDictionary<string, Integer>;
     LabelRefs: TList<TLabelRef>;
+    Variables: TDictionary<string, Integer>;
     Messages: TMessages;
     procedure Error(Text: string; Pos: TPoint);
@@ -81 +83 @@
   end else
   if Token.Kind = tkIdentifier then begin;
+    if Variables.TryGetValue(Token.Value, Addr) then begin
+      Memory.Write(Addr);
+    end else
     if Labels.TryGetValue(Token.Value, Addr) then begin
       Memory.Write(Addr);
@@ -107 +112 @@
   while not Parser.CheckNextKind(tkEof) do begin
     ParseLabel;
+    if ParseVar then begin
+    end else
     if ParseDb then begin
     end else
@@ -119 +126 @@
   UpdateLabelRefs;
   Error('Compilation finished.', Point(0, 0));
+end;
+
+function TAssembler.ParseVar: Boolean;
+var
+  TokenName: TToken;
+  TokenValue: TToken;
+  Number: TInteger;
+begin
+  Result := False;
+  if Parser.CheckNextAndRead(tkIdentifier, 'VAR') then begin
+    Result := True;
+    while True do begin
+      TokenName := Parser.ReadNext;
+      if TokenName.Kind = tkIdentifier then begin
+        TokenValue := Parser.ReadNext;
+        if TokenValue.Kind = tkNumber then begin
+          if not Labels.ContainsKey(TokenName.Value) then begin
+            if TryStrToInt(TokenValue.Value, Number) then
+              Variables.Add(TokenName.Value, Number)
+            else Error('Expected number', TokenValue.Pos);
+          end else Error('Duplicate variable name ' + TokenName.Value, TokenName.Pos);
+        end else Error('Expected variable value.', TokenValue.Pos);
+      end else Error('Expected variable name.', TokenName.Pos);
+      if Parser.CheckNextAndRead(tkSpecialSymbol, ',') then begin
+        Continue;
+      end;
+      Break;
+    end;
+  end;
 end;
 
@@ -212 +248 @@
         Parser.Expect(tkSpecialSymbol, ')');
       end else
+      if InstructionInfo.Params[I] = ptRegIndirectGroup then begin
+        Parser.Expect(tkSpecialSymbol, '(');
+        Token := Parser.ReadNext;
+        if (Token.Value <> '') and (Token.Value[1] = 'R') then begin
+          Token.Value := Copy(Token.Value, 2, MaxInt);
+          if TryStrToInt(Token.Value, Number) then begin
+            Memory.Write(Number);
+            Parser.Expect(tkSpecialSymbol, ':');
+            Token := Parser.ReadNext;
+            if (Token.Value <> '') and (Token.Value[1] = 'R') then begin
+              Token.Value := Copy(Token.Value, 2, MaxInt);
+              if TryStrToInt(Token.Value, Number) then begin
+                Memory.Write(Number);
+              end else Error('Expected numeric register index error', Token.Pos);
+            end else Error('Expected register name starting with R character.', Token.Pos);
+          end else Error('Expected numeric register index error', Token.Pos);
+        end else Error('Expected register name starting with R character.', Token.Pos);
+        Parser.Expect(tkSpecialSymbol, ')');
+      end else
     end;
   end;
@@ -271 +326 @@
   Labels := TDictionary<string, Integer>.Create;
   LabelRefs := TList<TLabelRef>.Create;
+  Variables := TDictionary<string, Integer>.Create;
 end;
 
 destructor TAssembler.Destroy;
 begin
+  FreeAndNil(Variables);
   FreeAndNil(Labels);
   FreeAndNil(LabelRefs);