comparison src/alloc.c @ 83644:0ece58f6e0aa

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 803-813) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 51-58) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 233-236) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
author Miles Bader <miles@gnu.org>
date Sun, 15 Jul 2007 02:05:20 +0000
parents cc587bfd19ca a4517fcdd6e1
children 65663fcd2caa
comparison
equal deleted inserted replaced
83643:70b38dec13a1 83644:0ece58f6e0aa
1179 static void 1179 static void
1180 emacs_blocked_free (ptr, ptr2) 1180 emacs_blocked_free (ptr, ptr2)
1181 void *ptr; 1181 void *ptr;
1182 const void *ptr2; 1182 const void *ptr2;
1183 { 1183 {
1184 EMACS_INT bytes_used_now;
1185
1186 BLOCK_INPUT_ALLOC; 1184 BLOCK_INPUT_ALLOC;
1187 1185
1188 #ifdef GC_MALLOC_CHECK 1186 #ifdef GC_MALLOC_CHECK
1189 if (ptr) 1187 if (ptr)
1190 { 1188 {
4264 mark_maybe_pointer (p) 4262 mark_maybe_pointer (p)
4265 void *p; 4263 void *p;
4266 { 4264 {
4267 struct mem_node *m; 4265 struct mem_node *m;
4268 4266
4269 /* Quickly rule out some values which can't point to Lisp data. We 4267 /* Quickly rule out some values which can't point to Lisp data. */
4270 assume that Lisp data is aligned on even addresses. */ 4268 if ((EMACS_INT) p %
4271 if ((EMACS_INT) p & 1) 4269 #ifdef USE_LSB_TAG
4270 8 /* USE_LSB_TAG needs Lisp data to be aligned on multiples of 8. */
4271 #else
4272 2 /* We assume that Lisp data is aligned on even addresses. */
4273 #endif
4274 )
4272 return; 4275 return;
4273 4276
4274 m = mem_find (p); 4277 m = mem_find (p);
4275 if (m != MEM_NIL) 4278 if (m != MEM_NIL)
4276 { 4279 {