X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/807a88be3ae9177f620a91e9aacf4aa59aacddaa..341d1456832396678c21074a7ec2a07181e12f49:/Internal.hpp
diff --git a/Internal.hpp b/Internal.hpp
index 13987d4..87ff055 100644
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -1,55 +1,43 @@
-/* Cycript - Error.hppution Server and Disassembler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2015 Jay Freeman (saurik)
*/
-/* Modified BSD License {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
/*
- * Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the
- * above copyright notice, this list of conditions
- * and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions
- * and the following disclaimer in the documentation
- * and/or other materials provided with the
- * distribution.
- * 3. The name of the author may not be used to endorse
- * or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+**/
/* }}} */
#ifndef CYCRIPT_INTERNAL_HPP
#define CYCRIPT_INTERNAL_HPP
-#include "Pooling.hpp"
+#include
+#include
#include
+#include
#include
#include
-#include
-#include
+#include "Pooling.hpp"
+
+JSGlobalContextRef CYGetJSContext(JSContextRef context);
+void Structor_(CYPool &pool, sig::Type *&type);
+
+JSObjectRef CYMakeType(JSContextRef context, sig::Type *type);
-void Structor_(apr_pool_t *pool, sig::Type *&type);
+extern JSClassRef Functor_;
struct Type_privateData :
CYData
@@ -60,45 +48,43 @@ struct Type_privateData :
sig::Type *type_;
void Set(sig::Type *type) {
- type_ = new(pool_) sig::Type;
- sig::Copy(pool_, *type_, *type);
+ type_ = new(*pool_) sig::Type;
+ sig::Copy(*pool_, *type_, *type);
}
- Type_privateData(apr_pool_t *pool, const char *type) :
+ Type_privateData(const char *type) :
ffi_(NULL)
{
- _assert(pool != NULL);
- pool_ = pool;
sig::Signature signature;
- sig::Parse(pool_, &signature, type, &Structor_);
+ sig::Parse(*pool_, &signature, type, &Structor_);
type_ = signature.elements[0].type;
}
- Type_privateData(const char *type) :
+ Type_privateData(sig::Primitive primitive) :
ffi_(NULL)
{
- sig::Signature signature;
- sig::Parse(pool_, &signature, type, &Structor_);
- type_ = signature.elements[0].type;
+ sig::Type type;
+ memset(&type, 0, sizeof(type));
+ type.primitive = primitive;
+ Set(&type);
}
Type_privateData(sig::Type *type) :
ffi_(NULL)
{
- if (type != NULL)
- Set(type);
+ // XXX: just in case I messed up migrating
+ _assert(type != NULL);
+ Set(type);
}
Type_privateData(sig::Type *type, ffi_type *ffi) {
- ffi_ = new(pool_) ffi_type;
- sig::Copy(pool_, *ffi_, *ffi);
+ ffi_ = new(*pool_) ffi_type;
+ sig::Copy(*pool_, *ffi_, *ffi);
Set(type);
}
ffi_type *GetFFI() {
if (ffi_ == NULL) {
- ffi_ = new(pool_) ffi_type;
-
sig::Element element;
element.name = NULL;
element.type = type_;
@@ -109,7 +95,9 @@ struct Type_privateData :
signature.count = 1;
ffi_cif cif;
- sig::sig_ffi_cif(pool_, &sig::ObjectiveC, &signature, &cif);
+ sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature, &cif);
+
+ ffi_ = new(*pool_) ffi_type;
*ffi_ = *cif.rtype;
}
@@ -144,15 +132,16 @@ struct CYOwned :
CYValue
{
private:
- JSContextRef context_;
+ JSGlobalContextRef context_;
JSObjectRef owner_;
public:
CYOwned(void *value, JSContextRef context, JSObjectRef owner) :
CYValue(value),
- context_(context),
+ context_(CYGetJSContext(context)),
owner_(owner)
{
+ //XXX:JSGlobalContextRetain(context_);
if (owner_ != NULL)
JSValueProtect(context_, owner_);
}
@@ -160,6 +149,7 @@ struct CYOwned :
virtual ~CYOwned() {
if (owner_ != NULL)
JSValueUnprotect(context_, owner_);
+ //XXX:JSGlobalContextRelease(context_);
}
JSObjectRef GetOwner() const {
@@ -171,42 +161,61 @@ namespace cy {
struct Functor :
CYValue
{
+ private:
+ void set() {
+ sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature_, &cif_);
+ }
+
+ public:
sig::Signature signature_;
ffi_cif cif_;
- Functor(const char *type, void (*value)()) :
+ Functor(const sig::Signature &signature, void (*value)()) :
+ CYValue(reinterpret_cast(value))
+ {
+ sig::Copy(*pool_, signature_, signature);
+ set();
+ }
+
+ Functor(const char *encoding, void (*value)()) :
CYValue(reinterpret_cast(value))
{
- sig::Parse(pool_, &signature_, type, &Structor_);
- sig::sig_ffi_cif(pool_, &sig::ObjectiveC, &signature_, &cif_);
+ sig::Parse(*pool_, &signature_, encoding, &Structor_);
+ set();
}
- void (*GetValue())() const {
+ void (*GetValue() const)() {
return reinterpret_cast(value_);
}
static JSStaticFunction const * const StaticFunctions;
+ static JSStaticValue const * const StaticValues;
}; }
struct Closure_privateData :
cy::Functor
{
- JSContextRef context_;
+ JSGlobalContextRef context_;
JSObjectRef function_;
+ JSValueRef (*adapter_)(JSContextRef, size_t, JSValueRef[], JSObjectRef);
- Closure_privateData(JSContextRef context, JSObjectRef function, const char *type) :
- cy::Functor(type, NULL),
- context_(context),
- function_(function)
+ Closure_privateData(JSContextRef context, JSObjectRef function, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef), const sig::Signature &signature) :
+ cy::Functor(signature, NULL),
+ context_(CYGetJSContext(context)),
+ function_(function),
+ adapter_(adapter)
{
+ //XXX:JSGlobalContextRetain(context_);
JSValueProtect(context_, function_);
}
virtual ~Closure_privateData() {
JSValueUnprotect(context_, function_);
+ //XXX:JSGlobalContextRelease(context_);
}
};
-Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *));
+Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef));
+void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef));
#endif/*CYCRIPT_INTERNAL_HPP*/