Changeset 219 for branches

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.

Location:

branches/CpuSingleSize

Files:

• Sample.asm (modified) (1 diff)
• UAssembler.pas (modified) (2 diffs)
• UCpu.pas (modified) (3 diffs)
• UDisassembler.pas (modified) (2 diffs)
• UInstructions.pas (modified) (2 diffs)
• UParser.pas (modified) (1 diff)

branches/CpuSingleSize/Sample.asm

@@ -110 +110 @@
     POP  R3
     RET
+
+Test:
+     LDI R0, (R1 + 1)
+     STI (R1 + 12), R2

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;

branches/CpuSingleSize/UCpu.pas

@@ -12 +12 @@
     inAdd, inSub, inIn, inOut, inJump, inJumpZero, inJumpNotZero, inPush, inPop,
     inCall, inRet, inAnd, inOr, inXor, inShl, inShr, inMul, inDiv, inMod,
-    inJumpRel);
+    inJumpRel, inLoadIndex, inStoreIndex);
 
   TInteger = Integer;
@@ -114 +114 @@
   Index: TInteger;
   Port: TInteger;
+  Dest: TInteger;
 begin
   Instruction := TInstruction(ReadNext);
@@ -207 +208 @@
       R[Index] := R[Index] mod R[ReadNext];
     end;
+    inLoadIndex: R[ReadNext] := Data[R[ReadNext] + ReadNext];
+    inStoreIndex: Data[R[ReadNext] + ReadNext] := R[ReadNext];
   end;
   Inc(Ticks);

branches/CpuSingleSize/UDisassembler.pas

@@ -52 +52 @@
             InstText := InstText + ', ' else
             InstText := InstText + ' ';
+          if InstructionInfo.Params[J] = ptNumber then begin
+            InstText := InstText + IntToHex(Value, 8);
+          end else
           if InstructionInfo.Params[J] = ptReg then begin
             InstText := InstText + 'R' + IntToStr(Value);
@@ -58 +61 @@
             InstText := InstText + '(R' + IntToStr(Value) + ')';
           end else
-          if InstructionInfo.Params[J] = ptNumber then begin
-            InstText := InstText + IntToHex(Value, 8);
+          if InstructionInfo.Params[J] = ptRegIndirectIndex then begin
+            InstText := InstText + '(R' + IntToStr(Value);
+            Value := Memory.Read;
+            InstBytes := InstBytes + IntToHex(Value, 2) + ' ';
+            InstText := InstText + ' + ' + IntToStr(Value) + ')';
           end;
         end;
-        InstBytes := InstBytes + DupeString(' ', 10 - Length(InstBytes));
+        InstBytes := InstBytes + DupeString(' ', 13 - Length(InstBytes));
       end;
     end;

branches/CpuSingleSize/UInstructions.pas

@@ -9 +9 @@
 
 type
-  TParamType = (ptNone, ptNumber, ptReg, ptRegIndirect);
+  TParamType = (ptNone, ptNumber, ptReg, ptRegIndirect, ptRegIndirectIndex);
   TParamTypeArray = array of TParamType;
 
@@ -100 +100 @@
   AddNew(inJump, 'JP', [ptNumber], 'Unconditional absolute jump to defined address.');
   AddNew(inJumpRel, 'JR', [ptNumber], 'Unconditional relative jump to defined address.');
+  AddNew(inLoadIndex, 'LDI', [ptReg, ptRegIndirectIndex], 'Loads value from memory with numeric index to register.');
+  AddNew(inStoreIndex, 'STI', [ptRegIndirectIndex, ptReg], 'Stores value from register to memory with numeric index .');
 end;
 

branches/CpuSingleSize/UParser.pas

@@ -87 +87 @@
 function TParser.IsSpecialSymbol(C: Char): Boolean;
 begin
-  Result := (C = ':') or (C = ',') or (C = '(') or (C = ')');
+  Result := (C = ':') or (C = ',') or (C = '(') or (C = ')') or (C = '+');
 end;