[Pcre-svn] [851] code/trunk: Minor JIT compiler update.

Revision: 851

          http://www.exim.org/viewvc/pcre2?view=rev&revision=851
Author:   zherczeg
Date:     2017-08-01 09:26:01 +0100 (Tue, 01 Aug 2017)
Log Message:
-----------
Minor JIT compiler update.

Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/src/sljit/sljitLir.c
    code/trunk/src/sljit/sljitLir.h
    code/trunk/src/sljit/sljitNativeMIPS_common.c
    code/trunk/src/sljit/sljitNativePPC_common.c

Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2017-07-29 15:54:04 UTC (rev 850)
+++ code/trunk/ChangeLog    2017-08-01 08:26:01 UTC (rev 851)
@@ -230,7 +230,10 @@
 53. Related to 52, though PCRE2 was throwing an error for [[:digit:]-X] it was
 not doing so for [\d-X] (and similar escapes), as is documented.

+54. Fixed a MIPS issue in the JIT compiler reported by Joshua Kinard.

+
+
Version 10.23 14-February-2017
------------------------------

Modified: code/trunk/src/sljit/sljitLir.c
===================================================================
--- code/trunk/src/sljit/sljitLir.c    2017-07-29 15:54:04 UTC (rev 850)
+++ code/trunk/src/sljit/sljitLir.c    2017-08-01 08:26:01 UTC (rev 851)
@@ -124,10 +124,10 @@
 /* SLJIT_REWRITABLE_JUMP is 0x1000. */

 #if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-#    define PATCH_MB    0x4
-#    define PATCH_MW    0x8
+#    define PATCH_MB        0x4
+#    define PATCH_MW        0x8
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-#    define PATCH_MD    0x10
+#    define PATCH_MD        0x10
 #endif
 #endif

@@ -1561,6 +1561,7 @@
     CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(dst_reg & ~SLJIT_I32_OP));
     if (src != SLJIT_IMM) {
         CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(src));
+        CHECK_ARGUMENT(srcw == 0);
     }

     if ((type & 0xff) <= SLJIT_NOT_ZERO)
@@ -1586,6 +1587,7 @@

 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_get_local_base(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw offset)
 {
+    /* Any offset is allowed. */
     SLJIT_UNUSED_ARG(offset);

#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)

Modified: code/trunk/src/sljit/sljitLir.h
===================================================================
--- code/trunk/src/sljit/sljitLir.h    2017-07-29 15:54:04 UTC (rev 850)
+++ code/trunk/src/sljit/sljitLir.h    2017-08-01 08:26:01 UTC (rev 851)
@@ -1225,7 +1225,15 @@
     sljit_s32 dst_reg,
     sljit_s32 src, sljit_sw srcw);

-/* Copies the base address of SLJIT_SP + offset to dst.
+/* Copies the base address of SLJIT_SP + offset to dst. The offset can be
+   anything to negate the effect of relative addressing. For example if an
+   array of sljit_sw values is stored on the stack from offset 0x40, and R0
+   contains the offset of an array item plus 0x120, this item can be
+   overwritten by two SLJIT instructions:
+
+   sljit_get_local_base(compiler, SLJIT_R1, 0, 0x40 - 0x120);
+   sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_MEM2(SLJIT_R1, SLJIT_R0), 0, SLJIT_IMM, 0x5);
+
    Flags: - (may destroy flags) */
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_get_local_base(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw offset);

Modified: code/trunk/src/sljit/sljitNativeMIPS_common.c
===================================================================
--- code/trunk/src/sljit/sljitNativeMIPS_common.c    2017-07-29 15:54:04 UTC (rev 850)
+++ code/trunk/src/sljit/sljitNativeMIPS_common.c    2017-08-01 08:26:01 UTC (rev 851)
@@ -498,12 +498,13 @@

 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 {
+    sljit_sw fir = 0;
+
     switch (feature_type) {
     case SLJIT_HAS_FPU:
 #ifdef SLJIT_IS_FPU_AVAILABLE
         return SLJIT_IS_FPU_AVAILABLE;
 #elif defined(__GNUC__)
-        sljit_sw fir;
         asm ("cfc1 %0, $0" : "=r"(fir));
         return (fir >> 22) & 0x1;
 #else
@@ -517,7 +518,7 @@
 #endif

     default:
-        return 0;
+        return fir;
     }
 }

Modified: code/trunk/src/sljit/sljitNativePPC_common.c
===================================================================
--- code/trunk/src/sljit/sljitNativePPC_common.c    2017-07-29 15:54:04 UTC (rev 850)
+++ code/trunk/src/sljit/sljitNativePPC_common.c    2017-08-01 08:26:01 UTC (rev 851)
@@ -760,7 +760,7 @@
     (((inst) & ~(INT_ALIGNED | UPDATE_REQ)) | (((flags) & MEM_MASK) <= GPR_REG ? D(reg) : FD(reg)))
 #endif

-static const sljit_ins data_transfer_insts[64 + 8] = {
+static const sljit_ins data_transfer_insts[64 + 16] = {

/* -------- Unsigned -------- */

@@ -869,11 +869,20 @@
/* d n x s */ HI(31) | LO(727) /* stfdx */,
/* d n x l */ HI(31) | LO(599) /* lfdx */,

+/* d w i s */ HI(55) /* stfdu */,
+/* d w i l */ HI(51) /* lfdu */,
+/* d w x s */ HI(31) | LO(759) /* stfdux */,
+/* d w x l */ HI(31) | LO(631) /* lfdux */,
+
/* s n i s */ HI(52) /* stfs */,
/* s n i l */ HI(48) /* lfs */,
/* s n x s */ HI(31) | LO(663) /* stfsx */,
/* s n x l */ HI(31) | LO(535) /* lfsx */,

+/* s w i s */ HI(53) /* stfsu */,
+/* s w i l */ HI(49) /* lfsu */,
+/* s w x s */ HI(31) | LO(695) /* stfsux */,
+/* s w x l */ HI(31) | LO(567) /* lfsux */,
};

 #undef ARCH_32_64
@@ -1753,7 +1762,7 @@
 /*  Floating point operators                                             */
 /* --------------------------------------------------------------------- */

-#define FLOAT_DATA(op) (DOUBLE_DATA | ((op & SLJIT_F32_OP) >> 6))
+#define FLOAT_DATA(op) (DOUBLE_DATA | ((op & SLJIT_F32_OP) >> 5))
#define SELECT_FOP(op, single, double) ((op & SLJIT_F32_OP) ? single : double)

#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)