Changeset 179

Timestamp:

Apr 12, 2019, 3:23:47 PM (6 years ago)

Author:

chronos

Message:

• Added: Subroutine execution.

Location:

branches/virtualcpu4

Files:

• UFormMain.pas (modified) (5 diffs)
• UInstructionWriter.pas (modified) (2 diffs)
• UMachine.pas (modified) (1 diff)

branches/virtualcpu4/UFormMain.pas

@@ -187 +187 @@
   R3: Byte;
   R4: Byte;
-  LabelStart: Integer;
   LabelText: Integer;
+  LabelText2: Integer;
   LabelPrint: Integer;
   LabelClearScreen: Integer;
+  LabelPrintLoop: Integer;
+  LabelConsole: Integer;
+  LabelMain: Integer;
 begin
   R1 := 1;
@@ -198 +201 @@
   with InstructionWriter do begin
     Init;
-    // Print Hello world text
-    LabelText := 200;
-    Loadi(R1, LabelText);
-    Loadi(R2, 12);
+    LabelMain := $100;
+    Jump(LabelMain);
+
+  LabelText := IP;
+    WriteString('Hello World!');
+
+  LabelText2 := IP;
+    WriteString('Good day!');
+
   LabelPrint := IP;
+    Push(R3);
+    Push(R2);
+    Push(R1);
+  LabelPrintLoop := IP;
     DataPrefix8; LoadMem(R3, R1);
     DataPrefix8; Output(0, R3);
@@ -208 +220 @@
     Decrement(R2);
     Test(R2);
-    JumpNotZero(LabelPrint);
+    AddrPrefix8; JumpNotZero(LabelPrintLoop);
+    Pop(R1);
+    Pop(R2);
+    Pop(R3);
+    Return;
+
+    IP := LabelMain;
+
+    // Print Hello world text
+    Loadi(R1, LabelText);
+    Loadi(R2, 12);
+    Call(LabelPrint);
+    Loadi(R1, LabelText2);
+    Loadi(R2, 9);
+    Call(LabelPrint);
 
     // Draw to video memory
@@ -231 +257 @@
     // Read keyboard and print to console
     Loadi(R1, 100);
-  LabelStart := IP;
+  LabelConsole := IP;
     Increment(R1);
     Loadi(R2, $100);
@@ -237 +263 @@
     DataPrefix8; Input(R2, 0);
     DataPrefix8; Output(0, R2);
-    Jump(LabelStart);
+    Jump(LabelConsole);
+
     Halt;
-  IP := LabelText;
-    WriteString('Hello World!');
   end;
 end;

branches/virtualcpu4/UInstructionWriter.pas

@@ -47 +47 @@
     procedure Push(Reg: TRegIndex);
     procedure Pop(Reg: TRegIndex);
+    procedure Call(Addr: QWord);
+    procedure Return;
     procedure DataPrefix8;
     procedure DataPrefix16;
@@ -205 +207 @@
 end;
 
+procedure TInstructionWriter.Call(Addr: QWord);
+begin
+  PrefixBegin;
+  Write8(Byte(opCall));
+  WriteAddress(Addr);
+  PrefixEnd;
+end;
+
+procedure TInstructionWriter.Return;
+begin
+  PrefixBegin;
+  Write8(Byte(opRet));
+  PrefixEnd;
+end;
+
 procedure TInstructionWriter.DataPrefix8;
 begin

branches/virtualcpu4/UMachine.pas

@@ -54 +54 @@
   Screen := TScreen.Create;
   Screen.Size := Point(320, 240);
-  Screen.MemoryBase := $100;
+  Screen.MemoryBase := $200;
   MemorySize := $1000000;
   Cpu.Memory := Memory;