X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/f95d2598051e347460e028286ff2d33e5825e548..b23692f3038296c94d25c84c55ed4c1bb49619cf:/Exception.hpp

diff --git a/Exception.hpp b/Exception.hpp
index d30da2e..dcc119b 100644
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -22,6 +22,8 @@
 #ifndef CYCRIPT_EXCEPTION_HPP
 #define CYCRIPT_EXCEPTION_HPP
 
+#include <cstdlib>
+
 #ifdef CY_EXECUTE
 #include <JavaScriptCore/JSBase.h>
 #endif
@@ -33,13 +35,13 @@
 
 class CYPool;
 
-struct CYException {
+struct _visible CYException {
     virtual ~CYException() {
     }
 
     virtual const char *PoolCString(CYPool &pool) const = 0;
 #ifdef CY_EXECUTE
-    virtual JSValueRef CastJSValue(JSContextRef context) const = 0;
+    virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const = 0;
 #endif
 };
 
@@ -51,14 +53,16 @@ void CYThrow(JSContextRef context, JSValueRef value);
 
 #define CYTry \
     try
-#define CYCatch(value) \
+#define CYCatch_(value, name) \
     catch (const CYException &error) { \
-        *exception = error.CastJSValue(context); \
+        *exception = error.CastJSValue(context, name); \
         return value; \
     } catch (...) { \
         *exception = CYCastJSValue(context, "catch(...)"); \
         return value; \
     }
+#define CYCatch(value) \
+    CYCatch_(value, "Error")
 
 #define _assert_(mode, test, code, format, ...) do \
     if (!(test)) \
@@ -76,7 +80,7 @@ while (false)
 _value; })
 
 #define _trace() do { \
-    fprintf(stderr, "_trace():%u\n", __LINE__); \
+    fprintf(stderr, "_trace(%s:%u)\n", __FILE__, __LINE__); \
 } while (false)
 
 static _finline bool CYContains(int value, size_t many, const int *okay) {
@@ -86,11 +90,11 @@ static _finline bool CYContains(int value, size_t many, const int *okay) {
     return false;
 }
 
-#define _syscall_(expr, many, okay) ({ \
+#define _syscall_(expr, many, ...) ({ \
     __typeof__(expr) _value; \
     do if ((long) (_value = (expr)) != -1) \
         break; \
-    else if (CYContains(errno, many, ((const int [many]) okay))) \
+    else if (CYContains(errno, many, ((const int [many + 1]) {0, ##__VA_ARGS__} + 1))) \
         break; \
     else \
         _assert_("syscall", errno == EINTR, #expr, " [errno=%d]", errno); \
@@ -99,13 +103,7 @@ static _finline bool CYContains(int value, size_t many, const int *okay) {
 })
 
 #define _syscall(expr) \
-    _syscall_(expr, 0, {})
-
-#define _krncall(expr) \
-    do { \
-        kern_return_t _krnstatus((expr)); \
-        _assert_("krncall", _krnstatus == KERN_SUCCESS, #expr, " [return=0x%x]", _krnstatus); \
-    } while (false)
+    _syscall_(expr, 0)
 
 #define _sqlcall(expr) ({ \
     __typeof__(expr) _value = (expr); \
@@ -122,7 +120,7 @@ struct CYJSException {
     {
     }
 
-    ~CYJSException() {
+    ~CYJSException() noexcept(false) {
         CYThrow(context_, value_);
     }