nonmoving: Clarify length of MarkQueueBlock and other comment issues

1 files changed, 10 insertions, 8 deletions

diff --git a/rts/sm/NonMovingMark.h b/rts/sm/NonMovingMark.h
index 0938e2775a..b8e8494ecc 100644
--- a/rts/sm/NonMovingMark.h
+++ b/rts/sm/NonMovingMark.h
@@ -70,9 +70,17 @@ typedef struct {
     // index of first *unused* queue entry
     uint32_t head;
 
+    // MARK_QUEUE_BLOCK_ENTRIES in length.
     MarkQueueEnt entries[];
 } MarkQueueBlock;
 
+// Number of blocks to allocate for a mark queue
+#define MARK_QUEUE_BLOCKS 16
+
+// The length of MarkQueueBlock.entries
+#define MARK_QUEUE_BLOCK_ENTRIES ((MARK_QUEUE_BLOCKS * BLOCK_SIZE - sizeof(MarkQueueBlock)) / sizeof(MarkQueueEnt))
+
+
 // How far ahead in mark queue to prefetch?
 #define MARK_PREFETCH_QUEUE_DEPTH 5
 
@@ -81,11 +89,11 @@ typedef struct {
  * invariants:
  *
  *  a. top == blocks->start;
- *  b. there is always a valid MarkQueueChunk, although it may be empty
+ *  b. there is always a valid MarkQueueBlock, although it may be empty
  *     (e.g. top->head == 0).
  */
 typedef struct MarkQueue_ {
-    // A singly link-list of blocks, each containing a MarkQueueChunk.
+    // A singly link-list of blocks, each containing a MarkQueueBlock.
     bdescr *blocks;
 
     // Cached value of blocks->start.
@@ -111,12 +119,6 @@ typedef struct {
     MarkQueue queue;
 } UpdRemSet;
 
-// Number of blocks to allocate for a mark queue
-#define MARK_QUEUE_BLOCKS 16
-
-// The length of MarkQueueBlock.entries
-#define MARK_QUEUE_BLOCK_ENTRIES ((MARK_QUEUE_BLOCKS * BLOCK_SIZE - sizeof(MarkQueueBlock)) / sizeof(MarkQueueEnt))
-
 extern bdescr *nonmoving_large_objects, *nonmoving_marked_large_objects,
               *nonmoving_compact_objects, *nonmoving_marked_compact_objects;
 extern memcount n_nonmoving_large_blocks, n_nonmoving_marked_large_blocks,