Working operation lock in thread

Author: outercloudstudio

…/disabled-tests/ProgramCounterTest.scala …/disabled-tests/ProgramPointerTest.scalasrc/main/disabled-tests/ProgramCounterTest.scala renamed to src/main/disabled-tests/ProgramPointerTest.scala src/main/disabled-tests/ProgramCounterTest.scala renamed to src/main/disabled-tests/ProgramPointerTest.scala

@@ -2,19 +2,19 @@ import chisel3._
 import chiseltest._
 import org.scalatest.flatspec.AnyFlatSpec
 
-class ProgramCounterTest extends AnyFlatSpec with ChiselScalatestTester {
-  "Program Counter Increment" should "work" in {
-    test(new ProgramCounter) { dut =>
+class ProgramPointerTest extends AnyFlatSpec with ChiselScalatestTester {
+  "Program Pointer Increment" should "work" in {
+    test(new ProgramPointer) { dut =>
       dut.io.update.poke(true.B);
 
       dut.clock.step(1);
 
-      dut.io.program_counter.expect(1.U);
+      dut.io.pointer.expect(1.U);
     }
   }
 
-  "Program Counter Jump" should "work" in {
-    test(new ProgramCounter) { dut =>
+  "Program Pointer Jump" should "work" in {
+    test(new ProgramPointer) { dut =>
       dut.io.store_nzp.poke(true.B);
       dut.io.nzp.poke(1.U);
 
@@ -27,12 +27,12 @@ class ProgramCounterTest extends AnyFlatSpec with ChiselScalatestTester {
 
       dut.clock.step(1);
 
-      dut.io.program_counter.expect(8.U);
+      dut.io.pointer.expect(8.U);
     }
   }
 
-  "Program Counter Jump Fail" should "work" in {
-    test(new ProgramCounter) { dut =>
+  "Program Pointer Jump Fail" should "work" in {
+    test(new ProgramPointer) { dut =>
       dut.io.store_nzp.poke(true.B);
       dut.io.nzp.poke(1.U);
 
@@ -45,7 +45,7 @@ class ProgramCounterTest extends AnyFlatSpec with ChiselScalatestTester {
 
       dut.clock.step(1);
 
-      dut.io.program_counter.expect(1.U);
+      dut.io.pointer.expect(1.U);
     }
   }
 }

src/main/scala/main/Core.scala

@@ -74,15 +74,15 @@ class Core extends Module {
   io.debug_dispatcher_opcode := dispatcher.io.opcode;
   io.debug_dispatcher_program_pointer := dispatcher.io.program_pointer;
 
-  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.operation_pointer := dispatcher.io.program_pointer;
   thread.io.src_register := dispatcher.io.src_register;
   thread.io.dst_register := dispatcher.io.dst_register;
   thread.io.immediate := Cat(
     dispatcher.io.read_immediate_u,
     dispatcher.io.read_immediate_l
   );
+  thread.io.operation_loaded := dispatcher.io.opcode_loaded;
 
   io.debug_thread_debug_output := thread.io.debug_output;
 }

src/main/scala/main/Main.scala

@@ -7,7 +7,7 @@ import _root_.circt.stage.ChiselStage
 object Main extends App {
     emitVerilog(new Alu(), Array("--target-dir", "generated"));
     emitVerilog(new Lsu(), Array("--target-dir", "generated"));
-    emitVerilog(new ProgramCounter(), Array("--target-dir", "generated"));
+    emitVerilog(new ProgramPointer(), Array("--target-dir", "generated"));
 
     test(new Lsu) { dut =>
         dut.io.write.poke(true.B);

src/main/scala/main/ProgramCounter.scala src/main/scala/main/ProgramPointer.scalasrc/main/scala/main/ProgramCounter.scala renamed to src/main/scala/main/ProgramPointer.scala

@@ -2,33 +2,33 @@ import chisel3._
 import chisel3.util._
 import _root_.circt.stage.ChiselStage
 
-class ProgramCounter extends Module {
+class ProgramPointer extends Module {
   val io = IO(new Bundle {
     val store_nzp = Input(Bool());
     val nzp = Input(UInt(3.W));
 
     val update = Input(Bool());
     val branch = Input(Bool());
-    val jump_location = Input(UInt(8.W));
+    val jump_location = Input(UInt(16.W));
     val target_nzp = Input(UInt(3.W));
 
-    val program_counter = Output(UInt(8.W)); 
+    val pointer = Output(UInt(16.W)); 
   })
 
   val nzp = RegInit(0.U(3.W));
 
-  val program_counter = RegInit(0.U(8.W));
-  io.program_counter := program_counter;
+  val pointer = RegInit(0.U(16.W));
+  io.pointer := pointer;
 
   when(io.store_nzp) {
     nzp := io.nzp;
   }
 
   when(io.update) {
     when(io.branch && (nzp & io.target_nzp) =/= 0.U) {
-      program_counter := io.jump_location;
+      pointer := io.jump_location;
     }.otherwise {
-      program_counter := program_counter + 1.U;
+      pointer := pointer + 1.U;
     }
   }
 }