Start connecting thread to dispatcher

Author: outercloudstudio

src/main/scala/main/Core.scala

@@ -44,11 +44,8 @@ class Core extends Module {
 
   val thread = Module(new Thread());
   thread.io.dispatcher_opcode_loaded := dispatcher.io.opcode_loaded;
-  thread.io.dispatcher_opcode := dispatcher.io.opcode;
   thread.io.dispatcher_program_pointer := dispatcher.io.program_pointer;
-
-  thread.io.operation_ready := false.B;
-  thread.io.operation := Operation.NoOp;
+  thread.io.operation := dispatcher.io.opcode;
   thread.io.immediate_a := 0.U(8.W);
   thread.io.immediate_b := 0.U(8.W);
 }

src/main/scala/main/Thread.scala

@@ -5,10 +5,8 @@ import _root_.circt.stage.ChiselStage
 class Thread extends Module {
   val io = IO(new Bundle {
     val dispatcher_opcode_loaded = Input(Bool());
-    val dispatcher_opcode = Input(Operation());
     val dispatcher_program_pointer = Input(UInt(8.W));
 
-    val operation_ready = Input(Bool());
     val operation = Input(Operation());
     val immediate_a = Input(UInt(8.W));
     val immediate_b = Input(UInt(8.W));
@@ -46,7 +44,7 @@ class Thread extends Module {
   io.end_of_program := end_of_program;
   io.idle := idle;
 
-  when(io.operation_ready) {
+  when(io.dispatcher_opcode_loaded && io.dispatcher_program_pointer === program_counter.io.program_counter) {
     operation := io.operation;
     immediate_a := io.immediate_a;
     immediate_b := io.immediate_b;

src/test/scala/main/CoreTest.scala

@@ -6,13 +6,13 @@ class CoreTest extends AnyFlatSpec with ChiselScalatestTester {
   "Core" should "work" in {
     test(new Core) { dut =>
       dut.io.debug_memory_write.poke(true.B);
-      dut.io.debug_memory_write_address.poke(1.U(8.W));
+      dut.io.debug_memory_write_address.poke(0.U(8.W));
       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(1.U(8.W));
+      dut.io.debug_dispatcher_thread_program_pointer.poke(0.U(8.W));
 
       dut.clock.step(1);
 
@@ -21,7 +21,7 @@ class CoreTest extends AnyFlatSpec with ChiselScalatestTester {
       dut.clock.step(1);
 
       dut.io.debug_dispatcher_opcode.expect(Operation.Add);
-      dut.io.debug_dispatcher_program_pointer.expect(1.U(8.W));
+      dut.io.debug_dispatcher_program_pointer.expect(0.U(8.W));
     }
   }
 }

src/test/scala/main/ThreadTest.scala

@@ -5,7 +5,8 @@ import org.scalatest.flatspec.AnyFlatSpec
 class ThreadTest extends AnyFlatSpec with ChiselScalatestTester {
   "Thread ALU Operations" should "work" in {
     test(new Thread) { dut =>
-      dut.io.operation_ready.poke(true.B);
+      dut.io.dispatcher_opcode_loaded.poke(true.B);
+      dut.io.dispatcher_program_pointer.poke(0.U(8.W));
       dut.io.operation.poke(Operation.Add);
       dut.io.immediate_a.poke(2.U);
       dut.io.immediate_b.poke(3.U);
@@ -14,7 +15,8 @@ class ThreadTest extends AnyFlatSpec with ChiselScalatestTester {
 
       dut.io.debug_output.expect(5.U);
 
-      dut.io.operation_ready.poke(true.B);
+      dut.io.dispatcher_opcode_loaded.poke(true.B);
+      dut.io.dispatcher_program_pointer.poke(0.U(8.W));
       dut.io.operation.poke(Operation.Mul);
       dut.io.immediate_a.poke(2.U);
       dut.io.immediate_b.poke(3.U);
@@ -23,7 +25,8 @@ class ThreadTest extends AnyFlatSpec with ChiselScalatestTester {
 
       dut.io.debug_output.expect(6.U);
 
-      dut.io.operation_ready.poke(true.B);
+      dut.io.dispatcher_opcode_loaded.poke(true.B);
+      dut.io.dispatcher_program_pointer.poke(0.U(8.W));
       dut.io.operation.poke(Operation.Sub);
       dut.io.immediate_a.poke(3.U);
       dut.io.immediate_b.poke(2.U);
@@ -32,7 +35,8 @@ class ThreadTest extends AnyFlatSpec with ChiselScalatestTester {
 
       dut.io.debug_output.expect(1.U);
 
-      dut.io.operation_ready.poke(true.B);
+      dut.io.dispatcher_opcode_loaded.poke(true.B);
+      dut.io.dispatcher_program_pointer.poke(0.U(8.W));
       dut.io.operation.poke(Operation.Div);
       dut.io.immediate_a.poke(6.U);
       dut.io.immediate_b.poke(3.U);