Use better data structures (incomplete)

diff --git a/Zend/zend.h b/Zend/zend.h
index ac3758d4ea0d6cfd26252dc33ffbe764fe909e6c..bf7f0d599ae8b255eaed3919c64c566717df9664 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -705,8 +705,6 @@ END_EXTERN_C()
                Z_DELREF_P((pzv));                                      \
        }                                                                               \
 
-//???  INIT_PZVAL(&(zv));
-       
 #define REPLACE_ZVAL_VALUE(ppzv_dest, pzv_src, copy) { \
        int is_ref, refcount;                                           \
                                                                                                \

diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index bd1765f7ff3a81a7612d8af1bad53e99ad4dee18..e9c6100593735d21ccc152d4028807d124628999 100644 (file)
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -161,12 +161,6 @@ ZEND_API size_t zend_memory_peak_usage(int real_usage TSRMLS_DC);
 
 END_EXTERN_C()
 
-/* fast cache for zval's */
-//???#define ALLOC_ZVAL(z)             (z) = (zval *) emalloc(sizeof(zval))
-//???#define FREE_ZVAL(z)              efree_rel(z)
-//???#define ALLOC_ZVAL_REL(z) (z) = (zval *) emalloc_rel(sizeof(zval))
-//???#define FREE_ZVAL_REL(z)  efree_rel(z)
-
 /* fast cache for HashTables */
 #define ALLOC_HASHTABLE(ht)    \
        (ht) = (HashTable *) emalloc(sizeof(HashTable))

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 98be2b45ef778e9d9cbd7afc6bce19782968c125..03f239f9e19589ed2f6abd0223606eb13a66616c 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -698,8 +698,6 @@ int zend_get_class_fetch_type(const char *class_name, uint class_name_len);
 
 typedef zend_bool (*zend_auto_global_callback)(zend_string *name TSRMLS_DC);
 typedef struct _zend_auto_global {
-//???  const char *name;
-//???  uint name_len;
        zend_string *name;
        zend_auto_global_callback auto_global_callback;
        zend_bool jit;

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 96f06d696820f42c37442fd66f104942d1cc515d..a7b9858fcb296415d57850730ac3711fdfe9b52b 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -246,9 +246,8 @@ static zend_always_inline void *zend_vm_stack_alloc(size_t size TSRMLS_DC)
 
 static zend_always_inline zval* zend_vm_stack_frame_base(zend_execute_data *ex)
 {
-//???  return (void**)((char*)ex->call_slots +
-//???          ZEND_MM_ALIGNED_SIZE(sizeof(call_slot)) * ex->op_array->nested_calls);
-       return NULL;
+       return (zval*)((char*)ex->call_slots +
+               ZEND_MM_ALIGNED_SIZE(sizeof(call_slot)) * ex->op_array->nested_calls);
 }
 
 static zend_always_inline void zend_vm_stack_free(void *ptr TSRMLS_DC)

diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index 67db98cca209629478f9b79de6ccc07d34eed2e0..8811a978fdc7a52f76b2c473dd3a5042525b86c3 100644 (file)
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -30,12 +30,6 @@ BEGIN_EXTERN_C()
 #define ZEND_RESOURCE_LIST_TYPE_STD    1
 #define ZEND_RESOURCE_LIST_TYPE_EX     2
 
-//???typedef struct _zend_rsrc_list_entry {
-//???  void *ptr;
-//???  int type;
-//???  int refcount;
-//???} zend_rsrc_list_entry;
-
 typedef void (*rsrc_dtor_func_t)(zend_resource *res TSRMLS_DC);
 #define ZEND_RSRC_DTOR_FUNC(name) void name(zend_resource *res TSRMLS_DC)
 

diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index dcbb9fce3ed3cbb7d8ca3140663ea00549565f82..67490d7a95ee4f84e443309116a5bca331f91eab 100644 (file)
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -227,9 +227,6 @@ EMPTY_SWITCH_DEFAULT_CASE()
        return hash;
 }
 
-//???#define str_estrndup(str, len) (IS_INTERNED(str) ? (str) : estrndup((str), (len)))
-//???#define str_strndup(str, len)     (IS_INTERNED(str) ? (str) : zend_strndup((str), (len)));
-
 #endif /* ZEND_STRING_H */
 
 /*

diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index 0619bad7478600b2b7d153830253ee867a5c56bf..ddf35bcf7131c66555a08ab9395e16229f8547e0 100644 (file)
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -148,7 +148,7 @@ struct _zend_array {
 
 struct _zend_object {
        zend_refcounted   gc;
-       zend_uint         handle;
+       zend_uint         handle; //??? may be removed?
        zend_class_entry *ce;
        const zend_object_handlers *handlers;
        HashTable        *properties;
@@ -158,7 +158,7 @@ struct _zend_object {
 
 struct _zend_resource {
        zend_refcounted   gc;
-       long              handle; //???
+       long              handle; //??? may be removed?
        int               type;
        void             *ptr;
 };