ObjFW  Diff

Differences From Artifact [ef6fdedc48]:

• File src/exceptions/OFException.m — part of check-in [3d16a30f41] at 2013-06-22 12:12:36 on branch trunk — Rework exceptions.

  This mostly removes the argument for the class in which the exception
  occurred. As backtraces were recently added for all platforms, the
  passed class does not give any extra information on where the exception
  occurred anymore.

  This also removes a few other arguments which were not too helpful. In
  the past, the idea was to pass as many arguments as possible so that it
  is easier to find the origin of the exception. However, as backtraces
  are a much better way to find the origin, those are not useful anymore
  and just make the exception more cumbersome to use. The rule is now to
  only pass arguments that might help in recovering from the exception or
  provide information that is otherwise not easily accessible. (user: js, size: 2520) [annotate] [blame] [check-ins using]

To Artifact [e70ae26647]:

• File src/exceptions/OFException.m — part of check-in [6e8777fc03] at 2013-06-25 20:31:08 on branch trunk — Make backtraces work with ARM EABI. (user: js, size: 2809) [annotate] [blame] [check-ins using]

39
40
41
42
43
44
45



46

47
48
49
50
51
52
53






54

55
56
57
58
59
60
61

struct backtrace_ctx {
	void **backtrace;
	uint_fast8_t i;
};

extern _Unwind_Reason_Code _Unwind_Backtrace(
    _Unwind_Reason_Code(*)(struct _Unwind_Context*, void*), void*);



extern uintptr_t _Unwind_GetIP(struct _Unwind_Context*);


static _Unwind_Reason_Code
backtrace_callback(struct _Unwind_Context *ctx, void *data)
{
	struct backtrace_ctx *bt = data;

	if (bt->i < OF_BACKTRACE_SIZE) {






		bt->backtrace[bt->i++] = (void*)_Unwind_GetIP(ctx);

		return _URC_OK;
	}

	return _URC_END_OF_STACK;
}

@implementation OFException

>
>
>

>







>
>
>
>
>
>

>

39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72

struct backtrace_ctx {
	void **backtrace;
	uint_fast8_t i;
};

extern _Unwind_Reason_Code _Unwind_Backtrace(
    _Unwind_Reason_Code(*)(struct _Unwind_Context*, void*), void*);
#if defined(__arm__) || defined(__ARM__)
extern int _Unwind_VRS_Get(struct _Unwind_Context*, int, uint32_t, int, void*);
#else
extern uintptr_t _Unwind_GetIP(struct _Unwind_Context*);
#endif

static _Unwind_Reason_Code
backtrace_callback(struct _Unwind_Context *ctx, void *data)
{
	struct backtrace_ctx *bt = data;

	if (bt->i < OF_BACKTRACE_SIZE) {
#if defined(__arm__) || defined(__ARM__)
		uintptr_t ip;

		_Unwind_VRS_Get(ctx, 0, 15, 0, &ip);
		bt->backtrace[bt->i++] = (void*)(ip & ~1);
#else
		bt->backtrace[bt->i++] = (void*)_Unwind_GetIP(ctx);
#endif
		return _URC_OK;
	}

	return _URC_END_OF_STACK;
}

@implementation OFException