Mercurial > emacs
comparison src/alloc.c @ 90982:a66921565bcb
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 806-813)
- Merge from emacs--rel--22
- Update from CVS
* 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--unicode--0--patch-230
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 15 Jul 2007 04:47:46 +0000 |
| parents | 3371fc48749b a4517fcdd6e1 |
| children | f55f9811f5d7 |
comparison
equal
deleted
inserted
replaced
| 90981:a37d5bf6cbb7 | 90982:a66921565bcb |
|---|---|
| 1177 static void | 1177 static void |
| 1178 emacs_blocked_free (ptr, ptr2) | 1178 emacs_blocked_free (ptr, ptr2) |
| 1179 void *ptr; | 1179 void *ptr; |
| 1180 const void *ptr2; | 1180 const void *ptr2; |
| 1181 { | 1181 { |
| 1182 EMACS_INT bytes_used_now; | |
| 1183 | |
| 1184 BLOCK_INPUT_ALLOC; | 1182 BLOCK_INPUT_ALLOC; |
| 1185 | 1183 |
| 1186 #ifdef GC_MALLOC_CHECK | 1184 #ifdef GC_MALLOC_CHECK |
| 1187 if (ptr) | 1185 if (ptr) |
| 1188 { | 1186 { |
| 4218 mark_maybe_pointer (p) | 4216 mark_maybe_pointer (p) |
| 4219 void *p; | 4217 void *p; |
| 4220 { | 4218 { |
| 4221 struct mem_node *m; | 4219 struct mem_node *m; |
| 4222 | 4220 |
| 4223 /* Quickly rule out some values which can't point to Lisp data. We | 4221 /* Quickly rule out some values which can't point to Lisp data. */ |
| 4224 assume that Lisp data is aligned on even addresses. */ | 4222 if ((EMACS_INT) p % |
| 4225 if ((EMACS_INT) p & 1) | 4223 #ifdef USE_LSB_TAG |
| 4224 8 /* USE_LSB_TAG needs Lisp data to be aligned on multiples of 8. */ | |
| 4225 #else | |
| 4226 2 /* We assume that Lisp data is aligned on even addresses. */ | |
| 4227 #endif | |
| 4228 ) | |
| 4226 return; | 4229 return; |
| 4227 | 4230 |
| 4228 m = mem_find (p); | 4231 m = mem_find (p); |
| 4229 if (m != MEM_NIL) | 4232 if (m != MEM_NIL) |
| 4230 { | 4233 { |
