CXXRTLOptions: take platform instances, not types.

kivikakk · May 26, 2024 · 1ecfc72 · 1ecfc72
1 parent dae81fd
commit 1ecfc72
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/main/scala/ee/hrzn/chryse/ChryseApp.scala b/src/main/scala/ee/hrzn/chryse/ChryseApp.scala
@@ -67,9 +67,7 @@ abstract class ChryseApp {
       object cxxsim extends Subcommand("cxxsim") {
         banner("Run the C++ simulator tests.")
 
-        val platformChoices: Seq[_ <: CXXRTLPlatform] = cxxrtlOptions
-          .map(_.platforms.map(_.getConstructor().newInstance()))
-          .getOrElse(Seq())
+        val platformChoices = cxxrtlOptions.map(_.platforms).getOrElse(Seq())
 
         val platform =
           if (platformChoices.length > 1)

diff --git a/src/main/scala/ee/hrzn/chryse/ExampleApp.scala b/src/main/scala/ee/hrzn/chryse/ExampleApp.scala
@@ -13,9 +13,8 @@ object ExampleApp extends ChryseApp {
   override def genTop()(implicit platform: Platform) = new Top
   override val targetPlatforms                       = Seq(IceBreakerPlatform())
   override val cxxrtlOptions = Some(
-    CXXRTLOptions(platforms = Seq(classOf[ExampleCXXRTLPlatform])),
+    CXXRTLOptions(platforms =
+      Seq(new CXXRTLPlatform(id = "ex", clockHz = 3_000_000) {}),
+    ),
   )
 }
-
-class ExampleCXXRTLPlatform
-    extends CXXRTLPlatform(id = "ex", clockHz = 3_000_000)
diff --git a/src/main/scala/ee/hrzn/chryse/platform/cxxrtl/CXXRTLOptions.scala b/src/main/scala/ee/hrzn/chryse/platform/cxxrtl/CXXRTLOptions.scala
@@ -5,7 +5,7 @@ import chisel3.BlackBox
 import scala.sys.process._
 
 final case class CXXRTLOptions(
-    platforms: Seq[Class[_ <: CXXRTLPlatform]],
+    platforms: Seq[CXXRTLPlatform],
     blackboxes: Seq[Class[_ <: BlackBox]] = Seq(),
     cxxFlags: Seq[String] = Seq(),
     ldFlags: Seq[String] = Seq(),