Refactor simpleXML (compilable, but incompleted)

Author: laruence

ext/libxml/php_libxml.h

@@ -75,10 +75,10 @@ typedef struct _php_libxml_node_ptr {
 } php_libxml_node_ptr;
 
 typedef struct _php_libxml_node_object {
-	zend_object  std;
 	php_libxml_node_ptr *node;
 	php_libxml_ref_obj *document;
 	HashTable *properties;
+	zend_object  std;
 } php_libxml_node_object;
 
 typedef void * (*php_libxml_export_node) (zval *object TSRMLS_DC);

ext/simplexml/php_simplexml.h

@@ -55,7 +55,6 @@ typedef enum {
 } SXE_ITER;
 
 typedef struct {
-	zend_object zo;
 	php_libxml_node_ptr *node;
 	php_libxml_ref_obj *document;
 	HashTable *properties;
@@ -65,10 +64,11 @@ typedef struct {
 		xmlChar               *nsprefix;
 		int                   isprefix;
 		SXE_ITER              type;
-		zval                  *data;
+		zval                  data;
 	} iter;
-	zval *tmp;
+	zval tmp;
 	zend_function *fptr_count;
+	zend_object zo;
 } php_sxe_object;
 
 #ifdef ZTS

ext/simplexml/php_simplexml_exports.h

@@ -39,16 +39,15 @@
 	} \
 }
 
-PHP_SXE_API zend_object_value sxe_object_new(zend_class_entry *ce TSRMLS_DC);
-/* {{{ php_sxe_fetch_object()
- */
-static inline php_sxe_object *
-php_sxe_fetch_object(zval *object TSRMLS_DC)
-{
-	return (php_sxe_object *) zend_object_store_get_object(object TSRMLS_CC);
+PHP_SXE_API zend_object *sxe_object_new(zend_class_entry *ce TSRMLS_DC);
+
+static inline php_sxe_object *php_sxe_fetch_object(zend_object *obj) /* {{{ */ {
+	return (php_sxe_object *)((char*)(obj) - XtOffsetOf(php_sxe_object, zo));
 }
 /* }}} */
 
+#define Z_SXEOBJ_P(zv) php_sxe_fetch_object(Z_OBJ_P((zv)))
+
 typedef struct {
 	zend_object_iterator  intern;
 	php_sxe_object        *sxe;