Define ZEND_MM_* values at configure

Author: Girgias

Zend/Zend.m4

@@ -249,14 +249,14 @@ typedef union _mm_align_test {
 } mm_align_test;
 
 #if (defined (__GNUC__) && __GNUC__ >= 2)
-#define CONFIG_ZEND_MM_ALIGNMENT (__alignof__ (mm_align_test))
+#define ZEND_MM_ALIGNMENT  (__alignof__ (mm_align_test))
 #else
-#define CONFIG_ZEND_MM_ALIGNMENT (sizeof(mm_align_test))
+#define ZEND_MM_ALIGNMENT (sizeof(mm_align_test))
 #endif
 
 int main()
 {
-  int i = CONFIG_ZEND_MM_ALIGNMENT;
+  size_t i = ZEND_MM_ALIGNMENT;
   int zeros = 0;
   FILE *fp;
 
@@ -266,20 +266,23 @@ int main()
   }
 
   fp = fopen("conftest.zend", "w");
-  fprintf(fp, "%d %d\n", CONFIG_ZEND_MM_ALIGNMENT, zeros);
+  fprintf(fp, "(size_t)%zu (size_t)%d %d\n", ZEND_MM_ALIGNMENT, zeros, ZEND_MM_ALIGNMENT < 4);
   fclose(fp);
 
   return 0;
 }
 ]])], [
   LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
   LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
-  AC_DEFINE_UNQUOTED(CONFIG_ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
-  AC_DEFINE_UNQUOTED(CONFIG_ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ])
+  LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT=`cat conftest.zend | cut -d ' ' -f 3`
+  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
+  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ])
+  AC_DEFINE_UNQUOTED(ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT, $LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT, [ ])
 ], [], [
   dnl Cross compilation needs something here.
-  AC_DEFINE_UNQUOTED(CONFIG_ZEND_MM_ALIGNMENT_LOG2, 8, [ ])
-  AC_DEFINE_UNQUOTED(CONFIG_ZEND_MM_ALIGNMENT_LOG2, 3, [ ])
+  AC_DEFINE(ZEND_MM_ALIGNMENT, 8, [ ])
+  AC_DEFINE(ZEND_MM_ALIGNMENT_LOG2, 3, [ ])
+  AC_DEFINE(ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT, 0, [ ])
 ])
 
 AC_MSG_RESULT(done)

Zend/zend_alloc.h

@@ -26,16 +26,8 @@
 #include "../TSRM/TSRM.h"
 #include "zend.h"
 
-#ifndef CONFIG_ZEND_MM_ALIGNMENT
-# define ZEND_MM_ALIGNMENT (size_t)8
-# define ZEND_MM_ALIGNMENT_LOG2 (size_t)3
-#elif ZEND_MM_ALIGNMENT < 4
-# define ZEND_MM_ALIGNMENT (size_t)4
-# define ZEND_MM_ALIGNMENT_LOG2 (size_t)2
-# define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT 1
-#else
-# define ZEND_MM_ALIGNMENT (size_t)CONFIG_ZEND_MM_ALIGNMENT
-# define ZEND_MM_ALIGNMENT_LOG2 (size_t)CONFIG_ZEND_MM_ALIGNMENT_LOG2
+#ifndef ZEND_MM_ALIGNMENT
+# error "ZENF_MM_ALIGNMENT was not defined during configure"
 #endif
 
 #define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT - 1)

ext/opcache/ZendAccelerator.c

@@ -1426,7 +1426,7 @@ static zend_persistent_script *store_script_in_file_cache(zend_persistent_script
 	/* Align to 64-byte boundary */
 	ZCG(mem) = zend_arena_alloc(&CG(arena), memory_used + 64);
 	ZCG(mem) = (void*)(((zend_uintptr_t)ZCG(mem) + 63L) & ~63L);
-#elif defined(ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT)
+#elif ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
 	/* Align to 8-byte boundary */
 	ZCG(mem) = zend_arena_alloc(&CG(arena), memory_used + 8);
 	ZCG(mem) = (void*)(((zend_uintptr_t)ZCG(mem) + 7L) & ~7L);
@@ -2371,7 +2371,7 @@ static zend_class_entry* zend_accel_inheritance_cache_add(zend_class_entry *ce,
 
 	zend_shared_alloc_clear_xlat_table();
 
-#ifdef ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
+#if ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
 	/* Align to 8-byte boundary */
 	ZCG(mem) = zend_shared_alloc(size + 8);
 #else
@@ -2385,7 +2385,7 @@ static zend_class_entry* zend_accel_inheritance_cache_add(zend_class_entry *ce,
 		return NULL;
 	}
 
-#ifdef ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
+#if ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
 	/* Align to 8-byte boundary */
 	ZCG(mem) = (void*)(((zend_uintptr_t)ZCG(mem) + 7L) & ~7L);
 #endif

win32/build/config.w32.h.in

@@ -27,6 +27,10 @@
 #define DEFAULT_SHORT_OPEN_TAG "1"
 
 /* Platform-Specific Configuration. Should not be changed. */
+/* Alignment for Zend memory allocator */
+#define ZEND_MM_ALIGNMENT (size_t)8
+#define ZEND_MM_ALIGNMENT_LOG2 (size_t)3
+#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT 0
 #define PHP_SIGCHILD 0
 #define HAVE_GETSERVBYNAME 1
 #define HAVE_GETSERVBYPORT 1