Casting an array/string pointer shouldn't copy it.

diff --git a/Execute.cpp b/Execute.cpp
index 57c812f6cfe7239a106a120c3d455499878d53b4..70fce727cdd3362a1bbc04c8bc3a25c11be0b171 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -251,12 +251,6 @@ struct CArray :
         type_(new(*pool_) Type_privateData(type, ffi)),
         length_(length)
     {
         type_(new(*pool_) Type_privateData(type, ffi)),
         length_(length)
     {

-        if (owner == NULL) {
-            size_t size(ffi->size * length);
-            void *copy(pool_->malloc<void>(size, ffi->alignment));
-            memcpy(copy, value_, size);
-            value_ = copy;
-        }

     }
 };
 
     }
 };
 


@@ -270,8 +264,6 @@ struct CString :
         value_(value),
         owner_(context, owner)
     {
         value_(value),
         owner_(context, owner)
     {

-        if (owner == NULL)
-            value_ = pool_->strdup(value_);

     }
 };
 
     }
 };
 


@@ -1272,7 +1264,8 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi
         element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
     }
 
         element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
     }
 

-    uint8_t *value(pool.malloc<uint8_t>(std::max<size_t>(cif->rtype->size, sizeof(ffi_arg)), std::max<size_t>(cif->rtype->alignment, alignof(ffi_arg))));
+    CYBuffer buffer(context);
+    uint8_t *value(buffer->malloc<uint8_t>(std::max<size_t>(cif->rtype->size, sizeof(ffi_arg)), std::max<size_t>(cif->rtype->alignment, alignof(ffi_arg))));

 
     void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction;
     // XXX: this only supports one hook, but it is a bad idea anyway
 
     void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction;
     // XXX: this only supports one hook, but it is a bad idea anyway


@@ -1281,7 +1274,7 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi
             call = hook->CallFunction;
 
     call(pool, context, cif, function, value, values);
             call = hook->CallFunction;
 
     call(pool, context, cif, function, value, values);

-    return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize);
+    return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize, buffer);

 }
 
 static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 }
 
 static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -1667,14 +1660,14 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object,
     if (sig::Function *function = dynamic_cast<sig::Function *>(internal->type_))
         return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);
 
     if (sig::Function *function = dynamic_cast<sig::Function *>(internal->type_))
         return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);
 

-    CYPool pool;
+    CYBuffer buffer(context);

 
     sig::Type *type(internal->type_);
     ffi_type *ffi(internal->GetFFI());
 
     sig::Type *type(internal->type_);
     ffi_type *ffi(internal->GetFFI());

-    void *data(pool.malloc<void>(ffi->size, ffi->alignment));
+    void *data(buffer->malloc<void>(ffi->size, ffi->alignment));

 
 

-    type->PoolFFI(&pool, context, ffi, data, arguments[0]);
-    JSValueRef value(type->FromFFI(context, ffi, data));
+    type->PoolFFI(buffer, context, ffi, data, arguments[0]);
+    JSValueRef value(type->FromFFI(context, ffi, data, false, buffer));

 
     if (JSValueGetType(context, value) == kJSTypeNumber) {
         JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value));
 
     if (JSValueGetType(context, value) == kJSTypeNumber) {
         JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value));


@@ -2144,6 +2137,11 @@ void CYInitializeDynamic() {
     definition.finalize = &CYFinalize;
     CYPrivate<Pointer>::Class_ = JSClassCreate(&definition);
 
     definition.finalize = &CYFinalize;
     CYPrivate<Pointer>::Class_ = JSClassCreate(&definition);
 

+    definition = kJSClassDefinitionEmpty;
+    definition.className = "Root";
+    definition.finalize = &CYFinalize;
+    CYPrivate<CYRoot>::Class_ = JSClassCreate(&definition);
+

     definition = kJSClassDefinitionEmpty;
     definition.className = "Struct";
     definition.staticFunctions = Struct_staticFunctions;
     definition = kJSClassDefinitionEmpty;
     definition.className = "Struct";
     definition.staticFunctions = Struct_staticFunctions;

diff --git a/Internal.hpp b/Internal.hpp
index 4e37d7ada3127899a5c319890e08f94188dd3e2e..7e6b1fd3ea3d164542f06ed9a7b1203fa7428256 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -42,6 +42,12 @@ sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate);
 struct CYRoot :
     CYData
 {
 struct CYRoot :
     CYData
 {

+    // XXX: without this, CYData is zero-initialized?!
+    CYRoot() :
+        CYData()
+    {
+    }
+

     _finline JSValueRef GetPrototype(JSContextRef context) const {
         return NULL;
     }
     _finline JSValueRef GetPrototype(JSContextRef context) const {
         return NULL;
     }


@@ -198,6 +204,33 @@ struct CYProtect {
     }
 };
 
     }
 };
 

+class CYBuffer {
+  private:
+    JSObjectRef owner_;
+    CYPool *pool_;
+
+  public:
+    CYBuffer(JSContextRef context) :
+        owner_(CYPrivate<CYRoot>::Make(context)),
+        pool_(CYPrivate<CYRoot>::Get(context, owner_)->pool_)
+    {
+        auto internal(CYPrivate<CYRoot>::Get(context, owner_));
+        internal->pool_->malloc<int>(10);
+    }
+
+    operator JSObjectRef() const {
+        return owner_;
+    }
+
+    operator CYPool *() const {
+        return pool_;
+    }
+
+    CYPool *operator ->() const {
+        return pool_;
+    }
+};
+

 namespace cy {
 struct Functor :
     CYRoot
 namespace cy {
 struct Functor :
     CYRoot

diff --git a/Pooling.hpp b/Pooling.hpp
index fc9d7eb688be0506e0e246e5916467d8f5fd518e..1c155fee5318a7f3a0f4082dcee16aeb1ec29399 100644 (file)
--- a/Pooling.hpp
+++ b/Pooling.hpp
@@ -235,6 +235,7 @@ struct CYData {
     CYData() :
         count_(1)
     {
     CYData() :
         count_(1)
     {

+        _assert(pool_ != NULL);

     }
 
     CYData(CYPool &pool) :
     }
 
     CYData(CYPool &pool) :