Changeset 10 for branches/ByteArray/Assembler.pas

Timestamp:

Aug 7, 2024, 12:12:42 AM (2 months ago)

Author:

chronos

Message:

• Modified: Improved serial console handling.

File:

• branches/ByteArray/Assembler.pas (modified) (9 diffs)

branches/ByteArray/Assembler.pas

@@ -29 +29 @@
     function ParseOrg: Boolean;
     function ParseInstruction: Boolean;
-    function ParseInstructionParameter(ParamType: TParamType; Memory: TMemory): Boolean;
+    function ParseInstructionParameter(ParamType: TParamType; Memory: TMemory;
+      Offset: Integer): Boolean;
     function ParseLabel: Boolean;
     procedure UpdateLabelRefs;
-    function ParseNumParam(out Number: TInt): Boolean;
+    function ParseNumParam(Offset: Integer; out Number: TInt): Boolean;
     function ParseReg(out RegIndex: TRegIndex): Boolean;
     function ParseDataWidth(out Size: TIntSize): Boolean;
@@ -96 +97 @@
 end;
 
-function TAssembler.ParseNumParam(out Number: TInt): Boolean;
+function TAssembler.ParseNumParam(Offset: Integer; out Number: TInt): Boolean;
 var
   Token: TToken;
@@ -116 +117 @@
       Result := True;
     end else begin
-      LabelRefs.Add(TLabelRef.Create(Token.Value, Memory.Position + 1, Parser.Pos.Pos));
+      LabelRefs.Add(TLabelRef.Create(Token.Value, Memory.Position + 1 + Offset, Parser.Pos.Pos));
       Number := 0;
       Result := True;
@@ -252 +253 @@
     Result := True;
     while True do begin
-      if ParseNumParam(Number) then begin
+      if ParseNumParam(0, Number) then begin
         Memory.WritePos(1, Number);
       end else begin
@@ -333 +334 @@
           LastMessagesCount := Messages.Count;
           ParamMemory.Clear;
-          if ParseInstructionParameter(ParamType, ParamMemory) and
+          if ParseInstructionParameter(ParamType, ParamMemory, InstructionMemory.Position) and
             (LastMessagesCount = Messages.Count) then begin
             ParamOk := True;
@@ -379 +380 @@
 end;
 
-function TAssembler.ParseInstructionParameter(ParamType: TParamType; Memory: TMemory): Boolean;
+function TAssembler.ParseInstructionParameter(ParamType: TParamType; Memory: TMemory;
+  Offset: Integer): Boolean;
 var
   LastPos: TParserPos;
@@ -391 +393 @@
   case ParamType of
     ptData: begin
-      if ParseNumParam(Number) then Memory.WritePos(InstDataWidth, Number)
+      if ParseNumParam(Offset, Number) then
+      Memory.WritePos(InstDataWidth, Number)
         else begin
           Error(SExpectedNumber, Parser.Pos.Pos);
@@ -398 +401 @@
     end;
     ptAddress: begin
-      if ParseNumParam(Number) then Memory.WritePos(InstAddressWidth, Number)
+      if ParseNumParam(Offset, Number) then
+      Memory.WritePos(InstAddressWidth, Number)
         else begin
           Error(SExpectedNumber, Parser.Pos.Pos);
@@ -425 +429 @@
         Memory.WritePos(1, Byte(RegIndex));
         if not Parser.Expect(tkSpecialSymbol, '+') then Result := False;
-        if ParseNumParam(Number) then Memory.WritePos(InstAddressWidth, Number)
+        if ParseNumParam(Offset, Number) then Memory.WritePos(InstAddressWidth, Number)
           else begin
             Error(SExpectedNumericIndex, Parser.Pos.Pos);