pass multiple operators to the eval engine

HyperDbg · May 28, 2024 · e42452c · e42452c
1 parent bbd87ce
commit e42452c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 43 deletions.
diff --git a/src/main/scala/hwdbg/globals/global_stages.scala b/src/main/scala/hwdbg/globals/global_stages.scala
diff --git a/src/main/scala/hwdbg/main.scala b/src/main/scala/hwdbg/main.scala
@@ -30,6 +30,7 @@ class DebuggerMain(
     debug: Boolean = DebuggerConfigurations.ENABLE_DEBUG,
     numberOfPins: Int = DebuggerConfigurations.NUMBER_OF_PINS,
     maximumNumberOfStages: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_STAGES,
+    maximumNumberOfSupportedScriptOperators: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_SUPPORTED_OPERATORS,
     bramAddrWidth: Int = DebuggerConfigurations.BLOCK_RAM_ADDR_WIDTH,
     bramDataWidth: Int = DebuggerConfigurations.BLOCK_RAM_DATA_WIDTH,
     portsConfiguration: Map[Int, Int] = DebuggerPorts.PORT_PINS_MAP
@@ -100,6 +101,7 @@ class DebuggerMain(
       debug,
       numberOfPins,
       maximumNumberOfStages,
+      maximumNumberOfSupportedScriptOperators,
       bramAddrWidth,
       bramDataWidth,
       portsConfiguration
@@ -192,6 +194,7 @@ object DebuggerMain {
       debug: Boolean = DebuggerConfigurations.ENABLE_DEBUG,
       numberOfPins: Int = DebuggerConfigurations.NUMBER_OF_PINS,
       maximumNumberOfStages: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_STAGES,
+      maximumNumberOfSupportedScriptOperators: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_SUPPORTED_OPERATORS,
       bramAddrWidth: Int = DebuggerConfigurations.BLOCK_RAM_ADDR_WIDTH,
       bramDataWidth: Int = DebuggerConfigurations.BLOCK_RAM_DATA_WIDTH,
       portsConfiguration: Map[Int, Int] = DebuggerPorts.PORT_PINS_MAP
@@ -207,6 +210,7 @@ object DebuggerMain {
         debug,
         numberOfPins,
         maximumNumberOfStages,
+        maximumNumberOfSupportedScriptOperators,
         bramAddrWidth,
         bramDataWidth,
         portsConfiguration

diff --git a/src/main/scala/hwdbg/script/eval.scala b/src/main/scala/hwdbg/script/eval.scala
@@ -32,6 +32,7 @@ class ScriptEngineEval(
     debug: Boolean = DebuggerConfigurations.ENABLE_DEBUG,
     numberOfPins: Int = DebuggerConfigurations.NUMBER_OF_PINS,
     maximumNumberOfStages: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_STAGES,
+    maximumNumberOfSupportedScriptOperators: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_SUPPORTED_OPERATORS,
     portsConfiguration: Map[Int, Int] = DebuggerPorts.PORT_PINS_MAP
 ) extends Module {
 
@@ -51,7 +52,7 @@ class ScriptEngineEval(
     //
     // Evaluation operator symbol
     //
-    val operator = Input(new SYMBOL)
+    val operator = Input(Vec(maximumNumberOfSupportedScriptOperators, new SYMBOL))
 
     val currentStage = Input(UInt(log2Ceil(maximumNumberOfStages).W))
     val nextStage = Output(UInt(log2Ceil(maximumNumberOfStages).W))
@@ -73,7 +74,7 @@ class ScriptEngineEval(
   // Assign operator value (split the signal into only usable part)
   //
   LogInfo(debug)("Usable size of Value in the SYMBOL: " + ScriptOperators().getWidth)
-  val operatorValue = io.operator.Value(ScriptOperators().getWidth - 1, 0).asTypeOf(ScriptOperators())
+  val mainOperatorValue = io.operator(0).Value(ScriptOperators().getWidth - 1, 0).asTypeOf(ScriptOperators())
 
   //
   // *** Implementing the evaluation engine ***
@@ -84,7 +85,7 @@ class ScriptEngineEval(
   //
   when(io.en === true.B) {
 
-    switch(operatorValue) {
+    switch(mainOperatorValue) {
 
       is(sFuncInc) {
         nextStage := io.currentStage + 1.U
@@ -117,10 +118,11 @@ object ScriptEngineEval {
       debug: Boolean = DebuggerConfigurations.ENABLE_DEBUG,
       numberOfPins: Int = DebuggerConfigurations.NUMBER_OF_PINS,
       maximumNumberOfStages: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_STAGES,
+      maximumNumberOfSupportedScriptOperators: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_SUPPORTED_OPERATORS,
       portsConfiguration: Map[Int, Int] = DebuggerPorts.PORT_PINS_MAP
   )(
       en: Bool,
-      operator: SYMBOL,
+      operator: Vec[SYMBOL],
       currentStage: UInt,
       inputPin: Vec[UInt]
   ): (UInt, Vec[UInt]) = {
@@ -130,6 +132,7 @@ object ScriptEngineEval {
         debug,
         numberOfPins,
         maximumNumberOfStages,
+        maximumNumberOfSupportedScriptOperators,
         portsConfiguration
       )
     )

diff --git a/src/main/scala/hwdbg/script/exec.scala b/src/main/scala/hwdbg/script/exec.scala
@@ -25,6 +25,7 @@ class ScriptExecutionEngine(
     debug: Boolean = DebuggerConfigurations.ENABLE_DEBUG,
     numberOfPins: Int = DebuggerConfigurations.NUMBER_OF_PINS,
     maximumNumberOfStages: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_STAGES,
+    maximumNumberOfSupportedScriptOperators: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_SUPPORTED_OPERATORS,
     bramAddrWidth: Int = DebuggerConfigurations.BLOCK_RAM_ADDR_WIDTH,
     bramDataWidth: Int = DebuggerConfigurations.BLOCK_RAM_DATA_WIDTH,
     portsConfiguration: Map[Int, Int] = DebuggerPorts.PORT_PINS_MAP
@@ -92,6 +93,15 @@ class ScriptExecutionEngine(
         // *** Based on target stage, this stage needs evaluation ***
         //
 
+        //
+        // Create a Vec containing script symbol elements
+        //
+        val scriptSymbols = Wire(Vec(maximumNumberOfSupportedScriptOperators, new SYMBOL))
+
+        for (j <- 0 until maximumNumberOfSupportedScriptOperators) {
+          scriptSymbols(j) := stageRegs(i + j).scriptSymbol
+        }
+
         //
         // Instantiate an eval engine for this stage
         //
@@ -102,10 +112,11 @@ class ScriptExecutionEngine(
           debug,
           numberOfPins,
           maximumNumberOfStages,
+          maximumNumberOfSupportedScriptOperators,
           portsConfiguration
         )(
           io.en,
-          stageRegs(i).scriptSymbol,
+          scriptSymbols,
           stageRegs(i).targetStage,
           stageRegs(i).pinValues
         )
@@ -152,6 +163,7 @@ object ScriptExecutionEngine {
       debug: Boolean = DebuggerConfigurations.ENABLE_DEBUG,
       numberOfPins: Int = DebuggerConfigurations.NUMBER_OF_PINS,
       maximumNumberOfStages: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_STAGES,
+      maximumNumberOfSupportedScriptOperators: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_SUPPORTED_OPERATORS,
       bramAddrWidth: Int = DebuggerConfigurations.BLOCK_RAM_ADDR_WIDTH,
       bramDataWidth: Int = DebuggerConfigurations.BLOCK_RAM_DATA_WIDTH,
       portsConfiguration: Map[Int, Int] = DebuggerPorts.PORT_PINS_MAP
@@ -165,6 +177,7 @@ object ScriptExecutionEngine {
         debug,
         numberOfPins,
         maximumNumberOfStages,
+        maximumNumberOfSupportedScriptOperators,
         bramAddrWidth,
         bramDataWidth,
         portsConfiguration

diff --git a/src/main/scala/top.scala b/src/main/scala/top.scala
@@ -25,6 +25,7 @@ class DebuggerModule(
     debug: Boolean = DebuggerConfigurations.ENABLE_DEBUG,
     numberOfPins: Int = DebuggerConfigurations.NUMBER_OF_PINS,
     maximumNumberOfStages: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_STAGES,
+    maximumNumberOfSupportedScriptOperators: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_SUPPORTED_OPERATORS,
     bramAddrWidth: Int = DebuggerConfigurations.BLOCK_RAM_ADDR_WIDTH,
     bramDataWidth: Int = DebuggerConfigurations.BLOCK_RAM_DATA_WIDTH,
     portsConfiguration: Map[Int, Int] = DebuggerPorts.PORT_PINS_MAP
@@ -66,6 +67,7 @@ class DebuggerModule(
       debug,
       numberOfPins,
       maximumNumberOfStages,
+      maximumNumberOfSupportedScriptOperators,
       bramAddrWidth,
       bramDataWidth,
       portsConfiguration
@@ -95,6 +97,7 @@ object Main extends App {
         DebuggerConfigurations.ENABLE_DEBUG,
         DebuggerConfigurations.NUMBER_OF_PINS,
         ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_STAGES,
+        ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_SUPPORTED_OPERATORS,
         DebuggerConfigurations.BLOCK_RAM_ADDR_WIDTH,
         DebuggerConfigurations.BLOCK_RAM_DATA_WIDTH,
         DebuggerPorts.PORT_PINS_MAP

diff --git a/src/main/scala/top_test.scala b/src/main/scala/top_test.scala
@@ -26,6 +26,7 @@ class DebuggerModuleTestingBRAM(
     debug: Boolean = DebuggerConfigurations.ENABLE_DEBUG,
     numberOfPins: Int = DebuggerConfigurations.NUMBER_OF_PINS,
     maximumNumberOfStages: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_STAGES,
+    maximumNumberOfSupportedScriptOperators: Int = ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_SUPPORTED_OPERATORS,
     bramAddrWidth: Int = DebuggerConfigurations.BLOCK_RAM_ADDR_WIDTH,
     bramDataWidth: Int = DebuggerConfigurations.BLOCK_RAM_DATA_WIDTH,
     portsConfiguration: Map[Int, Int] = DebuggerPorts.PORT_PINS_MAP
@@ -90,6 +91,7 @@ class DebuggerModuleTestingBRAM(
       debug,
       numberOfPins,
       maximumNumberOfStages,
+      maximumNumberOfSupportedScriptOperators,
       bramAddrWidth,
       bramDataWidth,
       portsConfiguration
@@ -127,6 +129,7 @@ object MainWithInitializedBRAM extends App {
         DebuggerConfigurations.ENABLE_DEBUG,
         DebuggerConfigurations.NUMBER_OF_PINS,
         ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_STAGES,
+        ScriptEngineConfigurations.MAXIMUM_NUMBER_OF_SUPPORTED_OPERATORS,
         DebuggerConfigurations.BLOCK_RAM_ADDR_WIDTH,
         DebuggerConfigurations.BLOCK_RAM_DATA_WIDTH,
         DebuggerPorts.PORT_PINS_MAP