Use fastcall calling convention for objects and resources API

diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index 1f97af9c0c5f983b6d31721a33efb562d1b00a22..1e86a585423cb453c3b32c87bdd61ada66c60f36 100644 (file)
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -31,7 +31,7 @@ ZEND_API int le_index_ptr;
 /* true global */
 static HashTable list_destructors;
 
-ZEND_API zval *zend_list_insert(void *ptr, int type)
+ZEND_API zval* ZEND_FASTCALL zend_list_insert(void *ptr, int type)
 {
        int index;
        zval zv;
@@ -44,7 +44,7 @@ ZEND_API zval *zend_list_insert(void *ptr, int type)
        return zend_hash_index_add_new(&EG(regular_list), index, &zv);
 }
 
-ZEND_API int zend_list_delete(zend_resource *res)
+ZEND_API int ZEND_FASTCALL zend_list_delete(zend_resource *res)
 {
        if (GC_DELREF(res) <= 0) {
                return zend_hash_index_del(&EG(regular_list), res->handle);
@@ -53,7 +53,7 @@ ZEND_API int zend_list_delete(zend_resource *res)
        }
 }
 
-ZEND_API int zend_list_free(zend_resource *res)
+ZEND_API int ZEND_FASTCALL zend_list_free(zend_resource *res)
 {
        if (GC_REFCOUNT(res) <= 0) {
                return zend_hash_index_del(&EG(regular_list), res->handle);
@@ -81,7 +81,7 @@ static void zend_resource_dtor(zend_resource *res)
 }
 
 
-ZEND_API int zend_list_close(zend_resource *res)
+ZEND_API int ZEND_FASTCALL zend_list_close(zend_resource *res)
 {
        if (GC_REFCOUNT(res) <= 0) {
                return zend_list_free(res);

diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index cc813be557fa59f5c373470ce28d114da8468899..bad9ad4b3bdd0503c54dbe1b1a175710ff0efb74 100644 (file)
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -54,10 +54,10 @@ void zend_destroy_rsrc_list(HashTable *ht);
 int zend_init_rsrc_list_dtors(void);
 void zend_destroy_rsrc_list_dtors(void);
 
-ZEND_API zval *zend_list_insert(void *ptr, int type);
-ZEND_API int zend_list_free(zend_resource *res);
-ZEND_API int zend_list_delete(zend_resource *res);
-ZEND_API int zend_list_close(zend_resource *res);
+ZEND_API zval* ZEND_FASTCALL zend_list_insert(void *ptr, int type);
+ZEND_API int ZEND_FASTCALL zend_list_free(zend_resource *res);
+ZEND_API int ZEND_FASTCALL zend_list_delete(zend_resource *res);
+ZEND_API int ZEND_FASTCALL zend_list_close(zend_resource *res);
 
 ZEND_API zend_resource *zend_register_resource(void *rsrc_pointer, int rsrc_type);
 ZEND_API void *zend_fetch_resource(zend_resource *res, const char *resource_type_name, int resource_type);

diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index cda43ba80622ed3637bc4f11d583117979880f29..642b9883a36e6e1ecf58a6ee77e104d66c635ee5 100644 (file)
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -27,7 +27,7 @@
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 
-ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce)
+ZEND_API void ZEND_FASTCALL zend_object_std_init(zend_object *object, zend_class_entry *ce)
 {
        GC_SET_REFCOUNT(object, 1);
        GC_TYPE_INFO(object) = IS_OBJECT | (GC_COLLECTABLE << GC_FLAGS_SHIFT);
@@ -156,7 +156,7 @@ ZEND_API void zend_objects_destroy_object(zend_object *object)
        }
 }
 
-ZEND_API zend_object *zend_objects_new(zend_class_entry *ce)
+ZEND_API zend_object* ZEND_FASTCALL zend_objects_new(zend_class_entry *ce)
 {
        zend_object *object = emalloc(sizeof(zend_object) + zend_object_properties_size(ce));
 
@@ -165,7 +165,7 @@ ZEND_API zend_object *zend_objects_new(zend_class_entry *ce)
        return object;
 }
 
-ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object *old_object)
+ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object, zend_object *old_object)
 {
        if (old_object->ce->default_properties_count) {
                zval *src = old_object->properties_table;

diff --git a/Zend/zend_objects.h b/Zend/zend_objects.h
index 6bcb5fe9227f964db9942313a7d33e4c4c821e5a..42e659b6de8d9bd3934c54195189590778655955 100644 (file)
--- a/Zend/zend_objects.h
+++ b/Zend/zend_objects.h
@@ -25,11 +25,12 @@
 #include "zend.h"
 
 BEGIN_EXTERN_C()
-ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce);
+ZEND_API void ZEND_FASTCALL zend_object_std_init(zend_object *object, zend_class_entry *ce);
+ZEND_API zend_object* ZEND_FASTCALL zend_objects_new(zend_class_entry *ce);
+ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object, zend_object *old_object);
+
 ZEND_API void zend_object_std_dtor(zend_object *object);
-ZEND_API zend_object *zend_objects_new(zend_class_entry *ce);
 ZEND_API void zend_objects_destroy_object(zend_object *object);
-ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object *old_object);
 ZEND_API zend_object *zend_objects_clone_obj(zval *object);
 END_EXTERN_C()
 

diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index 2739ed23e7dc7534f0925833f8b70ae088b9989a..1a5344dc403696b0b9ff6f1bee2305b792776544 100644 (file)
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -26,7 +26,7 @@
 #include "zend_API.h"
 #include "zend_objects_API.h"
 
-ZEND_API void zend_objects_store_init(zend_objects_store *objects, uint32_t init_size)
+ZEND_API void ZEND_FASTCALL zend_objects_store_init(zend_objects_store *objects, uint32_t init_size)
 {
        objects->object_buckets = (zend_object **) emalloc(init_size * sizeof(zend_object*));
        objects->top = 1; /* Skip 0 so that handles are true */
@@ -35,13 +35,13 @@ ZEND_API void zend_objects_store_init(zend_objects_store *objects, uint32_t init
        memset(&objects->object_buckets[0], 0, sizeof(zend_object*));
 }
 
-ZEND_API void zend_objects_store_destroy(zend_objects_store *objects)
+ZEND_API void ZEND_FASTCALL zend_objects_store_destroy(zend_objects_store *objects)
 {
        efree(objects->object_buckets);
        objects->object_buckets = NULL;
 }
 
-ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects)
+ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors(zend_objects_store *objects)
 {
        if (objects->top > 1) {
                uint32_t i;
@@ -64,7 +64,7 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects)
        }
 }
 
-ZEND_API void zend_objects_store_mark_destructed(zend_objects_store *objects)
+ZEND_API void ZEND_FASTCALL zend_objects_store_mark_destructed(zend_objects_store *objects)
 {
        if (objects->object_buckets && objects->top > 1) {
                zend_object **obj_ptr = objects->object_buckets + 1;
@@ -81,7 +81,7 @@ ZEND_API void zend_objects_store_mark_destructed(zend_objects_store *objects)
        }
 }
 
-ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects, zend_bool fast_shutdown)
+ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_store *objects, zend_bool fast_shutdown)
 {
        zend_object **obj_ptr, **end, *obj;
 
@@ -129,7 +129,7 @@ ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects
 
 /* Store objects API */
 
-ZEND_API void zend_objects_store_put(zend_object *object)
+ZEND_API void ZEND_FASTCALL zend_objects_store_put(zend_object *object)
 {
        int handle;
 
@@ -154,7 +154,7 @@ ZEND_API void zend_objects_store_put(zend_object *object)
             SET_OBJ_BUCKET_NUMBER(EG(objects_store).object_buckets[handle], EG(objects_store).free_list_head); \
                        EG(objects_store).free_list_head = handle;
 
-ZEND_API void zend_objects_store_del(zend_object *object) /* {{{ */
+ZEND_API void ZEND_FASTCALL zend_objects_store_del(zend_object *object) /* {{{ */
 {
        /*      Make sure we hold a reference count during the destructor call
                otherwise, when the destructor ends the storage might be freed
@@ -200,7 +200,7 @@ ZEND_API void zend_objects_store_del(zend_object *object) /* {{{ */
 }
 /* }}} */
 
-ZEND_API zend_object_handlers *zend_get_std_object_handlers(void)
+ZEND_API zend_object_handlers* ZEND_FASTCALL zend_get_std_object_handlers(void)
 {
        return &std_object_handlers;
 }

diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h
index fbcb7059b41185cc0828b5d0ff2cdab824084b70..edc8fba659f17344803a0fe55a278f821db140f3 100644 (file)
--- a/Zend/zend_objects_API.h
+++ b/Zend/zend_objects_API.h
@@ -49,15 +49,15 @@ typedef struct _zend_objects_store {
 
 /* Global store handling functions */
 BEGIN_EXTERN_C()
-ZEND_API void zend_objects_store_init(zend_objects_store *objects, uint32_t init_size);
-ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects);
-ZEND_API void zend_objects_store_mark_destructed(zend_objects_store *objects);
-ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects, zend_bool fast_shutdown);
-ZEND_API void zend_objects_store_destroy(zend_objects_store *objects);
+ZEND_API void ZEND_FASTCALL zend_objects_store_init(zend_objects_store *objects, uint32_t init_size);
+ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors(zend_objects_store *objects);
+ZEND_API void ZEND_FASTCALL zend_objects_store_mark_destructed(zend_objects_store *objects);
+ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_store *objects, zend_bool fast_shutdown);
+ZEND_API void ZEND_FASTCALL zend_objects_store_destroy(zend_objects_store *objects);
 
 /* Store API functions */
-ZEND_API void zend_objects_store_put(zend_object *object);
-ZEND_API void zend_objects_store_del(zend_object *object);
+ZEND_API void ZEND_FASTCALL zend_objects_store_put(zend_object *object);
+ZEND_API void ZEND_FASTCALL zend_objects_store_del(zend_object *object);
 
 /* Called when the ctor was terminated by an exception */
 static zend_always_inline void zend_object_store_ctor_failed(zend_object *obj)
@@ -67,7 +67,7 @@ static zend_always_inline void zend_object_store_ctor_failed(zend_object *obj)
 
 #define ZEND_OBJECTS_STORE_HANDLERS 0, zend_object_std_dtor, zend_objects_destroy_object, zend_objects_clone_obj
 
-ZEND_API zend_object_handlers *zend_get_std_object_handlers(void);
+ZEND_API zend_object_handlers * ZEND_FASTCALL zend_get_std_object_handlers(void);
 END_EXTERN_C()
 
 static zend_always_inline void zend_object_release(zend_object *obj)