Changeset 218 for branches

Timestamp:

Oct 14, 2020, 7:51:40 PM (4 years ago)

Author:

chronos

Message:

• Added: Support for indirect instruction parameters used mailny for LD, ST, IN and OUT.

Location:

branches/CpuSingleSize

Files:

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

branches/CpuSingleSize/Sample.asm

@@ -1 @@
-     DB   Start, KeyInterrupt
+     DB   Start, KeyInterrupt, 'ABC', 123
      NOP
      NOP
@@ -19 +19 @@
     ;SET  R0, 6
 LOOP2:
-    SET  R0, HELLO
+    SET  R0, Hello
     SET  R1, 12
-    CALL WRITESTR
+    CALL WriteStr
     
 ;    SET  R0, 0
@@ -44 +44 @@
     PUSH R3
 LDIR_LOOP:
-    LD   R3, R0
-    ST   R1, R3
+    LD   R3, (R0)
+    ST   (R1), R3
     INC  R0
     INC  R1
@@ -54 +54 @@
     
 SETR:
-    ST   R0, R2
+    ST   (R0), R2
     INC  R0
     DEC  R1
@@ -60 +60 @@
     RET
 
-WRITESTR:
+WriteStr:
     PUSH R2
     PUSH R3
     SET  R3, 0
-WRITESTR_LOOP:
-    LD   R2, R0    
-    OUT  R3, R2
+WriteStrLoop:
+    LD   R2, (R0)
+    OUT  (R3), R2
     INC  R0
     DEC  R1
-    JNZ  R1, WRITESTR_LOOP
+    JNZ  R1, WriteStrLoop
     POP  R3
     POP  R2
@@ -80 +80 @@
     SET  R0, 1 
     SET  R1, 0  
-    OUT  R0, R1
+    OUT  (R0), R1
     SET  R0, 3
-    IN   R1, R0
+    IN   R1, (R0)
     SET  R0, 4
-    IN   R2, R0
+    IN   R2, (R0)
     MUL  R2, R1
     SET  R0, 2 
     SET  R1, 120
 ClearScreenLoop:
-    OUT  R0, R1
+    OUT  (R0), R1
     DEC  R2
     JNZ  R2, ClearScreenLoop
@@ -97 +97 @@
     RET
     
-HELLO:
+Hello:
     DB   'Hello friend'
 
@@ -105 +105 @@
     PUSH R2
     SET  R3, 0
-    IN   R2, R3
-    OUT  R3, R2
+    IN   R2, (R3)
+    OUT  (R3), R2
     POP  R2
     POP  R3

branches/CpuSingleSize/UAssembler.pas

@@ -162 +162 @@
   Token: TToken;
   LastPos: TParserPos;
+  Number: Integer;
 begin
   Result := False;
@@ -173 +174 @@
       if I > 0 then
         Parser.Expect(tkSpecialSymbol, ',');
-      Token := Parser.ReadNext;
       if InstructionInfo.Params[I] = ptReg then begin
-        if (Token.Value <> '') and (Token.Value[1] = 'R') then
-          Token.Value := Copy(Token.Value, 2, MaxInt)
-          else Error('Expected register name.', Token.Pos);
-        Memory.Write(StrToInt(Token.Value));
+        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
+            Memory.Write(Number)
+            else Error('Expected numeric register index error', Token.Pos);
+        end else Error('Expected register name starting with R character.', Token.Pos);
+      end else
+      if InstructionInfo.Params[I] = ptRegIndirect 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
+            Memory.Write(Number)
+            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
       if InstructionInfo.Params[I] = ptNumber then begin
+        Token := Parser.ReadNext;
         ParseNumParam(Token);
       end;

branches/CpuSingleSize/UDisassembler.pas

@@ -55 +55 @@
             InstText := InstText + 'R' + IntToStr(Value);
           end else
+          if InstructionInfo.Params[J] = ptRegIndirect then begin
+            InstText := InstText + '(R' + IntToStr(Value) + ')';
+          end else
           if InstructionInfo.Params[J] = ptNumber then begin
             InstText := InstText + IntToHex(Value, 8);

branches/CpuSingleSize/UInstructions.pas

@@ -9 +9 @@
 
 type
-  TParamType = (ptNone, ptNumber, ptReg);
+  TParamType = (ptNone, ptNumber, ptReg, ptRegIndirect);
   TParamTypeArray = array of TParamType;
+
   TInstructionInfo = class
     Instruction: TInstruction;
@@ -77 +78 @@
   AddNew(inInc, 'INC', [ptReg], 'Increments value in specified register.');
   AddNew(inDec, 'DEC', [ptReg], 'Decrements value in specified register.');
-  AddNew(inLoad, 'LD', [ptReg, ptReg], 'Loads value from memory to register.');
-  AddNew(inStore, 'ST', [ptReg, ptReg], 'Stores value from register to memory.');
+  AddNew(inLoad, 'LD', [ptReg, ptRegIndirect], 'Loads value from memory to register.');
+  AddNew(inStore, 'ST', [ptRegIndirect, ptReg], 'Stores value from register to memory.');
   AddNew(inAdd, 'ADD', [ptReg, ptReg], 'Adds second register to first register.');
   AddNew(inSub, 'SUB', [ptReg, ptReg], 'Subtracts second register from first register.');
-  AddNew(inIn, 'IN', [ptReg, ptReg], 'Reads value from input port to register.');
-  AddNew(inOut, 'OUT', [ptReg, ptReg], 'Writes value from register to output port.');
+  AddNew(inIn, 'IN', [ptReg, ptRegIndirect], 'Reads value from input port to register.');
+  AddNew(inOut, 'OUT', [ptRegIndirect, ptReg], 'Writes value from register to output port.');
   AddNew(inJumpZero, 'JZ', [ptReg, ptNumber], 'Jumps to given address if value of register is zero');
   AddNew(inJumpNotZero, 'JNZ', [ptReg, ptNumber], 'Jumps to given address if value of register is not zero');

branches/CpuSingleSize/UParser.pas

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