diff options
author | zherczeg <zherczeg@6239d852-aaf2-0410-a92c-79f79f948069> | 2019-07-23 12:34:58 +0000 |
---|---|---|
committer | zherczeg <zherczeg@6239d852-aaf2-0410-a92c-79f79f948069> | 2019-07-23 12:34:58 +0000 |
commit | 37158d060dd5f90980cda777fdf0eeebb7870c50 (patch) | |
tree | 4b073b730de5dce1f122de1cce921b2592febfa7 /src/sljit | |
parent | 925a5f766203a9cea8ec690627608111331f4dd7 (diff) | |
download | pcre2-37158d060dd5f90980cda777fdf0eeebb7870c50.tar.gz |
Follow the partial matching changes in JIT.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1143 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'src/sljit')
-rw-r--r-- | src/sljit/sljitConfigInternal.h | 4 | ||||
-rw-r--r-- | src/sljit/sljitNativeX86_64.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/sljit/sljitConfigInternal.h b/src/sljit/sljitConfigInternal.h index ba60311..acba9da 100644 --- a/src/sljit/sljitConfigInternal.h +++ b/src/sljit/sljitConfigInternal.h @@ -214,6 +214,10 @@ #define SLJIT_MEMCPY(dest, src, len) memcpy(dest, src, len) #endif +#ifndef SLJIT_MEMMOVE +#define SLJIT_MEMMOVE(dest, src, len) memmove(dest, src, len) +#endif + #ifndef SLJIT_ZEROMEM #define SLJIT_ZEROMEM(dest, len) memset(dest, 0, len) #endif diff --git a/src/sljit/sljitNativeX86_64.c b/src/sljit/sljitNativeX86_64.c index 8ebbd1c..5758711 100644 --- a/src/sljit/sljitNativeX86_64.c +++ b/src/sljit/sljitNativeX86_64.c @@ -103,7 +103,7 @@ static sljit_u8* generate_put_label_code(struct sljit_put_label *put_label, slji } code_ptr -= put_label->flags + (2 + sizeof(sljit_uw)); - SLJIT_MEMCPY(code_ptr, code_ptr + (2 + sizeof(sljit_uw)), put_label->flags); + SLJIT_MEMMOVE(code_ptr, code_ptr + (2 + sizeof(sljit_uw)), put_label->flags); SLJIT_ASSERT((code_ptr[0] & 0xf8) == REX_W); |