Use better data structures (incomplete)

7 files changed, 4 insertions, 24 deletions

diff --git a/Zend/zend.h b/Zend/zend.h
index ac3758d4ea..bf7f0d599a 100644
--- 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 bd1765f7ff..e9c6100593 100644
--- 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 98be2b45ef..03f239f9e1 100644
--- 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 96f06d6968..a7b9858fcb 100644
--- 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 67db98cca2..8811a978fd 100644
--- 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 dcbb9fce3e..67490d7a95 100644
--- 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 0619bad747..ddf35bcf71 100644
--- 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;
 };