X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/3a1b79a7408f23b6c54565ac8410dee4c0546c2c..2447e531132913a88707e5d457fb2946fa3b0478:/sig/parse.cpp
diff --git a/sig/parse.cpp b/sig/parse.cpp
index 2f007de..62d99cf 100644
--- a/sig/parse.cpp
+++ b/sig/parse.cpp
@@ -1,68 +1,46 @@
-/* Cycript - Remove Execution 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 _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include "minimal/stdlib.h"
-
-#include
-
-#include
-
#include "sig/parse.hpp"
+#include "Error.hpp"
+
+#include
+#include
+#include
+#include
namespace sig {
-void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, char eos, Callback callback);
-struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, Callback callback);
+void Parse_(CYPool &pool, struct Signature *signature, const char **name, char eos, Callback callback);
+struct Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback callback);
/* XXX: I really screwed up this time */
-void *prealloc_(apr_pool_t *pool, void *odata, size_t osize, size_t nsize) {
- void *ndata = apr_palloc(pool, nsize);
+void *prealloc_(CYPool &pool, void *odata, size_t osize, size_t nsize) {
+ void *ndata(pool.malloc(nsize));
memcpy(ndata, odata, osize);
return ndata;
}
-void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, char eos, Callback callback) {
+void Parse_(CYPool &pool, struct Signature *signature, const char **name, char eos, Callback callback) {
_assert(*name != NULL);
// XXX: this is just a stupid check :(
@@ -85,8 +63,8 @@ void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, ch
if (**name != '"')
element->name = NULL;
else {
- char *quote = strchr(++*name, '"');
- element->name = apr_pstrmemdup(pool, *name, quote - *name);
+ const char *quote = strchr(++*name, '"');
+ element->name = pool.strmemdup(*name, quote - *name);
*name = quote + 1;
}
@@ -104,17 +82,16 @@ void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, ch
}
}
-struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, Callback callback) {
+Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback callback) {
char next = *(*name)++;
- if (next == '?')
- return NULL;
- struct Type *type = (struct Type *) apr_palloc(pool, sizeof(struct Type));
+ Type *type(new(pool) Type());
_assert(type != NULL);
- memset(type, 0, sizeof(struct Type));
+ memset(type, 0, sizeof(Type));
parse:
switch (next) {
+ case '?': type->primitive = unknown_P; break;
case '#': type->primitive = typename_P; break;
case '(':
@@ -128,17 +105,28 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
case '*': type->primitive = string_P; break;
case ':': type->primitive = selector_P; break;
- case '@':
- if (**name == '"') {
- char *quote = strchr(*name + 1, '"');
- if (!named || quote[1] == eos || quote[1] == '"') {
- type->name = apr_pstrmemdup(pool, *name + 1, quote - *name - 1);
- *name = quote + 1;
+ case '@': {
+ char next(**name);
+
+ if (next == '?') {
+ type->primitive = block_P;
+ ++*name;
+ } else {
+ type->primitive = object_P;
+
+ if (next == '"') {
+ const char *quote = strchr(*name + 1, '"');
+ if (quote == NULL) {
+ printf("unterminated specific id type {%s}\n", *name - 10);
+ _assert(false);
+ } else if (!named || quote[1] == eos || quote[1] == '"') {
+ type->name = pool.strmemdup(*name + 1, quote - *name - 1);
+ *name = quote + 1;
+ }
}
}
- type->primitive = object_P;
- break;
+ } break;
case 'B': type->primitive = boolean_P; break;
case 'C': type->primitive = uchar_P; break;
@@ -160,14 +148,11 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
case '^':
type->primitive = pointer_P;
- if (**name == '"') {
+ if (**name == '"')
+ // XXX: why is this here?
type->data.data.type = NULL;
- } else {
+ else
type->data.data.type = Parse_(pool, name, eos, named, callback);
- sig::Type *&target(type->data.data.type);
- if (target != NULL && target->primitive == void_P)
- target = NULL;
- }
break;
case 'b':
@@ -184,6 +169,12 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
case 's': type->primitive = short_P; break;
case 'v': type->primitive = void_P; break;
+#ifdef __LP64__
+ case 'F': type->primitive = double_P; break;
+#else
+ case 'F': type->primitive = float_P; break;
+#endif
+
case '{':
type->primitive = struct_P;
next = '}';
@@ -199,23 +190,14 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
);
size_t length = *name - begin - 1;
if (strncmp(begin, "?", length) != 0)
- type->name = (char *) apr_pstrmemdup(pool, begin, length);
+ type->name = (char *) pool.strmemdup(begin, length);
else
type->name = NULL;
// XXX: this types thing is a throwback to JocStrap
- char *types;
- if (next != '=') {
- types = NULL;
- } else {
- const char *temp(*name);
+ if (next == '=')
Parse_(pool, &type->data.signature, name, end, callback);
- types = (char *) apr_pstrmemdup(pool, temp, *name - temp - 1);
- }
-
- if (callback != NULL)
- (*callback)(pool, type->name, types, type);
} break;
case 'N': type->flags |= JOC_TYPE_INOUT; goto next;
@@ -236,36 +218,52 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
_assert(false);
}
+ if (callback != NULL)
+ (*callback)(pool, type);
+
return type;
}
-void Parse(apr_pool_t *pool, struct Signature *signature, const char *name, Callback callback) {
+void Parse(CYPool &pool, struct Signature *signature, const char *name, Callback callback) {
const char *temp = name;
Parse_(pool, signature, &temp, '\0', callback);
_assert(temp[-1] == '\0');
}
-const char *Unparse(apr_pool_t *pool, struct Signature *signature) {
+const char *Unparse(CYPool &pool, struct Signature *signature) {
const char *value = "";
size_t offset;
for (offset = 0; offset != signature->count; ++offset) {
const char *type = Unparse(pool, signature->elements[offset].type);
- value = apr_pstrcat(pool, value, type, NULL);
+ value = pool.strcat(value, type, NULL);
}
return value;
}
-const char *Unparse(apr_pool_t *pool, struct Type *type) {
- if (type == NULL)
- return "?";
- else switch (type->primitive) {
+const char *Unparse_(CYPool &pool, struct Type *type) {
+ switch (type->primitive) {
+ case function_P: {
+ if (type->data.signature.count == 0)
+ return "?";
+ std::ostringstream out;
+ for (size_t i(0); i != type->data.signature.count; ++i) {
+ Element &element(type->data.signature.elements[i]);
+ out << Unparse(pool, element.type);
+ if (element.offset != _not(size_t))
+ out << pool.itoa(element.offset);
+ }
+ return pool.strdup(out.str().c_str());
+ } break;
+
+ case unknown_P: return "?";
case typename_P: return "#";
- case union_P: return apr_psprintf(pool, "(%s)", Unparse(pool, &type->data.signature));
+ case union_P: return pool.strcat("(", Unparse(pool, &type->data.signature), ")", NULL);
case string_P: return "*";
case selector_P: return ":";
- case object_P: return type->name == NULL ? "@" : apr_psprintf(pool, "@\"%s\"", type->name);
+ case block_P: return "@?";
+ case object_P: return type->name == NULL ? "@" : pool.strcat("@\"", type->name, "\"", NULL);
case boolean_P: return "B";
case uchar_P: return "C";
case uint_P: return "I";
@@ -275,11 +273,19 @@ const char *Unparse(apr_pool_t *pool, struct Type *type) {
case array_P: {
const char *value = Unparse(pool, type->data.data.type);
- return apr_psprintf(pool, "[%lu%s]", type->data.data.size, value);
+ return pool.strcat("[", pool.itoa(type->data.data.size), value, "]", NULL);
} break;
- case pointer_P: return apr_psprintf(pool, "^%s", type->data.data.type == NULL ? "" : Unparse(pool, type->data.data.type));
- case bit_P: return apr_psprintf(pool, "b%zu", type->data.data.size);
+ case pointer_P: {
+ // XXX: protect against the weird '"' check in Parse_
+ _assert(type->data.data.type != NULL);
+ if (type->data.data.type->primitive == function_P)
+ return "^?";
+ else
+ return pool.strcat("^", Unparse(pool, type->data.data.type), NULL);
+ } break;
+
+ case bit_P: return pool.strcat("b", pool.itoa(type->data.data.size), NULL);
case char_P: return "c";
case double_P: return "d";
case float_P: return "f";
@@ -288,11 +294,45 @@ const char *Unparse(apr_pool_t *pool, struct Type *type) {
case longlong_P: return "q";
case short_P: return "s";
case void_P: return "v";
- case struct_P: return apr_psprintf(pool, "{%s=%s}", type->name == NULL ? "?" : type->name, Unparse(pool, &type->data.signature));
+ case struct_P: return pool.strcat("{", type->name == NULL ? "?" : type->name, "=", Unparse(pool, &type->data.signature), "}", NULL);
}
_assert(false);
return NULL;
}
+const char *Unparse(CYPool &pool, struct Type *type) {
+ if (type == NULL)
+ return "?";
+
+ const char *base(Unparse_(pool, type));
+ if (type->flags == 0)
+ return base;
+
+ #define iovec_(base, size) \
+ (struct iovec) {const_cast(base), size}
+
+ size_t size(strlen(base));
+ char buffer[7 + size];
+ size_t offset(0);
+
+ if ((type->flags & JOC_TYPE_INOUT) != 0)
+ buffer[offset++] = 'N';
+ if ((type->flags & JOC_TYPE_IN) != 0)
+ buffer[offset++] = 'n';
+ if ((type->flags & JOC_TYPE_BYCOPY) != 0)
+ buffer[offset++] = 'O';
+ if ((type->flags & JOC_TYPE_OUT) != 0)
+ buffer[offset++] = 'o';
+ if ((type->flags & JOC_TYPE_BYREF) != 0)
+ buffer[offset++] = 'R';
+ if ((type->flags & JOC_TYPE_CONST) != 0)
+ buffer[offset++] = 'r';
+ if ((type->flags & JOC_TYPE_ONEWAY) != 0)
+ buffer[offset++] = 'V';
+
+ memcpy(buffer + offset, base, size);
+ return pool.strmemdup(buffer, offset + size);
+}
+
}