Revision: 1223
http://www.exim.org/viewvc/pcre2?view=rev&revision=1223
Author: zherczeg
Date: 2020-02-21 07:44:04 +0000 (Fri, 21 Feb 2020)
Log Message:
-----------
JIT compiler update.
Modified Paths:
--------------
code/trunk/src/sljit/sljitConfigInternal.h
code/trunk/src/sljit/sljitNativeX86_common.c
code/trunk/src/sljit/sljitUtils.c
Modified: code/trunk/src/sljit/sljitConfigInternal.h
===================================================================
--- code/trunk/src/sljit/sljitConfigInternal.h 2020-02-20 08:57:39 UTC (rev 1222)
+++ code/trunk/src/sljit/sljitConfigInternal.h 2020-02-21 07:44:04 UTC (rev 1223)
@@ -297,6 +297,7 @@
/* Type of public API functions. */
/*********************************/
+#ifndef SLJIT_API_FUNC_ATTRIBUTE
#if (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC)
/* Static ABI functions. For all-in-one programs. */
@@ -310,6 +311,7 @@
#else
#define SLJIT_API_FUNC_ATTRIBUTE
#endif /* (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC) */
+#endif /* defined SLJIT_API_FUNC_ATTRIBUTE */
/****************************/
/* Instruction cache flush. */
Modified: code/trunk/src/sljit/sljitNativeX86_common.c
===================================================================
--- code/trunk/src/sljit/sljitNativeX86_common.c 2020-02-20 08:57:39 UTC (rev 1222)
+++ code/trunk/src/sljit/sljitNativeX86_common.c 2020-02-21 07:44:04 UTC (rev 1223)
@@ -726,7 +726,7 @@
*inst = 0xfa;
#endif
#else
- (void)compiler;
+ SLJIT_UNUSED_ARG(compiler);
#endif
return SLJIT_SUCCESS;
}
@@ -754,7 +754,8 @@
*inst++ = 0x1e;
*inst = (0x3 << 6) | (0x1 << 3) | (reg_map[reg] & 0x7);
#else
- (void)compiler;
+ SLJIT_UNUSED_ARG(compiler);
+ SLJIT_UNUSED_ARG(reg);
#endif
return SLJIT_SUCCESS;
}
@@ -782,7 +783,8 @@
*inst++ = 0xae;
*inst = (0x3 << 6) | (0x5 << 3) | (reg_map[reg] & 0x7);
#else
- (void)compiler;
+ SLJIT_UNUSED_ARG(compiler);
+ SLJIT_UNUSED_ARG(reg);
#endif
return SLJIT_SUCCESS;
}
@@ -860,6 +862,10 @@
*jz_after_cmp_inst = compiler->size - size_jz_after_cmp_inst;
#else /* SLJIT_CONFIG_X86_CET */
SLJIT_UNUSED_ARG(compiler);
+ SLJIT_UNUSED_ARG(src);
+ SLJIT_UNUSED_ARG(srcw);
+ SLJIT_UNUSED_ARG(base);
+ SLJIT_UNUSED_ARG(disp);
#endif /* SLJIT_CONFIG_X86_CET */
return SLJIT_SUCCESS;
}
Modified: code/trunk/src/sljit/sljitUtils.c
===================================================================
--- code/trunk/src/sljit/sljitUtils.c 2020-02-20 08:57:39 UTC (rev 1222)
+++ code/trunk/src/sljit/sljitUtils.c 2020-02-21 07:44:04 UTC (rev 1223)
@@ -212,6 +212,8 @@
#endif /* SLJIT_UTIL_STACK || SLJIT_EXECUTABLE_ALLOCATOR */
+#endif /* SLJIT_EXECUTABLE_ALLOCATOR || SLJIT_UTIL_GLOBAL_LOCK */
+
#if (defined SLJIT_UTIL_STACK && SLJIT_UTIL_STACK)
#if (defined SLJIT_UTIL_SIMPLE_STACK_ALLOCATION && SLJIT_UTIL_SIMPLE_STACK_ALLOCATION)
@@ -406,5 +408,3 @@
#endif /* SLJIT_UTIL_SIMPLE_STACK_ALLOCATION */
#endif /* SLJIT_UTIL_STACK */
-
-#endif