@@ -702,7 +702,6 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals) /* {{
702702 compiler_globals -> script_encoding_list = NULL ;
703703 compiler_globals -> current_linking_class = NULL ;
704704
705- #if ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR_OR_OFFSET
706705 /* Map region is going to be created and resized at run-time. */
707706 ZEND_MAP_PTR_SET_REAL_BASE (compiler_globals -> map_ptr_base , NULL );
708707 compiler_globals -> map_ptr_size = 0 ;
@@ -715,9 +714,6 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals) /* {{
715714 ZEND_MAP_PTR_SET_REAL_BASE (compiler_globals -> map_ptr_base , base );
716715 memset (base , 0 , compiler_globals -> map_ptr_last * sizeof (void * ));
717716 }
718- #else
719- # error "Unknown ZEND_MAP_PTR_KIND"
720- #endif
721717}
722718/* }}} */
723719
@@ -965,22 +961,10 @@ void zend_startup(zend_utility_functions *utility_functions) /* {{{ */
965961#ifdef ZEND_WIN32
966962 zend_get_windows_version_info (& EG (windows_version_info ));
967963#endif
968- # if ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR
969- /* Create a map region, used for indirect pointers from shared to
970- * process memory. It's allocated once and never resized.
971- * All processes must map it into the same address space.
972- */
973- CG (map_ptr_size ) = 1024 * 1024 ; // TODO: initial size ???
974- CG (map_ptr_last ) = 0 ;
975- ZEND_MAP_PTR_SET_REAL_BASE (CG (map_ptr_base ), pemalloc (CG (map_ptr_size ) * sizeof (void * ), 1 ));
976- # elif ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR_OR_OFFSET
977- /* Map region is going to be created and resized at run-time. */
978- ZEND_MAP_PTR_SET_REAL_BASE (CG (map_ptr_base ), NULL );
979- CG (map_ptr_size ) = 0 ;
980- CG (map_ptr_last ) = 0 ;
981- # else
982- # error "Unknown ZEND_MAP_PTR_KIND"
983- # endif
964+ /* Map region is going to be created and resized at run-time. */
965+ ZEND_MAP_PTR_SET_REAL_BASE (CG (map_ptr_base ), NULL );
966+ CG (map_ptr_size ) = 0 ;
967+ CG (map_ptr_last ) = 0 ;
984968#endif
985969 EG (error_reporting ) = E_ALL & ~E_NOTICE ;
986970
@@ -1815,27 +1799,14 @@ ZEND_API void *zend_map_ptr_new(void)
18151799 void * * ptr ;
18161800
18171801 if (CG (map_ptr_last ) >= CG (map_ptr_size )) {
1818- #if ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR
1819- // TODO: error ???
1820- ZEND_UNREACHABLE ();
1821- #elif ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR_OR_OFFSET
18221802 /* Grow map_ptr table */
18231803 CG (map_ptr_size ) = ZEND_MM_ALIGNED_SIZE_EX (CG (map_ptr_last ) + 1 , 4096 );
18241804 ZEND_MAP_PTR_SET_REAL_BASE (CG (map_ptr_base ), perealloc (ZEND_MAP_PTR_REAL_BASE (CG (map_ptr_base )), CG (map_ptr_size ) * sizeof (void * ), 1 ));
1825- #else
1826- # error "Unknown ZEND_MAP_PTR_KIND"
1827- #endif
18281805 }
18291806 ptr = (void * * )ZEND_MAP_PTR_REAL_BASE (CG (map_ptr_base )) + CG (map_ptr_last );
18301807 * ptr = NULL ;
18311808 CG (map_ptr_last )++ ;
1832- #if ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR
1833- return ptr ;
1834- #elif ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR_OR_OFFSET
18351809 return ZEND_MAP_PTR_PTR2OFFSET (ptr );
1836- #else
1837- # error "Unknown ZEND_MAP_PTR_KIND"
1838- #endif
18391810}
18401811
18411812ZEND_API void zend_map_ptr_extend (size_t last )
@@ -1844,16 +1815,9 @@ ZEND_API void zend_map_ptr_extend(size_t last)
18441815 void * * ptr ;
18451816
18461817 if (last >= CG (map_ptr_size )) {
1847- #if ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR
1848- /* This may never happen */
1849- ZEND_UNREACHABLE ();
1850- #elif ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR_OR_OFFSET
18511818 /* Grow map_ptr table */
18521819 CG (map_ptr_size ) = ZEND_MM_ALIGNED_SIZE_EX (last , 4096 );
18531820 ZEND_MAP_PTR_SET_REAL_BASE (CG (map_ptr_base ), perealloc (ZEND_MAP_PTR_REAL_BASE (CG (map_ptr_base )), CG (map_ptr_size ) * sizeof (void * ), 1 ));
1854- #else
1855- # error "Unknown ZEND_MAP_PTR_KIND"
1856- #endif
18571821 }
18581822 ptr = (void * * )ZEND_MAP_PTR_REAL_BASE (CG (map_ptr_base )) + CG (map_ptr_last );
18591823 memset (ptr , 0 , (last - CG (map_ptr_last )) * sizeof (void * ));
0 commit comments