static int los_segment_index = 0;
#endif
+mword
+sgen_los_object_size (LOSObject *obj)
+{
+ return obj->size & ~1L;
+}
+
#ifdef LOS_CONSISTENCY_CHECK
static void
los_consistency_check (void)
mword memory_usage = 0;
for (obj = los_object_list; obj; obj = obj->next) {
- char *end = obj->data + obj->size;
+ mword obj_size = sgen_los_object_size (obj);
+ char *end = obj->data + obj_size;
int start_index, num_chunks;
- memory_usage += obj->size;
+ memory_usage += obj_size;
- if (obj->size > LOS_SECTION_OBJECT_LIMIT)
+ if (obj_size > LOS_SECTION_OBJECT_LIMIT)
continue;
section = LOS_SECTION_FOR_OBJ (obj);
g_assert (end <= (char*)section + LOS_SECTION_SIZE);
start_index = LOS_CHUNK_INDEX (obj, section);
- num_chunks = (obj->size + sizeof (LOSObject) + LOS_CHUNK_SIZE - 1) >> LOS_CHUNK_BITS;
+ num_chunks = (obj_size + sizeof (LOSObject) + LOS_CHUNK_SIZE - 1) >> LOS_CHUNK_BITS;
for (i = start_index; i < start_index + num_chunks; ++i)
g_assert (!section->free_chunk_map [i]);
}
SGEN_ASSERT (0, !obj->cardtable_mod_union, "We should never free a LOS object with a mod-union table.");
#ifndef LOS_DUMMY
- size_t size = obj->size;
- SGEN_LOG (4, "Freed large object %p, size %lu", obj->data, (unsigned long)obj->size);
- binary_protocol_empty (obj->data, obj->size);
+ mword size = sgen_los_object_size (obj);
+ SGEN_LOG (4, "Freed large object %p, size %lu", obj->data, (unsigned long)size);
+ binary_protocol_empty (obj->data, size);
los_memory_usage -= size;
los_num_objects--;
* and we avoid the memcpy overhead.
*/
void*
-sgen_los_alloc_large_inner (GCVTable *vtable, size_t size)
+sgen_los_alloc_large_inner (GCVTable vtable, size_t size)
{
LOSObject *obj = NULL;
void **vtslot;
return obj->data;
}
-static void sgen_los_unpin_object (char *data);
+static void sgen_los_unpin_object (GCObject *data);
void
sgen_los_sweep (void)
SGEN_ASSERT (0, !SGEN_OBJECT_IS_PINNED (bigobj->data), "Who pinned a LOS object?");
if (bigobj->cardtable_mod_union) {
- sgen_card_table_free_mod_union (bigobj->cardtable_mod_union, bigobj->data, bigobj->size);
+ sgen_card_table_free_mod_union (bigobj->cardtable_mod_union, (char*)bigobj->data, sgen_los_object_size (bigobj));
bigobj->cardtable_mod_union = NULL;
}
*start = NULL;
for (obj = los_object_list; obj; obj = obj->next) {
- char *end = obj->data + obj->size;
+ char *end = (char*)obj->data + sgen_los_object_size (obj);
- if (ptr >= obj->data && ptr < end) {
- *start = obj->data;
+ if (ptr >= (char*)obj->data && ptr < end) {
+ *start = (char*)obj->data;
return TRUE;
}
}
LOSObject *obj;
for (obj = los_object_list; obj; obj = obj->next)
- cb (obj->data, obj->size, user_data);
+ cb (obj->data, sgen_los_object_size (obj), user_data);
}
gboolean
LOSObject *obj;
for (obj = los_object_list; obj; obj = obj->next) {
- if (obj->data == object)
+ if ((char*)obj->data == object)
return TRUE;
}
return FALSE;
mword size;
gboolean pinned;
- if (obj->data > ptr || obj->data + obj->size <= ptr)
+ if ((char*)obj->data > ptr || (char*)obj->data + sgen_los_object_size (obj) <= ptr)
continue;
size = sgen_los_object_size (obj);
else
los_kind = "los-ptr";
- if (obj->data == ptr) {
+ if ((char*)obj->data == ptr) {
SGEN_LOG (0, "%s (size %d pin %d)\n", los_kind, (int)size, pinned ? 1 : 0);
} else {
SGEN_LOG (0, "%s (interior-ptr offset %zd size %d pin %d)",
- los_kind, ptr - obj->data, (int)size, pinned ? 1 : 0);
+ los_kind, ptr - (char*)obj->data, (int)size, pinned ? 1 : 0);
}
return TRUE;
{
LOSObject *obj;
for (obj = los_object_list; obj; obj = obj->next) {
- GCVTable *vt = (GCVTable*)SGEN_LOAD_VTABLE (obj->data);
+ GCVTable vt = SGEN_LOAD_VTABLE (obj->data);
if (SGEN_VTABLE_HAS_REFERENCES (vt))
- callback ((mword)obj->data, (mword)obj->size);
+ callback ((mword)obj->data, sgen_los_object_size (obj));
}
}
static guint8*
get_cardtable_mod_union_for_object (LOSObject *obj)
{
+ mword size = sgen_los_object_size (obj);
guint8 *mod_union = obj->cardtable_mod_union;
guint8 *other;
if (mod_union)
return mod_union;
- mod_union = sgen_card_table_alloc_mod_union (obj->data, obj->size);
+ mod_union = sgen_card_table_alloc_mod_union ((char*)obj->data, size);
other = SGEN_CAS_PTR ((gpointer*)&obj->cardtable_mod_union, mod_union, NULL);
if (!other) {
SGEN_ASSERT (0, obj->cardtable_mod_union == mod_union, "Why did CAS not replace?");
return mod_union;
}
- sgen_card_table_free_mod_union (mod_union, obj->data, obj->size);
+ sgen_card_table_free_mod_union (mod_union, (char*)obj->data, size);
return other;
}
cards = NULL;
}
- sgen_cardtable_scan_object (obj->data, obj->size, cards, mod_union, ctx);
+ sgen_cardtable_scan_object (obj->data, sgen_los_object_size (obj), cards, mod_union, ctx);
}
}
for (obj = los_object_list; obj; obj = obj->next) {
int i;
guint8 *cards = sgen_card_table_get_card_scan_address ((mword) obj->data);
- guint8 *cards_end = sgen_card_table_get_card_scan_address ((mword) obj->data + obj->size - 1);
+ guint8 *cards_end = sgen_card_table_get_card_scan_address ((mword) obj->data + sgen_los_object_size (obj) - 1);
mword num_cards = (cards_end - cards) + 1;
if (!SGEN_OBJECT_HAS_REFERENCES (obj->data))
if (!SGEN_OBJECT_HAS_REFERENCES (obj->data))
continue;
sgen_card_table_update_mod_union (get_cardtable_mod_union_for_object (obj),
- obj->data, obj->size, NULL);
+ (char*)obj->data, sgen_los_object_size (obj), NULL);
}
}
-mword
-sgen_los_object_size (LOSObject *obj)
-{
- return obj->size & ~1L;
-}
-
LOSObject*
-sgen_los_header_for_object (char *data)
+sgen_los_header_for_object (GCObject *data)
{
#if _MSC_VER
- return (LOSObject*)(data - (int)(&(((LOSObject*)0)->data)));
+ return (LOSObject*)((char*)data - (int)(&(((LOSObject*)0)->data)));
#else
- return (LOSObject*)(data - sizeof (LOSObject));
+ return (LOSObject*)((char*)data - sizeof (LOSObject));
#endif
}
void
-sgen_los_pin_object (char *data)
+sgen_los_pin_object (GCObject *data)
{
LOSObject *obj = sgen_los_header_for_object (data);
obj->size = obj->size | 1;
- binary_protocol_pin (data, (gpointer)SGEN_LOAD_VTABLE (data), sgen_safe_object_get_size ((GCObject*)data));
+ binary_protocol_pin (data, (gpointer)SGEN_LOAD_VTABLE (data), sgen_safe_object_get_size (data));
}
static void
-sgen_los_unpin_object (char *data)
+sgen_los_unpin_object (GCObject *data)
{
LOSObject *obj = sgen_los_header_for_object (data);
obj->size = sgen_los_object_size (obj);
}
gboolean
-sgen_los_object_is_pinned (char *data)
+sgen_los_object_is_pinned (GCObject *data)
{
LOSObject *obj = sgen_los_header_for_object (data);
return obj->size & 1;
void
sgen_los_mark_mod_union_card (GCObject *mono_obj, void **ptr)
{
- LOSObject *obj = sgen_los_header_for_object ((char*)mono_obj);
+ LOSObject *obj = sgen_los_header_for_object (mono_obj);
guint8 *mod_union = get_cardtable_mod_union_for_object (obj);
size_t offset = sgen_card_table_get_card_offset ((char*)ptr, (char*)sgen_card_table_align_pointer ((char*)obj));
SGEN_ASSERT (0, mod_union, "FIXME: optionally allocate the mod union if it's not here and CAS it in.");