Context Navigation

-              r31
+              r32
 unit UInstructionWriter;
+unit UAssembler;
 interface
 …
   end;
+  { TLabel }
   TLabel = class
     Name: string;
     Address: TAddress;
     ForwardRefs: array of TAddress;
+    procedure AddForwardRef(Address: TAddress);
   end;
 …
   end;
   { TInstructionWriter }
   TInstructionWriter = class
+  { TAssembler }
+  TAssembler = class
   private
     InstructionDefs: TInstructionDefs;
 …
     LineNumber: Integer;
     function ParseText(var Text: string; Separator: Char): string;
+    function ParseConst(Text: string; out Value: Integer): Boolean;
+    function ParseLabel(Text: string; out Value: Integer): Boolean;
+    function ParseNumber(Text: string; out Value: Integer): Boolean;
     procedure WriteParam(Param: TInstructionParam; var Text: string);
     procedure Error(Text: string);
 …
     IP: Integer;
     procedure Parse(Lines: TStrings);
     procedure Write(Text: string);
+    procedure ParseLine(Text: string);
     procedure WriteInstruction(Instruction: TInstruction);
     procedure WriteAddress(Address: TAddress);
 …
 implementation
+{ TLabel }
+procedure TLabel.AddForwardRef(Address: TAddress);
+begin
+  SetLength(ForwardRefs, Length(ForwardRefs) + 1);
+  ForwardRefs[Length(ForwardRefs) - 1] := Address;
+end;
 { TConstants }
 …
 { TInstructionWriter }
 function TInstructionWriter.ParseText(var Text: string; Separator: Char
+{ TAssembler }
+function TAssembler.ParseText(var Text: string; Separator: Char
   ): string;
 var
 …
 end;
+procedure TInstructionWriter.WriteParam(Param: TInstructionParam; var Text: string);
+function TAssembler.ParseConst(Text: string; out Value: Integer): Boolean;
+var
+  FoundConstant: TConstant;
+begin
+  FoundConstant := Constants.SearchByName(UpperCase(Text));
+  if Assigned(FoundConstant) then begin
+    Result := True;
+    Value := FoundConstant.Value;
+  end;
+  Result := False;
+end;
+function TAssembler.ParseLabel(Text: string; out Value: Integer): Boolean;
+var
+  FoundLabel: TLabel;
+begin
+  Result := True;
+  FoundLabel := Labels.SearchByName(UpperCase(Text));
+  if Assigned(FoundLabel) then begin
+    // Existing label
+    if FoundLabel.Address = -1 then begin
+      FoundLabel.AddForwardRef(IP);
+      Value := 0;
+    end else
+      Value := FoundLabel.Address;
+  end else begin
+    // Forward label reference
+    with Labels.AddNew(UpperCase(Text), -1) do begin
+      AddForwardRef(IP);
+    end;
+    Value := 0;
+  end;
+end;
+function TAssembler.ParseNumber(Text: string; out Value: Integer): Boolean;
+begin
+  if TryStrToInt(Text, Value) then begin
+    Result := True;
+  end else
+    Result := False;
+end;
+procedure TAssembler.WriteParam(Param: TInstructionParam; var Text: string);
 var
   Address: string;
 …
           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;
+        ParseLabel(Address, Value);
+        WriteAddress(Value);
       end;
     end;
 …
             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;
+          ParseLabel(Address, Value);
+          WriteAddress(Value);
         end;
       end else Error('Expected indirect address ' + Address);
 …
           Exit;
         end;
+        FoundLabel := Labels.SearchByName(UpperCase(Address));
+        if Assigned(FoundLabel) then begin
+          // Existing label
+          WriteData(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;
+          WriteData(0);
+        end;
+        ParseLabel(Address, Value);
+        WriteData(Value);
       end;
     end;
 …
 end;
 procedure TInstructionWriter.Error(Text: string);
+procedure TAssembler.Error(Text: string);
 begin
   raise Exception.Create(IntToStr(LineNumber) + ': ' + Text);
 end;
 procedure TInstructionWriter.Parse(Lines: TStrings);
+procedure TAssembler.Parse(Lines: TStrings);
 var
   I: Integer;
 …
   for I := 0 to Lines.Count - 1 do begin
     LineNumber := I + 1;
     Write(Lines[I]);
+    ParseLine(Lines[I]);
   end;
   for I := 0 to Labels.Count - 1 do begin
 …
 end;
 procedure TInstructionWriter.Write(Text: string);
+procedure TAssembler.ParseLine(Text: string);
 var
   FoundLabel: TLabel;
 …
   Lines: TStringList;
   Param: string;
+  Num: Integer;
 begin
   // Remove comments
 …
     if InstructionName = 'dd' then begin
       while Text <> '' do begin
         Param := ParseText(Text, ',');
+        Param := Trim(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 begin
+          if ParseNumber(Param, Num) then
+            WriteCardinal(Num)
+          else if ParseConst(Param, Num) then
+            WriteCardinal(Num)
+          else if ParseLabel(Param, Num) then
+            WriteCardinal(Num);
+        end;
+      end;
+    end else
+    if InstructionName = 'org' then begin
+      IP := StrToInt(Text);
     end else Error('Unsupported directive name ' + InstructionName);
   end else begin
 …
 end;
 procedure TInstructionWriter.WriteInstruction(Instruction: TInstruction);
+procedure TAssembler.WriteInstruction(Instruction: TInstruction);
 begin
   Memory.Data[IP] := Byte(Instruction);
 …
 end;
 procedure TInstructionWriter.WriteAddress(Address: TAddress);
+procedure TAssembler.WriteAddress(Address: TAddress);
 begin
   PAddress(@Memory.Data[IP])^ := Address;
 …
 end;
 procedure TInstructionWriter.WriteData(Data: TData);
+procedure TAssembler.WriteData(Data: TData);
 begin
   PData(@Memory.Data[IP])^ := Data;
 …
 end;
 procedure TInstructionWriter.WriteIndex(Index: Byte);
+procedure TAssembler.WriteIndex(Index: Byte);
 begin
   Memory.Data[IP] := Index;
 …
 end;
 procedure TInstructionWriter.WriteReg(Index: Byte);
+procedure TAssembler.WriteReg(Index: Byte);
 begin
   Memory.Data[IP] := Index;
 …
 end;
 procedure TInstructionWriter.WriteByte(Value: Byte);
+procedure TAssembler.WriteByte(Value: Byte);
 begin
   Memory.Data[IP] := Value;
 …
 end;
 procedure TInstructionWriter.WriteWord(Value: Word);
+procedure TAssembler.WriteWord(Value: Word);
 begin
   PWord(@Memory.Data[IP])^ := Value;
 …
 end;
 procedure TInstructionWriter.WriteCardinal(Value: Cardinal);
+procedure TAssembler.WriteCardinal(Value: Cardinal);
 begin
   PCardinal(@Memory.Data[IP])^ := Value;
 …
 end;
 constructor TInstructionWriter.Create;
+constructor TAssembler.Create;
 begin
   Labels := TLabels.Create;
 …
     AddNew(inOr, 'OR', ipRegIndex, ipRegIndex);
     AddNew(inXor, 'XOR', ipRegIndex, ipRegIndex);
+  end;
+end;
+destructor TInstructionWriter.Destroy;
+    AddNew(inInt, 'INT', ipIndex);
+    AddNew(inReti, 'RETI');
+    AddNew(inEnableInt, 'EI');
+    AddNew(inDisableInt, 'DI');
+  end;
+end;
+destructor TAssembler.Destroy;
 begin
   FreeAndNil(InstructionDefs);

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 32 for branches/UltimatOS/UAssembler.pas

Legend:

branches/UltimatOS

branches/UltimatOS/UAssembler.pas

Download in other formats: