1 files changed, 50 insertions, 29 deletions
diff --git a/system/lib/embind/bind.cpp b/system/lib/embind/bind.cpp
index 12264dfd..37918050 100644
--- a/system/lib/embind/bind.cpp
+++ b/system/lib/embind/bind.cpp
@@ -8,31 +8,52 @@
 #include <algorithm>
 #include <emscripten/emscripten.h>
 #include <climits>
+#include <limits>
 
 using namespace emscripten;
 
 extern "C" {
     const char* __attribute__((used)) __getTypeName(const std::type_info* ti) {
+        if (has_unbound_type_names) {
 #ifdef USE_CXA_DEMANGLE
-        int stat;
-        char* demangled = abi::__cxa_demangle(ti->name(), NULL, NULL, &stat);
-        if (stat == 0 && demangled) {
-            return demangled;
-        }
+            int stat;
+            char* demangled = abi::__cxa_demangle(ti->name(), NULL, NULL, &stat);
+            if (stat == 0 && demangled) {
+                return demangled;
+            }
 
-        switch (stat) {
-            case -1:
-                return strdup("<allocation failure>");
-            case -2:
-                return strdup("<invalid C++ symbol>");
-            case -3:
-                return strdup("<invalid argument>");
-            default:
-                return strdup("<unknown error>");
-        }
+            switch (stat) {
+                case -1:
+                    return strdup("<allocation failure>");
+                case -2:
+                    return strdup("<invalid C++ symbol>");
+                case -3:
+                    return strdup("<invalid argument>");
+                default:
+                    return strdup("<unknown error>");
+            }
 #else
-        return strdup(ti->name());
+            return strdup(ti->name());
 #endif
+        } else {
+            char str[80];
+            sprintf(str, "%p", ti);
+            return strdup(str);
+        }
+    }
+}
+
+namespace {
+    template<typename T>
+    static void register_integer(const char* name) {
+        using namespace internal;
+        _embind_register_integer(TypeID<T>::get(), name, sizeof(T), std::numeric_limits<T>::min(), std::numeric_limits<T>::max());
+    }
+
+    template<typename T>
+    static void register_float(const char* name) {
+        using namespace internal;
+        _embind_register_float(TypeID<T>::get(), name, sizeof(T));
     }
 }
 
@@ -41,20 +62,20 @@ EMSCRIPTEN_BINDINGS(native_and_builtin_types) {
 
     _embind_register_void(TypeID<void>::get(), "void");
     
-    _embind_register_bool(TypeID<bool>::get(), "bool", true, false);
-
-    _embind_register_integer(TypeID<char>::get(), "char", CHAR_MIN, CHAR_MAX);
-    _embind_register_integer(TypeID<signed char>::get(), "signed char", SCHAR_MIN, SCHAR_MAX);
-    _embind_register_integer(TypeID<unsigned char>::get(), "unsigned char", 0, UCHAR_MAX);
-    _embind_register_integer(TypeID<signed short>::get(), "short", SHRT_MIN, SHRT_MAX);
-    _embind_register_integer(TypeID<unsigned short>::get(), "unsigned short", 0, USHRT_MAX);
-    _embind_register_integer(TypeID<signed int>::get(), "int", INT_MIN, INT_MAX);
-    _embind_register_integer(TypeID<unsigned int>::get(), "unsigned int", 0, UINT_MAX);
-    _embind_register_integer(TypeID<signed long>::get(), "long", LONG_MIN, LONG_MAX);
-    _embind_register_integer(TypeID<unsigned long>::get(), "unsigned long", 0, ULONG_MAX);
+    _embind_register_bool(TypeID<bool>::get(), "bool", sizeof(bool), true, false);
+
+    register_integer<char>("char");
+    register_integer<signed char>("signed char");
+    register_integer<unsigned char>("unsigned char");
+    register_integer<signed short>("short");
+    register_integer<unsigned short>("unsigned short");
+    register_integer<signed int>("int");
+    register_integer<unsigned int>("unsigned int");
+    register_integer<signed long>("long");
+    register_integer<unsigned long>("unsigned long");
     
-    _embind_register_float(TypeID<float>::get(), "float");
-    _embind_register_float(TypeID<double>::get(), "double");
+    register_float<float>("float");
+    register_float<double>("double");
     
     _embind_register_std_string(TypeID<std::string>::get(), "std::string");
     _embind_register_std_wstring(TypeID<std::wstring>::get(), sizeof(wchar_t), "std::wstring");