.

Author: sequencer

src/main/scala/rocket/Decoder.scala

@@ -46,7 +46,7 @@ object CustomInstructions {
     rocket("c.flush.d.l1", Encoding.fromString("111111000000?????000000001110011")),
     rocket("c.discard.d.l1", Encoding.fromString("111111000010?????000000001110011")),
     rocket("cease", Encoding.fromString("00110000010100000000000001110011"))
-  ).map(RocketDecodePattern.apply)
+  )
 
   private def rocc(name: String, encoding: Encoding) =
     Instruction(name, encoding, Seq(), Seq(InstructionSet("rv_rocc")), None, false, true)
@@ -75,7 +75,7 @@ object CustomInstructions {
     rocc("custom3.rd", Encoding.fromString("?????????????????100?????1111011")),
     rocc("custom3.rd.rs1", Encoding.fromString("?????????????????110?????1111011")),
     rocc("custom3.rd.rs1.rs2", Encoding.fromString("?????????????????111?????1111011"))
-  ).map(RocketDecodePattern.apply)
+  )
 }
 
 /** Parameter for InstructionDecoder
@@ -92,6 +92,8 @@ case class InstructionDecoderParameter(
 /** factory to generate the rocket core decoder. */
 class InstructionDecoder(p: InstructionDecoderParameter) {
   private val instructions = p.instructions
+  instructions.foreach(println)
+
 
   // functions below is my little reminder, which is used for future rocket core refactoring, just keep it, I'll remove it later in the future.
   private def hasAnySetIn(sets: String*): Boolean = sets.exists(set => instructions.flatMap(_.instructionSets.map(_.name)).exists(_.contains(set)))

src/main/scala/rocket/RocketCore.scala

@@ -186,7 +186,10 @@ class Rocket(tile: RocketTile)(implicit p: Parameters) extends CoreModule()(p)
 
   val decoderParameter = org.chipsalliance.rocketcore.decoder.InstructionDecoderParameter(
     // TODO: configurable
-    org.chipsalliance.rvdecoderdb.fromFile.instructions(os.pwd / "dependencies" / "riscv-opcodes")
+    (org.chipsalliance.rvdecoderdb.fromFile.instructions(os.pwd / "dependencies" / "riscv-opcodes") ++
+      // TODO: select rocc instructions via configuration.
+      org.chipsalliance.rocketcore.decoder.CustomInstructions.roccSet ++
+      org.chipsalliance.rocketcore.decoder.CustomInstructions.rocketSet)
       .filter { i =>
         i.instructionSets.map(_.name) match {
           // I