Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Builds on arm64. DEBUGGER macro is disabled on arm64 for now. #8

Merged
merged 1 commit into from
Sep 24, 2013
Merged

Builds on arm64. DEBUGGER macro is disabled on arm64 for now. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DCFrameView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ - (void)drawRect:(CGRect)rect

UIFont *font = [UIFont systemFontOfSize:10.0f];

float dash[2] = {3, 3};
CGFloat dash[2] = {3, 3};
CGContextSetLineDash(context, 0, dash, 2);

// edge->left side
Expand Down
8 changes: 5 additions & 3 deletions DCIntrospect.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ static bool AmIBeingDebugged(void)
#if TARGET_CPU_ARM
#define DEBUGSTOP(signal) __asm__ __volatile__ ("mov r0, %0\nmov r1, %1\nmov r12, %2\nswi 128\n" : : "r"(getpid ()), "r"(signal), "r"(37) : "r12", "r0", "r1", "cc");
#define DEBUGGER do { int trapSignal = AmIBeingDebugged () ? SIGINT : SIGSTOP; DEBUGSTOP(trapSignal); if (trapSignal == SIGSTOP) { DEBUGSTOP (SIGINT); } } while (false);
#elif TARGET_CPU_ARM64
#define DEBUGGER // Breaking into debugger on arm64 is not currently supported
#else
#define DEBUGGER do { int trapSignal = AmIBeingDebugged () ? SIGINT : SIGSTOP; __asm__ __volatile__ ("pushl %0\npushl %1\npush $0\nmovl %2, %%eax\nint $0x80\nadd $12, %%esp" : : "g" (trapSignal), "g" (getpid ()), "n" (37) : "eax", "cc"); } while (false);
#endif
Expand Down Expand Up @@ -529,7 +531,7 @@ - (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range r
if (self.currentViewHistory.count == 0)
return NO;

int indexOfCurrentView = [self.currentViewHistory indexOfObject:self.currentView];
NSUInteger indexOfCurrentView = [self.currentViewHistory indexOfObject:self.currentView];
if (indexOfCurrentView == 0)
{
NSLog(@"DCIntrospect: At bottom of view history.");
Expand Down Expand Up @@ -770,7 +772,7 @@ - (void)updateStatusBar
nameForObject = [nameForObject substringFromIndex:@"self.".length];

if (self.currentView.tag != 0)
self.statusBarOverlay.leftLabel.text = [NSString stringWithFormat:@"%@ (tag: %i)", nameForObject, self.currentView.tag];
self.statusBarOverlay.leftLabel.text = [NSString stringWithFormat:@"%@ (tag: %ld)", nameForObject, (long)self.currentView.tag];
else
self.statusBarOverlay.leftLabel.text = [NSString stringWithFormat:@"%@", nameForObject];

Expand Down Expand Up @@ -1434,7 +1436,7 @@ - (void)logPropertiesForObject:(id)object
UIView *view = (UIView *)object;
// print out generic uiview properties
[outputString appendString:@" ** UIView properties **\n"];
[outputString appendFormat:@" tag: %i\n", view.tag];
[outputString appendFormat:@" tag: %ld\n", (long)view.tag];
[outputString appendFormat:@" frame: %@ | ", NSStringFromCGRect(view.frame)];
[outputString appendFormat:@"bounds: %@ | ", NSStringFromCGRect(view.bounds)];
[outputString appendFormat:@"center: %@\n", NSStringFromCGPoint(view.center)];
Expand Down