Support both armv7s and armv6 at the same time.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index 37e2b3c4cd6dd56786425788bb8c829b8e5bc375..1f61c0ebe538491a78abe048406c12c1982463ea 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -20,7 +20,6 @@
 /* }}} */
 
 #include <dlfcn.h>
 /* }}} */
 
 #include <dlfcn.h>

-#include <iconv.h>

 
 #include "cycript.hpp"
 
 
 #include "cycript.hpp"
 


@@ -29,78 +28,48 @@
 #include <sys/mman.h>
 
 #include <iostream>
 #include <sys/mman.h>
 
 #include <iostream>

-#include <ext/stdio_filebuf.h>

 #include <set>
 #include <map>
 #include <iomanip>
 #include <sstream>
 #include <cmath>
 
 #include <set>
 #include <map>
 #include <iomanip>
 #include <sstream>
 #include <cmath>
 

-#include "Parser.hpp"
-#include "Cycript.tab.hh"
-

 #include "Error.hpp"
 #include "Error.hpp"

-#include "String.hpp"

 #include "Execute.hpp"
 #include "JavaScript.hpp"
 #include "Execute.hpp"
 #include "JavaScript.hpp"

+#include "Parser.hpp"
+#include "String.hpp"

 
 

-/* C Strings {{{ */
-template <typename Type_>
-_finline size_t iconv_(size_t (*iconv)(iconv_t, Type_, size_t *, char **, size_t *), iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) {
-    return iconv(cd, const_cast<Type_>(inbuf), inbytesleft, outbuf, outbytesleft);
-}
+#include "Cycript.tab.hh"
+#include "Driver.hpp"

 
 

-#ifdef __GLIBC__
-#define UCS_2_INTERNAL "UCS-2"
-#else
-#define UCS_2_INTERNAL "UCS-2-INTERNAL"
-#endif
+#include "ConvertUTF.h"

 
 

+/* C Strings {{{ */

 CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16) {
 CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16) {

-    _assert(pool != NULL);
-
-    const char *in(reinterpret_cast<const char *>(utf16.data));
-
-    iconv_t conversion(_syscall(iconv_open("UTF-8", UCS_2_INTERNAL)));
-

     // XXX: this is wrong
     size_t size(utf16.size * 5);
     // XXX: this is wrong
     size_t size(utf16.size * 5);

-    char *out(new(pool) char[size]);
-    CYUTF8String utf8(out, size);
-
-    size = utf16.size * 2;
-    _syscall(iconv_(&iconv, conversion, const_cast<char **>(&in), &size, &out, &utf8.size));
+    char *temp(new(pool) char[size]);

 
 

-    *out = '\0';
-    utf8.size = out - utf8.data;
+    const uint16_t *lhs(utf16.data);
+    uint8_t *rhs(reinterpret_cast<uint8_t *>(temp));
+    _assert(ConvertUTF16toUTF8(&lhs, lhs + utf16.size, &rhs, rhs + size, lenientConversion) == conversionOK);

 
 

-    _syscall(iconv_close(conversion));
-
-    return utf8;
+    *rhs = 0;
+    return CYUTF8String(temp, reinterpret_cast<char *>(rhs) - temp);

 }
 
 CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8) {
 }
 
 CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8) {

-    _assert(pool != NULL);
-
-    const char *in(utf8.data);
-
-    iconv_t conversion(_syscall(iconv_open(UCS_2_INTERNAL, "UTF-8")));
-

     // XXX: this is wrong
     size_t size(utf8.size * 5);
     uint16_t *temp(new (pool) uint16_t[size]);
     // XXX: this is wrong
     size_t size(utf8.size * 5);
     uint16_t *temp(new (pool) uint16_t[size]);

-    CYUTF16String utf16(temp, size * 2);
-    char *out(reinterpret_cast<char *>(temp));

 
 

-    size = utf8.size;
-    _syscall(iconv_(&iconv, conversion, const_cast<char **>(&in), &size, &out, &utf16.size));
+    const uint8_t *lhs(reinterpret_cast<const uint8_t *>(utf8.data));
+    uint16_t *rhs(temp);
+    _assert(ConvertUTF8toUTF16(&lhs, lhs + utf8.size, &rhs, rhs + size, lenientConversion) == conversionOK);

 
 

-    utf16.size = reinterpret_cast<uint16_t *>(out) - utf16.data;
-    temp[utf16.size] = 0;
-
-    _syscall(iconv_close(conversion));
-
-    return utf16;
+    *rhs = 0;
+    return CYUTF16String(temp, rhs - temp);

 }
 /* }}} */
 /* Index Offsets {{{ */
 }
 /* }}} */
 /* Index Offsets {{{ */


@@ -243,7 +212,7 @@ void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) {
     CYThrow(context, exception);
 }
 
     CYThrow(context, exception);
 }
 

-extern "C" void CydgetPoolParse(apr_pool_t *remote, const uint16_t **data, size_t *size) {
+extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) {

     CYLocalPool local;
 
     CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size)));
     CYLocalPool local;
 
     CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size)));


@@ -262,25 +231,18 @@ extern "C" void CydgetPoolParse(apr_pool_t *remote, const uint16_t **data, size_
     out << *driver.program_;
     std::string code(str.str());
 
     out << *driver.program_;
     std::string code(str.str());
 

-    CYPool pool(remote);
+    CYPool pool;

     CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(code.c_str(), code.size())));
 
     CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(code.c_str(), code.size())));
 

-    *data = utf16.data;
-    *size = utf16.size;
-}
-
-static bool initialized_;
-
-void CYInitializeStatic() {
-    if (!initialized_)
-        initialized_ = true;
-    else return;
+    size_t bytes(utf16.size * sizeof(uint16_t));
+    uint16_t *copy(reinterpret_cast<uint16_t *>(malloc(bytes)));
+    memcpy(copy, utf16.data, bytes);

 
 

-    _aprcall(apr_initialize());
+    *data = copy;
+    *size = utf16.size;

 }
 
 CYPool &CYGetGlobalPool() {
 }
 
 CYPool &CYGetGlobalPool() {

-    CYInitializeStatic();

     static CYPool pool;
     return pool;
 }
     static CYPool pool;
     return pool;
 }


@@ -297,13 +259,20 @@ const char *CYPoolError::PoolCString(CYPool &pool) const {
     return pool.strdup(message_);
 }
 
     return pool.strdup(message_);
 }
 

+CYPoolError::CYPoolError(const CYPoolError &rhs) :
+    message_(pool_.strdup(rhs.message_))
+{
+}
+

 CYPoolError::CYPoolError(const char *format, ...) {
     va_list args;
     va_start(args, format);
 CYPoolError::CYPoolError(const char *format, ...) {
     va_list args;
     va_start(args, format);

-    message_ = pool_.vsprintf(format, args);
+    // XXX: there might be a beter way to think about this
+    message_ = pool_.vsprintf(64, format, args);

     va_end(args);
 }
 
 CYPoolError::CYPoolError(const char *format, va_list args) {
     va_end(args);
 }
 
 CYPoolError::CYPoolError(const char *format, va_list args) {

-    message_ = pool_.vsprintf(format, args);
+    // XXX: there might be a beter way to think about this
+    message_ = pool_.vsprintf(64, format, args);

 }
 }