Changeset 219 for branches/CpuSingleSize/UAssembler.pas

Timestamp:

Oct 14, 2020, 8:04:25 PM (4 years ago)

Author:

chronos

Message:

• Added: New LDI and STI instruction for indexed access to memory.

File:

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

branches/CpuSingleSize/UAssembler.pas

@@ -174 +174 @@
       if I > 0 then
         Parser.Expect(tkSpecialSymbol, ',');
+      if InstructionInfo.Params[I] = ptNumber then begin
+        Token := Parser.ReadNext;
+        ParseNumParam(Token);
+      end else
       if InstructionInfo.Params[I] = ptReg then begin
         Token := Parser.ReadNext;
@@ -194 +198 @@
         Parser.Expect(tkSpecialSymbol, ')');
       end else
-      if InstructionInfo.Params[I] = ptNumber then begin
-        Token := Parser.ReadNext;
-        ParseNumParam(Token);
-      end;
+      if InstructionInfo.Params[I] = ptRegIndirectIndex 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;
+            ParseNumParam(Token);
+          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;