mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-11 22:11:21 -08:00
Code Issues Projects Releases Wiki Activity

Simplify and regularize some offset tests in alloc.c

Browse source 
* src/alloc.c (live_string_holding, live_cons_holding)
(live_symbol_holding, live_float_p): Simplify and regularize.
This commit is contained in:
Paul Eggert 2020-06-01 22:41:33 -07:00
parent e10940f3f1
commit 3973f68f59
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/alloc.c
View file

@ -4456,7 +4456,7 @@ live_string_holding (struct mem_node *m, void *p)
/* P must point into a Lisp_String structure, and it
must not be on the free-list. */
if (0 <= offset && offset < STRING_BLOCK_SIZE * sizeof b->strings[0])
if (0 <= offset && offset < sizeof b->strings)
{
cp = ptr_bounds_copy (cp, b);
struct Lisp_String *s = p = cp -= offset % sizeof b->strings[0];
@ -4489,7 +4489,7 @@ live_cons_holding (struct mem_node *m, void *p)
/* P must point into a Lisp_Cons, not be
one of the unused cells in the current cons block,
and not be on the free-list. */
if (0 <= offset && offset < CONS_BLOCK_SIZE * sizeof b->conses[0]
if (0 <= offset && offset < sizeof b->conses
&& (b != cons_block
|| offset / sizeof b->conses[0] < cons_block_index))
{
@ -4525,7 +4525,7 @@ live_symbol_holding (struct mem_node *m, void *p)
/* P must point into the Lisp_Symbol, not be
one of the unused cells in the current symbol block,
and not be on the free-list. */
if (0 <= offset && offset < SYMBOL_BLOCK_SIZE * sizeof b->symbols[0]
if (0 <= offset && offset < sizeof b->symbols
&& (b != symbol_block
|| offset / sizeof b->symbols[0] < symbol_block_index))
{
@ -4559,9 +4559,8 @@ live_float_p (struct mem_node *m, void *p)
/* P must point to the start of a Lisp_Float and not be
one of the unused cells in the current float block. */
return (offset >= 0
return (0 <= offset && offset < sizeof b->floats
&& offset % sizeof b->floats[0] == 0
&& offset < (FLOAT_BLOCK_SIZE * sizeof b->floats[0])
&& (b != float_block
|| offset / sizeof b->floats[0] < float_block_index));
}