diff --git a/binder/includeConstants.txt b/binder/includeConstants.txt index ed3f92be129..b72808d1b3f 100644 --- a/binder/includeConstants.txt +++ b/binder/includeConstants.txt @@ -1,6 +1,6 @@ -# enum FIRRTLPortDirection -FIRRTL_PORT_DIR_INPUT -FIRRTL_PORT_DIR_OUTPUT +# enum FIRRTLDirection +FIRRTL_DIRECTION_IN +FIRRTL_DIRECTION_OUT # enum FIRRTLConvention FIRRTL_CONVENTION_INTERNAL FIRRTL_CONVENTION_SCALARIZED diff --git a/binder/src/main/scala/PanamaCIRCT.scala b/binder/src/main/scala/PanamaCIRCT.scala index 616a43f12fb..27040cfe0bd 100644 --- a/binder/src/main/scala/PanamaCIRCT.scala +++ b/binder/src/main/scala/PanamaCIRCT.scala @@ -444,7 +444,7 @@ class PanamaCIRCT { MlirType(CAPI.firrtlTypeGetBundle(arena, mlirCtx, fields.length, buffer)) } - def firrtlAttrGetPortDirs(dirs: Seq[FIRRTLPortDir]): MlirAttribute = { + def firrtlAttrGetPortDirs(dirs: Seq[FIRRTLDirection]): MlirAttribute = { val (ptr, length) = seqToArray(dirs) MlirAttribute(CAPI.firrtlAttrGetPortDirs(arena, mlirCtx, length, ptr)) } @@ -657,13 +657,13 @@ object FIRRTLNameKind { final case object InterestingName extends FIRRTLNameKind(value = CAPI.FIRRTL_NAME_KIND_INTERESTING_NAME()) } -sealed abstract class FIRRTLPortDir(val value: Int) extends ForeignType[Int] { +sealed abstract class FIRRTLDirection(val value: Int) extends ForeignType[Int] { private[circt] def get = value private[circt] val sizeof = 4 // FIXME: jextract doesn't export type for C enum } -object FIRRTLPortDir { - final case object Input extends FIRRTLPortDir(value = CAPI.FIRRTL_PORT_DIR_INPUT()) - final case object Output extends FIRRTLPortDir(value = CAPI.FIRRTL_PORT_DIR_OUTPUT()) +object FIRRTLDirection { + final case object In extends FIRRTLDirection(value = CAPI.FIRRTL_DIRECTION_IN()) + final case object Out extends FIRRTLDirection(value = CAPI.FIRRTL_DIRECTION_OUT()) } sealed abstract class firrtlAttrGetRUW(val value: Int) extends ForeignType[Int] { diff --git a/binder/src/main/scala/PanamaCIRCTConverter.scala b/binder/src/main/scala/PanamaCIRCTConverter.scala index 46d0f81e7bb..b245830d441 100644 --- a/binder/src/main/scala/PanamaCIRCTConverter.scala +++ b/binder/src/main/scala/PanamaCIRCTConverter.scala @@ -33,7 +33,7 @@ case class Op(state: MlirOperationState, op: MlirOperation, regions: Seq[Region] case class Ports( types: Seq[MlirType], - dirs: Seq[FIRRTLPortDir], + dirs: Seq[FIRRTLDirection], locs: Seq[MlirLocation], names: Seq[String], nameAttrs: Seq[MlirAttribute], @@ -199,8 +199,8 @@ class PanamaCIRCTConverter extends CIRCTConverter { Ports( types = types, dirs = irs.map(_.direction match { - case fir.Input => FIRRTLPortDir.Input - case fir.Output => FIRRTLPortDir.Output + case fir.Input => FIRRTLDirection.In + case fir.Output => FIRRTLDirection.Out }), locs = locs, names = irs.map(_.name),