Close to updating program counter

Author: outercloudstudio

src/main/scala/main/Alu.scala

@@ -2,15 +2,11 @@ import chisel3._
 import chisel3.util._
 import _root_.circt.stage.ChiselStage
 
-object AluOperation extends ChiselEnum {
-  val Add, Sub, Mul, Div = Value
-}
-
 class Alu extends Module {
   val io = IO(new Bundle {
     val execute = Input(Bool());
 
-    val operation = Input(AluOperation());
+    val operation = Input(Operation());
     val compare = Input(Bool());
 
     val rs = Input(UInt(8.W));
@@ -30,19 +26,19 @@ class Alu extends Module {
       io.output := Cat(0.U(5.W), gt, eq, lt);
     }.otherwise {
       switch(io.operation) {
-        is(AluOperation.Add) {
+        is(Operation.Add) {
           io.output := io.rs + io.rt;
         }
 
-        is(AluOperation.Sub) {
+        is(Operation.Sub) {
           io.output := io.rs - io.rt;
         }
 
-        is(AluOperation.Mul) {
+        is(Operation.Mul) {
           io.output := io.rs * io.rt;
         }
 
-        is(AluOperation.Div) {
+        is(Operation.Div) {
           io.output := io.rs / io.rt;
         }
       }

src/main/scala/main/Core.scala

@@ -10,6 +10,8 @@ class Core extends Module {
 
     val debug_dispatcher_opcode = Output(Operation());
     val debug_dispatcher_program_pointer = Output(UInt(8.W));
+
+    val debug_thread_debug_output = Output(UInt(8.W));
   });
 
   val memory = Module(new Memory());
@@ -30,12 +32,12 @@ class Core extends Module {
   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\tdebug.thread_requesting_opcode=${io.debug_dispatcher_thread_requesting_opcode}");
-  //   printf(p"\n\tdispatcher.read_requested=${dispatcher.io.read_requested}");
-  //   printf(p"\n\tread_ready_delayed=${read_ready_delayed}\n\n");
-  // }
+  when(true.B) {
+    printf(p"\t[Core]=====");
+    printf(p"\n\tdebug_dispatcher_opcode=${io.debug_dispatcher_opcode}");
+    printf(p"\n\tdebug_dispatcher_program_pointer=${io.debug_dispatcher_program_pointer}");
+    printf(p"\n\n");
+  }
 
   io.debug_dispatcher_opcode := dispatcher.io.opcode;
   io.debug_dispatcher_program_pointer := dispatcher.io.program_pointer;
@@ -45,4 +47,6 @@ class Core extends Module {
   thread.io.operation := dispatcher.io.opcode;
   thread.io.immediate_a := 2.U(8.W);
   thread.io.immediate_b := 3.U(8.W);
+
+  io.debug_thread_debug_output := thread.io.debug_output;
 }

src/main/scala/main/Thread.scala

@@ -26,10 +26,13 @@ class Thread extends Module {
 
   val alu = Module(new Alu())
   alu.io.execute := false.B;
-  alu.io.operation := AluOperation.Add;
+  alu.io.operation := operation;
   alu.io.compare := false.B;
-  alu.io.rs := 0.U(8.W);
-  alu.io.rt := 0.U(8.W);
+  alu.io.rs := immediate_a;
+  alu.io.rt := immediate_b;
+
+  io.debug_output := alu.io.output;
+
   // val lsu = Module(new Lsu())
 
   val program_counter = Module(new ProgramCounter())
@@ -41,8 +44,6 @@ class Thread extends Module {
   program_counter.io.target_nzp := 0.U(3.W);
 
   io.program_pointer := program_counter.io.program_counter;
-  
-  io.debug_output := 0.U(8.W);
 
   io.end_of_program := end_of_program;
   io.idle := idle;
@@ -54,26 +55,9 @@ class Thread extends Module {
 
     when(operation === Operation.Add || operation === Operation.Sub || operation === Operation.Mul || operation === Operation.Div) {
       alu.io.execute := true.B;
-      
-      switch(operation) {
-        is (Operation.Add) {
-          alu.io.operation := AluOperation.Add;
-        }
-        is (Operation.Sub) {
-          alu.io.operation := AluOperation.Sub;
-        }
-        is (Operation.Mul) {
-          alu.io.operation := AluOperation.Mul;
-        }
-        is (Operation.Div) {
-          alu.io.operation := AluOperation.Div;
-        }
-      }
 
-      alu.io.rs := io.immediate_a;
-      alu.io.rt := io.immediate_b;
-      
-      io.debug_output := alu.io.output;
+      // program_counter.io.update := true.B;
+      // program_counter.io.branch := false.B;
     }
   }
 }

src/test/scala/main/AluTest.scala

@@ -6,7 +6,7 @@ class AluTest extends AnyFlatSpec with ChiselScalatestTester {
   "Alu Add" should "work" in {
     test(new Alu) { dut =>
       dut.io.execute.poke(true.B);
-      dut.io.operation.poke(AluOperation.Add);
+      dut.io.operation.poke(Operation.Add);
       dut.io.compare.poke(false.B);
       dut.io.rs.poke(2.U);
       dut.io.rt.poke(3.U);

src/test/scala/main/CoreTest.scala

@@ -10,6 +10,10 @@ class CoreTest extends AnyFlatSpec with ChiselScalatestTester {
       dut.io.debug_memory_write_data.poke(1.U(8.W));
 
       dut.clock.step(1);
+
+      // dut.io.debug_memory_write.poke(true.B);
+      // dut.io.debug_memory_write_address.poke(1.U(8.W));
+      // dut.io.debug_memory_write_data.poke(2.U(8.W));
 
       dut.clock.step(1);
 
@@ -19,6 +23,16 @@ class CoreTest extends AnyFlatSpec with ChiselScalatestTester {
 
       dut.io.debug_dispatcher_opcode.expect(Operation.Add);
       dut.io.debug_dispatcher_program_pointer.expect(0.U(8.W));
+
+      dut.clock.step(1);
+
+      dut.io.debug_thread_debug_output.expect(5.U(8.W));
+
+      dut.clock.step(1);
+
+      dut.clock.step(1);
+
+      dut.clock.step(1);
     }
   }
 }