JIT compiler update.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1456 2f5784b3-3f2a-0410-8824-cb99058d5e15

7 files changed, 12 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index 63efc09..88915b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -350,9 +350,9 @@ EXTRA_DIST += \
   sljit/sljitExecAllocator.c \
   sljit/sljitLir.c \
   sljit/sljitLir.h \
+  sljit/sljitNativeARM_32.c \
   sljit/sljitNativeARM_64.c \
-  sljit/sljitNativeARM_Thumb2.c \
-  sljit/sljitNativeARM_v5.c \
+  sljit/sljitNativeARM_T2_32.c \
   sljit/sljitNativeMIPS_32.c \
   sljit/sljitNativeMIPS_common.c \
   sljit/sljitNativePPC_32.c \
diff --git a/sljit/sljitLir.c b/sljit/sljitLir.c
index 024a379..d714739 100644
--- a/sljit/sljitLir.c
+++ b/sljit/sljitLir.c
@@ -1363,11 +1363,11 @@ static SLJIT_INLINE sljit_si emit_mov_before_return(struct sljit_compiler *compi
 #elif (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 #	include "sljitNativeX86_common.c"
 #elif (defined SLJIT_CONFIG_ARM_V5 && SLJIT_CONFIG_ARM_V5)
-#	include "sljitNativeARM_v5.c"
+#	include "sljitNativeARM_32.c"
 #elif (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
-#	include "sljitNativeARM_v5.c"
+#	include "sljitNativeARM_32.c"
 #elif (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
-#	include "sljitNativeARM_Thumb2.c"
+#	include "sljitNativeARM_T2_32.c"
 #elif (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64)
 #	include "sljitNativeARM_64.c"
 #elif (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
diff --git a/sljit/sljitNativeARM_v5.c b/sljit/sljitNativeARM_32.c
index 30dfdc3..30dfdc3 100644
--- a/sljit/sljitNativeARM_v5.c
+++ b/sljit/sljitNativeARM_32.c
diff --git a/sljit/sljitNativeARM_Thumb2.c b/sljit/sljitNativeARM_T2_32.c
index 2f6180c..2f6180c 100644
--- a/sljit/sljitNativeARM_Thumb2.c
+++ b/sljit/sljitNativeARM_T2_32.c
diff --git a/sljit/sljitNativePPC_64.c b/sljit/sljitNativePPC_64.c
index 39c1948..182ac7b 100644
--- a/sljit/sljitNativePPC_64.c
+++ b/sljit/sljitNativePPC_64.c
@@ -54,7 +54,7 @@ static sljit_si load_immediate(struct sljit_compiler *compiler, sljit_si reg, sl
 	if (!(imm & ~0xffff))
 		return push_inst(compiler, ORI | S(TMP_ZERO) | A(reg) | IMM(imm));
 
-	if (imm <= SLJIT_W(0x7fffffff) && imm >= SLJIT_W(-0x80000000)) {
+	if (imm <= 0x7fffffffl && imm >= -0x80000000l) {
 		FAIL_IF(push_inst(compiler, ADDIS | D(reg) | A(0) | IMM(imm >> 16)));
 		return (imm & 0xffff) ? push_inst(compiler, ORI | S(reg) | A(reg) | IMM(imm)) : SLJIT_SUCCESS;
 	}
diff --git a/sljit/sljitNativePPC_common.c b/sljit/sljitNativePPC_common.c
index 51fee60..f5c4f26 100644
--- a/sljit/sljitNativePPC_common.c
+++ b/sljit/sljitNativePPC_common.c
@@ -836,7 +836,7 @@ static sljit_si can_cache(sljit_si arg, sljit_sw argw, sljit_si next_arg, sljit_
 	next_high_short = (next_argw + ((next_argw & 0x8000) << 1)) & ~0xffff;
 	return high_short == next_high_short;
 #else
-	if (argw <= SLJIT_W(0x7fffffff) && argw >= SLJIT_W(-0x80000000)) {
+	if (argw <= 0x7fffffffl && argw >= -0x80000000l) {
 		high_short = (argw + ((argw & 0x8000) << 1)) & ~0xffff;
 		next_high_short = (next_argw + ((next_argw & 0x8000) << 1)) & ~0xffff;
 		if (high_short == next_high_short)
@@ -912,7 +912,7 @@ static sljit_si getput_arg(struct sljit_compiler *compiler, sljit_si inp_flags,
 	SLJIT_ASSERT((arg & REG_MASK) || !(inst & UPDATE_REQ));
 
 #if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-	if (argw <= SLJIT_W(0x7fff7fff) && argw >= SLJIT_W(-0x80000000)
+	if (argw <= 0x7fff7fffl && argw >= -0x80000000l
 			&& (!(inst & INT_ALIGNED) || !(argw & 0x3)) && !(inst & UPDATE_REQ)) {
 #endif
 
@@ -920,7 +920,7 @@ static sljit_si getput_arg(struct sljit_compiler *compiler, sljit_si inp_flags,
 		high_short = (sljit_si)(argw + ((argw & 0x8000) << 1)) & ~0xffff;
 		/* The getput_arg_fast should handle this otherwise. */
 #if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-		SLJIT_ASSERT(high_short && high_short <= SLJIT_W(0x7fffffff) && high_short >= SLJIT_W(-0x80000000));
+		SLJIT_ASSERT(high_short && high_short <= 0x7fffffffl && high_short >= -0x80000000l);
 #else
 		SLJIT_ASSERT(high_short && !(inst & (INT_ALIGNED | UPDATE_REQ)));
 #endif
@@ -1342,7 +1342,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op1(struct sljit_compiler *compiler
 
 #if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
 #define TEST_SH_IMM(src, srcw) \
-	(((src) & SLJIT_IMM) && !((srcw) & 0xffff) && (srcw) <= SLJIT_W(0x7fffffff) && (srcw) >= SLJIT_W(-0x80000000))
+	(((src) & SLJIT_IMM) && !((srcw) & 0xffff) && (srcw) <= 0x7fffffffl && (srcw) >= -0x80000000l)
 #else
 #define TEST_SH_IMM(src, srcw) \
 	(((src) & SLJIT_IMM) && !((srcw) & 0xffff))
@@ -1353,7 +1353,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op1(struct sljit_compiler *compiler
 
 #if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
 #define TEST_ADD_IMM(src, srcw) \
-	(((src) & SLJIT_IMM) && (srcw) <= SLJIT_W(0x7fff7fff) && (srcw) >= SLJIT_W(-0x80000000))
+	(((src) & SLJIT_IMM) && (srcw) <= 0x7fff7fffl && (srcw) >= -0x80000000l)
 #else
 #define TEST_ADD_IMM(src, srcw) \
 	((src) & SLJIT_IMM)
diff --git a/sljit/sljitNativeX86_64.c b/sljit/sljitNativeX86_64.c
index 8e22f91..9fac0b9 100644
--- a/sljit/sljitNativeX86_64.c
+++ b/sljit/sljitNativeX86_64.c
@@ -69,7 +69,7 @@ static sljit_ub* generate_fixed_jump(sljit_ub *code_ptr, sljit_sw addr, sljit_si
 {
 	sljit_sw delta = addr - ((sljit_sw)code_ptr + 1 + sizeof(sljit_si));
 
-	if (delta <= SLJIT_W(0x7fffffff) && delta >= SLJIT_W(-0x80000000)) {
+	if (delta <= 0x7fffffffl && delta >= -0x80000000l) {
 		*code_ptr++ = (type == 2) ? CALL_i32 : JMP_i32;
 		*(sljit_sw*)code_ptr = delta;
 	}