procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mark relocation workarounds with REL_ALLOC

Browse source 
* src/search.c (boyer_moore): Mark workarounds for ralloc.c
relocation of buffer text with "#ifdef REL_ALLOC".
This commit is contained in:
Eli Zaretskii 2016-11-04 10:36:02 +02:00
parent 5043e0a7e0
commit 0221b7a9b5
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/search.c
View file

@ -2029,20 +2029,27 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
cursor += dirlen - i - direction; /* fix cursor */ cursor += dirlen - i - direction; /* fix cursor */
if (i + direction == 0) if (i + direction == 0)
{ {
ptrdiff_t position, start, end, cursor_off; ptrdiff_t position, start, end;
#ifdef REL_ALLOC
ptrdiff_t cursor_off;
#endif
cursor -= direction; cursor -= direction;
position = pos_byte + cursor - p2 + ((direction > 0) position = pos_byte + cursor - p2 + ((direction > 0)
? 1 - len_byte : 0); ? 1 - len_byte : 0);
#ifdef REL_ALLOC
/* set_search_regs might call malloc, which could /* set_search_regs might call malloc, which could
cause ralloc.c relocate buffer text. We need to cause ralloc.c relocate buffer text. We need to
update pointers into buffer text due to that. */ update pointers into buffer text due to that. */
cursor_off = cursor - p2; cursor_off = cursor - p2;
#endif
set_search_regs (position, len_byte); set_search_regs (position, len_byte);
#ifdef REL_ALLOC
p_limit = BYTE_POS_ADDR (limit); p_limit = BYTE_POS_ADDR (limit);
p2 = BYTE_POS_ADDR (pos_byte); p2 = BYTE_POS_ADDR (pos_byte);
cursor = p2 + cursor_off; cursor = p2 + cursor_off;
#endif
if (NILP (Vinhibit_changing_match_data)) if (NILP (Vinhibit_changing_match_data))
{ {