Changeset 1899 in kBuild

Timestamp:

Oct 21, 2008 1:51:48 AM (16 years ago)

Author:

bird

Message:

kmk: strcache2 - some alignment fixes.

File:

• trunk/src/kmk/strcache2.c (modified) (3 diffs)

trunk/src/kmk/strcache2.c

@@ -74 +74 @@
   struct strcache2_seg *seg;
   size_t size;
+  size_t off;
 
   size = cache->def_seg_size;
-  if (size < (size_t)minlen + sizeof (struct strcache2_seg))
+  if (size < (size_t)minlen + sizeof (struct strcache2_seg) + STRCACHE2_ENTRY_ALIGNMENT)
     {
       size = (size_t)minlen * 2;
@@ -83 +84 @@
 
   seg = xmalloc (size);
-  seg->cursor = seg->start = (char *)(seg + 1);
-  seg->size = seg->avail = size - sizeof (struct strcache2_seg);
+  seg->start = (char *)(seg + 1);
+  seg->size  = size - sizeof (struct strcache2_seg);
+  off = (size_t)seg->start & (STRCACHE2_ENTRY_ALIGNMENT - 1);
+  if (off)
+    {
+      seg->start += off;
+      seg->size  -= off;
+    }
   assert (seg->size > minlen);
+  seg->cursor = seg->start;
+  seg->avail  = seg->size;
 
   seg->next = cache->seg_head;
@@ -539 +548 @@
 
   entry = (struct strcache2_entry *) seg->cursor;
+  assert ((size_t)entry & (STRCACHE2_ENTRY_ALIGNMENT - 1));
   seg->cursor += size;
   seg->avail -= size;