feat: Flesh out Bytes type

Author: markehammons

core/src/fr/hammons/slinc/Bytes.scala

@@ -10,8 +10,12 @@ object Bytes:
   extension (a: Bytes)
     inline def +(b: Bytes): Bytes = a + b
     inline def *(i: Int): Bytes = a * i
+    inline def *(b: Bytes): Bytes = a * b 
+    inline def %(b: Bytes): Bytes = a % b
+    inline def -(b: Bytes): Bytes = a - b
     inline def toLong: Long = a
     inline def toBits: Long = a * 8
 
+  given Numeric[Bytes] = Numeric.LongIsIntegral
   given ToExpr[Bytes] with
     def apply(t: Bytes)(using Quotes) = ToExpr.LongToExpr[Long].apply(t)

core/src/fr/hammons/slinc/Ptr.scala

@@ -12,7 +12,7 @@ class Ptr[A](private[slinc] val mem: Mem, private[slinc] val offset: Bytes):
   def asArray(size: Int)(using
       ClassTag[A]
   )(using DescriptorOf[A], DescriptorModule)(using r: ReceiveBulk[A]) =
-    r.from(mem.resize(Bytes(DescriptorOf[A].size.toLong * size)), offset, size)
+    r.from(mem.resize(DescriptorOf[A].size * size), offset, size)
 
   def `unary_!_=`(value: A)(using send: Send[A]) = send.to(mem, offset, value)
   def apply(bytes: Bytes) = Ptr[A](mem, offset + bytes)

j17/src/fr/hammons/slinc/modules/DescriptorModule17.scala

@@ -35,29 +35,29 @@ given descriptorModule17: DescriptorModule with
 
   def genLayoutList(
       layouts: Seq[MemoryLayout],
-      alignment: Long
+      alignment: Bytes
   ): Seq[MemoryLayout] =
     val (vector, currentLocation) =
-      layouts.foldLeft(Seq.empty[MemoryLayout] -> 0L) {
+      layouts.foldLeft(Seq.empty[MemoryLayout] -> Bytes(0L)) {
         case ((vector, currentLocation), layout) =>
-          val thisAlignment = layout.byteAlignment()
+          val thisAlignment = Bytes(layout.byteAlignment())
           val misalignment = currentLocation % thisAlignment
           val toAdd =
-            if misalignment == 0 then Seq(layout)
+            if misalignment == Bytes(0) then Seq(layout)
             else
               val paddingNeeded = thisAlignment - misalignment
 
               Seq(
-                MemoryLayout.paddingLayout(paddingNeeded * 8).nn,
+                MemoryLayout.paddingLayout(paddingNeeded.toBits).nn,
                 layout
               )
-          (vector ++ toAdd, currentLocation + toAdd.view.map(_.byteSize()).sum)
+          (vector ++ toAdd, currentLocation + Bytes(toAdd.view.map(_.byteSize()).sum))
       }
     val misalignment = currentLocation % alignment
     vector ++ (
-      if misalignment != 0 then
+      if misalignment != Bytes(0) then
         Seq(
-          MemoryLayout.paddingLayout((alignment - misalignment) * 8).nn
+          MemoryLayout.paddingLayout((alignment - misalignment).toBits).nn
         )
       else Seq.empty
     )
@@ -75,15 +75,15 @@ given descriptorModule17: DescriptorModule with
 
   override def alignmentOf(td: TypeDescriptor): Bytes = td match
     case s: StructDescriptor =>
-      Bytes(s.members.view.map(_.descriptor).map(alignmentOf).map(_.toLong).max)
+      s.members.view.map(_.descriptor).map(alignmentOf).max
     case _ => sizeOf(td)
 
   override def memberOffsets(sd: StructDescriptor): IArray[Bytes] =
     offsets.getOrElseUpdate(
       sd, {
         val ll = genLayoutList(
           sd.members.map(toMemoryLayout),
-          sd.members.view.map(_.descriptor).map(alignmentOf).map(_.toLong).max
+          sd.members.view.map(_.descriptor).map(alignmentOf).max
         )
         IArray.from(
           ll match
@@ -125,7 +125,7 @@ given descriptorModule17: DescriptorModule with
         val alignment = alignmentOf(sd)
         val offsets = memberOffsets(sd)
         MemoryLayout
-          .structLayout(genLayoutList(originalMembers, alignment.toLong)*)
+          .structLayout(genLayoutList(originalMembers, alignment)*)
           .nn
           .withName(sd.clazz.getName())
           .nn

j19/src/fr/hammons/slinc/modules/DescriptorModule19.scala

@@ -32,7 +32,7 @@ given descriptorModule19: DescriptorModule with
           .structLayout(
             genLayoutList(
               sd.members.map(toMemoryLayout),
-              alignmentOf(sd).toLong
+              alignmentOf(sd)
             )*
           )
           .nn
@@ -41,29 +41,29 @@ given descriptorModule19: DescriptorModule with
 
   def genLayoutList(
       layouts: Seq[MemoryLayout],
-      alignment: Long
+      alignment: Bytes
   ): Seq[MemoryLayout] =
     val (vector, currentLocation) =
-      layouts.foldLeft(Seq.empty[MemoryLayout] -> 0L) {
+      layouts.foldLeft(Seq.empty[MemoryLayout] -> Bytes(0)) {
         case ((vector, currentLocation), layout) =>
-          val thisAlignment = layout.byteAlignment()
+          val thisAlignment = Bytes(layout.byteAlignment())
           val misalignment = currentLocation % thisAlignment
           val toAdd =
-            if misalignment == 0 then Seq(layout)
+            if misalignment == Bytes(0) then Seq(layout)
             else
               val paddingNeeded = thisAlignment - misalignment
 
               Seq(
-                MemoryLayout.paddingLayout(paddingNeeded * 8).nn,
+                MemoryLayout.paddingLayout(paddingNeeded.toBits).nn,
                 layout
               )
-          (vector ++ toAdd, currentLocation + toAdd.view.map(_.byteSize()).sum)
+          (vector ++ toAdd, currentLocation + Bytes(toAdd.view.map(_.byteSize()).sum))
       }
     val misalignment = currentLocation % alignment
     vector ++ (
-      if misalignment != 0 then
+      if misalignment != Bytes(0) then
         Seq(
-          MemoryLayout.paddingLayout((alignment - misalignment) * 8).nn
+          MemoryLayout.paddingLayout((alignment - misalignment).toBits).nn
         )
       else Seq.empty
     )
@@ -83,7 +83,7 @@ given descriptorModule19: DescriptorModule with
       sd, {
         val ll = genLayoutList(
           sd.members.view.map(toMemoryLayout).toSeq,
-          sd.members.view.map(_.descriptor).map(alignmentOf).map(_.toLong).max
+          sd.members.view.map(_.descriptor).map(alignmentOf).max
         )
         IArray.from(
           ll match
@@ -125,7 +125,4 @@ given descriptorModule19: DescriptorModule with
       case FloatDescriptor  => Bytes(4)
       case DoubleDescriptor => Bytes(8)
       case PtrDescriptor    => Bytes(ValueLayout.ADDRESS.nn.byteAlignment())
-      case sd: StructDescriptor =>
-        Bytes(
-          sd.members.view.map(_.descriptor).map(alignmentOf).map(_.toLong).max
-        )
+      case sd: StructDescriptor => sd.members.view.map(_.descriptor).map(alignmentOf).max