Functioning program execution

Author: outercloudstudio

src/main/scala/main/Core.scala

@@ -28,17 +28,18 @@ class Core extends Module {
   dispatcher.io.thread_requesting_opcode := thread.io.idle;
   dispatcher.io.thread_program_pointer := thread.io.program_pointer;
 
-  // val read_ready_delayed = RegNext(dispatcher.io.read_requested, false.B);
-  // dispatcher.io.read_ready := read_ready_delayed;   
-  dispatcher.io.read_ready := dispatcher.io.read_requested;   
+  val read_ready_delayed = RegNext(dispatcher.io.read_requested, false.B);
+  dispatcher.io.read_ready := read_ready_delayed;
   dispatcher.io.read_opcode := Operation.safe(memory.io.readPorts(0).data(3, 0))._1;
 
   when(true.B) {
     printf(p"\t[Core]=====");
     printf(p"\n\t\tdispatcher.io.read_requested=${dispatcher.io.read_requested}");
+    printf(p"\n\t\tread_ready_delayed=${read_ready_delayed}");
     printf(p"\n\t\tdispatcher.io.read_program_pointer=${dispatcher.io.read_program_pointer}");
     printf(p"\n\t\tdispatcher.io.read_opcode=${dispatcher.io.read_opcode}");
     // printf(p"\n\t\tread_ready_delayed=${read_ready_delayed}");
+    printf(p"\n\t\tdispatcher_read_ready=${dispatcher.io.read_ready}");
     printf(p"\n\t\tdebug_dispatcher_opcode=${io.debug_dispatcher_opcode}");
     printf(p"\n\t\tdebug_dispatcher_program_pointer=${io.debug_dispatcher_program_pointer}");
     printf(p"\n\n");

src/main/scala/main/Dispatcher.scala

@@ -38,8 +38,8 @@ class Dispatcher extends Module {
   }
 
   when(io.read_ready) {
-    // printf(p"\t[Dispatcher]=====");
-    // printf(p"\n\t\tMarked read not requested!\n\n");
+    printf(p"\t[Dispatcher]=====");
+    printf(p"\n\t\tRead Complete ${io.read_opcode}\n\n");
     opcode := io.read_opcode;
     opcode_loaded := true.B;
     program_pointer := io.read_program_pointer;

src/main/scala/main/ProgramCounter.scala

@@ -26,10 +26,8 @@ class ProgramCounter extends Module {
 
   when(io.update) {
     when(io.branch && (nzp & io.target_nzp) =/= 0.U) {
-      io.program_counter := io.jump_location;
       program_counter := io.jump_location;
     }.otherwise {
-      io.program_counter := program_counter + 1.U;
       program_counter := program_counter + 1.U;
     }
   }

src/main/scala/main/Thread.scala

@@ -53,6 +53,8 @@ class Thread extends Module {
 
       program_counter.io.update := true.B;
       program_counter.io.branch := false.B;
+
+      io.idle := false.B;
     }
   }
 
@@ -61,6 +63,7 @@ class Thread extends Module {
     printf(p"\n\t\tio.operation=${io.operation}");
     printf(p"\n\t\tprogram_pointer=${program_counter.io.program_counter}");
     printf(p"\n\t\tidle=${idle}");
+    printf(p"\n\t\tio.idle=${io.idle}");
     printf(p"\n\t\tio.debug_output=${io.debug_output}");
     printf(p"\n\n");
   }

src/test/scala/main/ProgramCounterTest.scala

@@ -6,6 +6,9 @@ class ProgramCounterTest extends AnyFlatSpec with ChiselScalatestTester {
   "Program Counter Increment" should "work" in {
     test(new ProgramCounter) { dut =>
       dut.io.update.poke(true.B);
+
+      dut.clock.step(1);
+
       dut.io.program_counter.expect(1.U);
     }
   }
@@ -22,6 +25,8 @@ class ProgramCounterTest extends AnyFlatSpec with ChiselScalatestTester {
       dut.io.jump_location.poke(8.U);
       dut.io.target_nzp.poke(1.U);
 
+      dut.clock.step(1);
+
       dut.io.program_counter.expect(8.U);
     }
   }
@@ -38,6 +43,8 @@ class ProgramCounterTest extends AnyFlatSpec with ChiselScalatestTester {
       dut.io.jump_location.poke(8.U);
       dut.io.target_nzp.poke(2.U);
 
+      dut.clock.step(1);
+
       dut.io.program_counter.expect(1.U);
     }
   }