Use thread to drive dispatcher

Author: outercloudstudio

src/main/scala/main/Core.scala

@@ -8,15 +8,13 @@ class Core extends Module {
     val debug_memory_write_address = Input(UInt(8.W));
     val debug_memory_write_data = Input(UInt(8.W));
 
-    val debug_dispatcher_thread_requesting_opcode = Input(Bool());
-    val debug_dispatcher_thread_program_pointer = Input(UInt(8.W));
-
     val debug_dispatcher_opcode = Output(Operation());
     val debug_dispatcher_program_pointer = Output(UInt(8.W));
   });
 
   val memory = Module(new Memory());
   val dispatcher = Module(new Dispatcher());
+  val thread = Module(new Thread());
 
   memory.io.readPorts(0).enable := dispatcher.io.read_requested;
   memory.io.readPorts(0).address := dispatcher.io.read_program_pointer;
@@ -25,8 +23,8 @@ class Core extends Module {
   memory.io.writePorts(0).address := io.debug_memory_write_address;
   memory.io.writePorts(0).data := io.debug_memory_write_data;
 
-  dispatcher.io.thread_requesting_opcode := io.debug_dispatcher_thread_requesting_opcode;
-  dispatcher.io.thread_program_pointer := io.debug_dispatcher_thread_program_pointer;
+  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;   
@@ -42,10 +40,9 @@ class Core extends Module {
   io.debug_dispatcher_opcode := dispatcher.io.opcode;
   io.debug_dispatcher_program_pointer := dispatcher.io.program_pointer;
 
-  val thread = Module(new Thread());
   thread.io.dispatcher_opcode_loaded := dispatcher.io.opcode_loaded;
   thread.io.dispatcher_program_pointer := dispatcher.io.program_pointer;
   thread.io.operation := dispatcher.io.opcode;
-  thread.io.immediate_a := 0.U(8.W);
-  thread.io.immediate_b := 0.U(8.W);
+  thread.io.immediate_a := 2.U(8.W);
+  thread.io.immediate_b := 3.U(8.W);
 }

src/main/scala/main/Thread.scala

@@ -11,6 +11,7 @@ class Thread extends Module {
     val immediate_a = Input(UInt(8.W));
     val immediate_b = Input(UInt(8.W));
 
+    val program_pointer = Output(UInt(8.W));
     val end_of_program = Output(Bool()); 
     val idle = Output(Bool());
     val debug_output = Output(UInt(8.W));
@@ -38,6 +39,8 @@ class Thread extends Module {
   program_counter.io.branch := false.B;
   program_counter.io.jump_location := 0.U(8.W);
   program_counter.io.target_nzp := 0.U(3.W);
+
+  io.program_pointer := program_counter.io.program_counter;
 
   io.debug_output := 0.U(8.W);
 

src/test/scala/main/CoreTest.scala

@@ -10,9 +10,6 @@ class CoreTest extends AnyFlatSpec with ChiselScalatestTester {
       dut.io.debug_memory_write_data.poke(1.U(8.W));
 
       dut.clock.step(1);
-
-      dut.io.debug_dispatcher_thread_requesting_opcode.poke(true.B);
-      dut.io.debug_dispatcher_thread_program_pointer.poke(0.U(8.W));
 
       dut.clock.step(1);