update scheduler to allow for any default integer size

Author: shwestrick

basis-library/mlton/HM.sig

@@ -10,8 +10,8 @@ sig
   val registerQueue: Word32.word * 'a array -> unit
   val registerQueueTop: Word32.word * Word64.word ref -> unit
   val registerQueueBot: Word32.word * Word32.word ref -> unit
-  val arrayUpdateNoBarrier : 'a array * SeqIndex.int * 'a -> unit
+  val arrayUpdateNoBarrier : 'a array * int * 'a -> unit
   val refAssignNoBarrier : 'a ref * 'a -> unit
-  val arraySubNoBarrier : 'a array * SeqIndex.int -> 'a
+  val arraySubNoBarrier : 'a array * int -> 'a
   val refDerefNoBarrier : 'a ref -> 'a
 end

basis-library/mlton/HM.sml

@@ -13,9 +13,13 @@ struct
   val registerQueueTop: Word32.word * Word64.word ref -> unit = PrimHM.registerQueueTop
   val registerQueueBot: Word32.word * Word32.word ref -> unit = PrimHM.registerQueueBot
 
-  val arrayUpdateNoBarrier = PrimHM.arrayUpdateNoBarrier
+  fun arrayUpdateNoBarrier (a, i, x) =
+    PrimHM.arrayUpdateNoBarrier (a, SeqIndex.fromInt i, x)
+
   val refAssignNoBarrier = PrimHM.refAssignNoBarrier
 
-  val arraySubNoBarrier = PrimHM.arraySubNoBarrier
+  fun arraySubNoBarrier (a, i) =
+    PrimHM.arraySubNoBarrier (a, SeqIndex.fromInt i)
+
   val refDerefNoBarrier = PrimHM.refDerefNoBarrier
 end

basis-library/schedulers/shh/Scheduler.sml

@@ -156,8 +156,8 @@ struct
   local
     val amOriginal = ref true
     val taskBoxes = Array.array (P, NONE)
-    fun upd i x = HM.arrayUpdateNoBarrier (taskBoxes, Int64.fromInt i, x)
-    fun sub i = HM.arraySubNoBarrier (taskBoxes, Int64.fromInt i)
+    fun upd i x = HM.arrayUpdateNoBarrier (taskBoxes, i, x)
+    fun sub i = HM.arraySubNoBarrier (taskBoxes, i)
   in
   val _ = Thread.copyCurrent ()
   val prototypeThread : Thread.p =

basis-library/schedulers/shh/queue/DequeABP.sml

@@ -97,7 +97,7 @@ struct
   exception Full
 
   fun for (i, j) f = if i = j then () else (f i; for (i+1, j) f)
-  fun arrayUpdate (a, i, x) = MLton.HM.arrayUpdateNoBarrier (a, Int64.fromInt i, x)
+  fun arrayUpdate (a, i, x) = MLton.HM.arrayUpdateNoBarrier (a, i, x)
   fun cas r (x, y) = MLton.Parallel.compareAndSwap r (x, y)
 
   fun cas32 b (x, y) = cas b (Word32.fromInt x, Word32.fromInt y)