[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/alloc.c
|
From: |
Stefan Monnier |
|
Subject: |
[Emacs-diffs] Changes to emacs/src/alloc.c |
|
Date: |
Fri, 27 Jun 2003 17:54:20 -0400 |
Index: emacs/src/alloc.c
diff -c emacs/src/alloc.c:1.305 emacs/src/alloc.c:1.306
*** emacs/src/alloc.c:1.305 Thu Jun 26 19:16:05 2003
--- emacs/src/alloc.c Fri Jun 27 17:54:20 2003
***************
*** 95,106 ****
#define UNMARK_STRING(S) ((S)->size &= ~MARKBIT)
#define STRING_MARKED_P(S) ((S)->size & MARKBIT)
/* Value is the number of bytes/chars of S, a pointer to a struct
Lisp_String. This must be used instead of STRING_BYTES (S) or
S->size during GC, because S->size contains the mark bit for
strings. */
! #define GC_STRING_BYTES(S) (STRING_BYTES (S) & ~MARKBIT)
#define GC_STRING_CHARS(S) ((S)->size & ~MARKBIT)
/* Number of bytes of consing done since the last gc. */
--- 95,110 ----
#define UNMARK_STRING(S) ((S)->size &= ~MARKBIT)
#define STRING_MARKED_P(S) ((S)->size & MARKBIT)
+ #define VECTOR_MARK(V) ((V)->size |= ARRAY_MARK_FLAG)
+ #define VECTOR_UNMARK(V) ((V)->size &= ~ARRAY_MARK_FLAG)
+ #define VECTOR_MARKED_P(V) ((V)->size & ARRAY_MARK_FLAG)
+
/* Value is the number of bytes/chars of S, a pointer to a struct
Lisp_String. This must be used instead of STRING_BYTES (S) or
S->size during GC, because S->size contains the mark bit for
strings. */
! #define GC_STRING_BYTES(S) (STRING_BYTES (S))
#define GC_STRING_CHARS(S) ((S)->size & ~MARKBIT)
/* Number of bytes of consing done since the last gc. */
***************
*** 616,635 ****
return val;
}
-
- /* Return a new buffer structure allocated from the heap with
- a call to lisp_malloc. */
-
- struct buffer *
- allocate_buffer ()
- {
- struct buffer *b
- = (struct buffer *) lisp_malloc (sizeof (struct buffer),
- MEM_TYPE_BUFFER);
- return b;
- }
-
-
/* Free BLOCK. This must be called to free memory allocated with a
call to lisp_malloc. */
--- 620,625 ----
***************
*** 645,650 ****
--- 635,653 ----
UNBLOCK_INPUT;
}
+
+ /* Return a new buffer structure allocated from the heap with
+ a call to lisp_malloc. */
+
+ struct buffer *
+ allocate_buffer ()
+ {
+ struct buffer *b
+ = (struct buffer *) lisp_malloc (sizeof (struct buffer),
+ MEM_TYPE_BUFFER);
+ return b;
+ }
+
/* Arranging to disable input signals while we're in malloc.
***************
*** 1223,1229 ****
string_bytes (s)
struct Lisp_String *s;
{
! int nbytes = (s->size_byte < 0 ? s->size : s->size_byte) & ~MARKBIT;
if (!PURE_POINTER_P (s)
&& s->data
&& nbytes != SDATA_NBYTES (SDATA_OF_STRING (s)))
--- 1226,1232 ----
string_bytes (s)
struct Lisp_String *s;
{
! int nbytes = (s->size_byte < 0 ? s->size & ~MARKBIT : s->size_byte);
if (!PURE_POINTER_P (s)
&& s->data
&& nbytes != SDATA_NBYTES (SDATA_OF_STRING (s)))
***************
*** 3400,3409 ****
buffer because checking that dereferences the pointer
PO which might point anywhere. */
if (live_vector_p (m, po))
! mark_p = (!GC_SUBRP (obj)
! && !(XVECTOR (obj)->size & ARRAY_MARK_FLAG));
else if (live_buffer_p (m, po))
! mark_p = GC_BUFFERP (obj) && !XMARKBIT (XBUFFER (obj)->name);
break;
case Lisp_Misc:
--- 3403,3411 ----
buffer because checking that dereferences the pointer
PO which might point anywhere. */
if (live_vector_p (m, po))
! mark_p = !GC_SUBRP (obj) && !VECTOR_MARKED_P (XVECTOR (obj));
else if (live_buffer_p (m, po))
! mark_p = GC_BUFFERP (obj) && !VECTOR_MARKED_P (XBUFFER (obj));
break;
case Lisp_Misc:
***************
*** 3454,3461 ****
break;
case MEM_TYPE_BUFFER:
! if (live_buffer_p (m, p)
! && !XMARKBIT (((struct buffer *) p)->name))
XSETVECTOR (obj, p);
break;
--- 3456,3462 ----
break;
case MEM_TYPE_BUFFER:
! if (live_buffer_p (m, p) && !VECTOR_MARKED_P((struct buffer *)p))
XSETVECTOR (obj, p);
break;
***************
*** 3496,3503 ****
{
Lisp_Object tem;
XSETVECTOR (tem, p);
! if (!GC_SUBRP (tem)
! && !(XVECTOR (tem)->size & ARRAY_MARK_FLAG))
obj = tem;
}
break;
--- 3497,3503 ----
{
Lisp_Object tem;
XSETVECTOR (tem, p);
! if (!GC_SUBRP (tem) && !VECTOR_MARKED_P (XVECTOR (tem)))
obj = tem;
}
break;
***************
*** 4286,4293 ****
for (; i >= 0; i--)
XUNMARK (backlist->args[i]);
}
! XUNMARK (buffer_defaults.name);
! XUNMARK (buffer_local_symbols.name);
#if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES && 0
dump_zombies ();
--- 4286,4293 ----
for (; i >= 0; i--)
XUNMARK (backlist->args[i]);
}
! VECTOR_UNMARK (&buffer_defaults);
! VECTOR_UNMARK (&buffer_local_symbols);
#if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES && 0
dump_zombies ();
***************
*** 4548,4554 ****
if (GC_BUFFERP (obj))
{
! if (!XMARKBIT (XBUFFER (obj)->name))
{
#ifdef GC_CHECK_MARKED_OBJECTS
if (po != &buffer_defaults && po != &buffer_local_symbols)
--- 4548,4554 ----
if (GC_BUFFERP (obj))
{
! if (!VECTOR_MARKED_P (XBUFFER (obj)))
{
#ifdef GC_CHECK_MARKED_OBJECTS
if (po != &buffer_defaults && po != &buffer_local_symbols)
***************
*** 4574,4584 ****
register EMACS_INT size = ptr->size;
register int i;
! if (size & ARRAY_MARK_FLAG)
break; /* Already marked */
CHECK_LIVE (live_vector_p);
! ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */
size &= PSEUDOVECTOR_SIZE_MASK;
for (i = 0; i < size; i++) /* and then mark its elements */
{
--- 4574,4584 ----
register EMACS_INT size = ptr->size;
register int i;
! if (VECTOR_MARKED_P (ptr))
break; /* Already marked */
CHECK_LIVE (live_vector_p);
! VECTOR_MARK (ptr); /* Else mark it */
size &= PSEUDOVECTOR_SIZE_MASK;
for (i = 0; i < size; i++) /* and then mark its elements */
{
***************
*** 4593,4602 ****
else if (GC_FRAMEP (obj))
{
register struct frame *ptr = XFRAME (obj);
- register EMACS_INT size = ptr->size;
! if (size & ARRAY_MARK_FLAG) break; /* Already marked */
! ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */
CHECK_LIVE (live_vector_p);
mark_object (&ptr->name);
--- 4593,4601 ----
else if (GC_FRAMEP (obj))
{
register struct frame *ptr = XFRAME (obj);
! if (VECTOR_MARKED_P (ptr)) break; /* Already marked */
! VECTOR_MARK (ptr); /* Else mark it */
CHECK_LIVE (live_vector_p);
mark_object (&ptr->name);
***************
*** 4627,4651 ****
{
register struct Lisp_Vector *ptr = XVECTOR (obj);
! if (ptr->size & ARRAY_MARK_FLAG)
break; /* Already marked */
CHECK_LIVE (live_vector_p);
! ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */
}
else if (GC_WINDOWP (obj))
{
register struct Lisp_Vector *ptr = XVECTOR (obj);
struct window *w = XWINDOW (obj);
- register EMACS_INT size = ptr->size;
register int i;
/* Stop if already marked. */
! if (size & ARRAY_MARK_FLAG)
break;
/* Mark it. */
CHECK_LIVE (live_vector_p);
! ptr->size |= ARRAY_MARK_FLAG;
/* There is no Lisp data above The member CURRENT_MATRIX in
struct WINDOW. Stop marking when that slot is reached. */
--- 4626,4649 ----
{
register struct Lisp_Vector *ptr = XVECTOR (obj);
! if (VECTOR_MARKED_P (ptr))
break; /* Already marked */
CHECK_LIVE (live_vector_p);
! VECTOR_MARK (ptr); /* Else mark it */
}
else if (GC_WINDOWP (obj))
{
register struct Lisp_Vector *ptr = XVECTOR (obj);
struct window *w = XWINDOW (obj);
register int i;
/* Stop if already marked. */
! if (VECTOR_MARKED_P (ptr))
break;
/* Mark it. */
CHECK_LIVE (live_vector_p);
! VECTOR_MARK (ptr);
/* There is no Lisp data above The member CURRENT_MATRIX in
struct WINDOW. Stop marking when that slot is reached. */
***************
*** 4668,4682 ****
else if (GC_HASH_TABLE_P (obj))
{
struct Lisp_Hash_Table *h = XHASH_TABLE (obj);
- EMACS_INT size = h->size;
/* Stop if already marked. */
! if (size & ARRAY_MARK_FLAG)
break;
/* Mark it. */
CHECK_LIVE (live_vector_p);
! h->size |= ARRAY_MARK_FLAG;
/* Mark contents. */
/* Do not mark next_free or next_weak.
--- 4666,4679 ----
else if (GC_HASH_TABLE_P (obj))
{
struct Lisp_Hash_Table *h = XHASH_TABLE (obj);
/* Stop if already marked. */
! if (VECTOR_MARKED_P (h))
break;
/* Mark it. */
CHECK_LIVE (live_vector_p);
! VECTOR_MARK (h);
/* Mark contents. */
/* Do not mark next_free or next_weak.
***************
*** 4698,4705 ****
if (GC_NILP (h->weak))
mark_object (&h->key_and_value);
else
! XVECTOR (h->key_and_value)->size |= ARRAY_MARK_FLAG;
!
}
else
{
--- 4695,4701 ----
if (GC_NILP (h->weak))
mark_object (&h->key_and_value);
else
! VECTOR_MARK (XVECTOR (h->key_and_value));
}
else
{
***************
*** 4707,4715 ****
register EMACS_INT size = ptr->size;
register int i;
! if (size & ARRAY_MARK_FLAG) break; /* Already marked */
CHECK_LIVE (live_vector_p);
! ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */
if (size & PSEUDOVECTOR_FLAG)
size &= PSEUDOVECTOR_SIZE_MASK;
--- 4703,4711 ----
register EMACS_INT size = ptr->size;
register int i;
! if (VECTOR_MARKED_P (ptr)) break; /* Already marked */
CHECK_LIVE (live_vector_p);
! VECTOR_MARK (ptr); /* Else mark it */
if (size & PSEUDOVECTOR_FLAG)
size &= PSEUDOVECTOR_SIZE_MASK;
***************
*** 4854,4862 ****
register Lisp_Object *ptr;
Lisp_Object base_buffer;
! /* This is the buffer's markbit */
! mark_object (&buffer->name);
! XMARK (buffer->name);
MARK_INTERVAL_TREE (BUF_INTERVALS (buffer));
--- 4850,4856 ----
register Lisp_Object *ptr;
Lisp_Object base_buffer;
! VECTOR_MARK (buffer);
MARK_INTERVAL_TREE (BUF_INTERVALS (buffer));
***************
*** 4896,4902 ****
else
mark_object (&buffer->undo_list);
! for (ptr = &buffer->name + 1;
(char *)ptr < (char *)buffer + sizeof (struct buffer);
ptr++)
mark_object (ptr);
--- 4890,4896 ----
else
mark_object (&buffer->undo_list);
! for (ptr = &buffer->name;
(char *)ptr < (char *)buffer + sizeof (struct buffer);
ptr++)
mark_object (ptr);
***************
*** 4942,4952 ****
case Lisp_Vectorlike:
if (GC_BUFFERP (obj))
! survives_p = XMARKBIT (XBUFFER (obj)->name);
else if (GC_SUBRP (obj))
survives_p = 1;
else
! survives_p = XVECTOR (obj)->size & ARRAY_MARK_FLAG;
break;
case Lisp_Cons:
--- 4936,4946 ----
case Lisp_Vectorlike:
if (GC_BUFFERP (obj))
! survives_p = VECTOR_MARKED_P (XBUFFER (obj));
else if (GC_SUBRP (obj))
survives_p = 1;
else
! survives_p = VECTOR_MARKED_P (XVECTOR (obj));
break;
case Lisp_Cons:
***************
*** 5212,5218 ****
{
if (!mblk->markers[i].u_marker.gcmarkbit)
{
- Lisp_Object tem;
if (mblk->markers[i].u_marker.type == Lisp_Misc_Marker)
unchain_marker (&mblk->markers[i].u_marker);
/* Set the type of the freed object to Lisp_Misc_Free.
--- 5206,5211 ----
***************
*** 5257,5263 ****
register struct buffer *buffer = all_buffers, *prev = 0, *next;
while (buffer)
! if (!XMARKBIT (buffer->name))
{
if (prev)
prev->next = buffer->next;
--- 5250,5256 ----
register struct buffer *buffer = all_buffers, *prev = 0, *next;
while (buffer)
! if (!VECTOR_MARKED_P (buffer))
{
if (prev)
prev->next = buffer->next;
***************
*** 5269,5275 ****
}
else
{
! XUNMARK (buffer->name);
UNMARK_BALANCE_INTERVALS (BUF_INTERVALS (buffer));
prev = buffer, buffer = buffer->next;
}
--- 5262,5268 ----
}
else
{
! VECTOR_UNMARK (buffer);
UNMARK_BALANCE_INTERVALS (BUF_INTERVALS (buffer));
prev = buffer, buffer = buffer->next;
}
***************
*** 5281,5287 ****
total_vector_size = 0;
while (vector)
! if (!(vector->size & ARRAY_MARK_FLAG))
{
if (prev)
prev->next = vector->next;
--- 5274,5280 ----
total_vector_size = 0;
while (vector)
! if (!VECTOR_MARKED_P (vector))
{
if (prev)
prev->next = vector->next;
***************
*** 5295,5301 ****
}
else
{
! vector->size &= ~ARRAY_MARK_FLAG;
if (vector->size & PSEUDOVECTOR_FLAG)
total_vector_size += (PSEUDOVECTOR_SIZE_MASK & vector->size);
else
--- 5288,5294 ----
}
else
{
! VECTOR_UNMARK (vector);
if (vector->size & PSEUDOVECTOR_FLAG)
total_vector_size += (PSEUDOVECTOR_SIZE_MASK & vector->size);
else