diff options
3 files changed, 25 insertions, 12 deletions
diff --git a/lldb/examples/summaries/cocoa/NSNumber.py b/lldb/examples/summaries/cocoa/NSNumber.py index fb35c765919..7cf06fedbe1 100644 --- a/lldb/examples/summaries/cocoa/NSNumber.py +++ b/lldb/examples/summaries/cocoa/NSNumber.py @@ -45,13 +45,13 @@ class NSTaggedNumber_SummaryProvider: # unfortunately, the original type information appears to be lost # so we try to at least recover the proper magnitude of the data if self.info_bits == 0: - return '(char)' + str(self.data % 256) + return '(char)' + str(ord(ctypes.c_char(chr(self.data % 256)).value)) if self.info_bits == 4: - return '(short)' + str(self.data % (256*256)) + return '(short)' + str(ctypes.c_short(self.data % (256*256)).value) if self.info_bits == 8: - return '(int)' + str(self.data % (256*256*256*256)) + return '(int)' + str(ctypes.c_int(self.data % (256*256*256*256)).value) if self.info_bits == 12: - return '(long)' + str(self.data) + return '(long)' + str(ctypes.c_long(self.data).value) else: return 'absurd value:(info=' + str(self.info_bits) + ", value = " + str(self.data) + ')' @@ -106,13 +106,13 @@ class NSUntaggedNumber_SummaryProvider: data_offset, self.sys_params.types_cache.char) statistics.metric_hit('code_notrun',self.valobj) - return '(char)' + str(data_vo.GetValueAsUnsigned(0)) + return '(char)' + str(ord(ctypes.c_char(chr(data_vo.GetValueAsUnsigned(0))).value)) elif data_type == 0B0010: data_vo = self.valobj.CreateChildAtOffset("data", data_offset, self.sys_params.types_cache.short) statistics.metric_hit('code_notrun',self.valobj) - return '(short)' + str(data_vo.GetValueAsUnsigned(0) % (256*256)) + return '(short)' + str(ctypes.c_short(data_vo.GetValueAsUnsigned(0) % (256*256)).value) # IF tagged pointers are possible on 32bit+v2 runtime # (of which the only existing instance should be iOS) # then values of this type might be tagged @@ -121,7 +121,7 @@ class NSUntaggedNumber_SummaryProvider: data_offset, self.sys_params.types_cache.int) statistics.metric_hit('code_notrun',self.valobj) - return '(int)' + str(data_vo.GetValueAsUnsigned(0) % (256*256*256*256)) + return '(int)' + str(ctypes.c_int(data_vo.GetValueAsUnsigned(0)% (256*256*256*256)).value) # apparently, on is_64_bit architectures, these are the only values that will ever # be represented by a non tagged pointers elif data_type == 0B10001: @@ -130,7 +130,7 @@ class NSUntaggedNumber_SummaryProvider: data_offset, self.sys_params.types_cache.longlong) statistics.metric_hit('code_notrun',self.valobj) - return '(long)' + str(data_vo.GetValueAsUnsigned(0)) + return '(long)' + str(ctypes.c_long(data_vo.GetValueAsUnsigned(0)).value) elif data_type == 0B0100: if self.sys_params.is_64_bit: data_offset = data_offset + self.sys_params.pointer_size @@ -138,7 +138,7 @@ class NSUntaggedNumber_SummaryProvider: data_offset, self.sys_params.types_cache.longlong) statistics.metric_hit('code_notrun',self.valobj) - return '(long)' + str(data_vo.GetValueAsUnsigned(0)) + return '(long)' + str(ctypes.c_long(data_vo.GetValueAsUnsigned(0)).value) elif data_type == 0B0101: data_vo = self.valobj.CreateChildAtOffset("data", data_offset, @@ -216,7 +216,9 @@ def NSNumber_SummaryProvider (valobj,dict): return provider.message() try: summary = provider.value(); - except: + except Exception as foo: + print foo +# except: summary = None logger >> "got summary " + str(summary) if summary == None: diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py index 856668d7f17..ad7458bd41c 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py @@ -227,14 +227,21 @@ class ObjCDataFormatterTestCase(TestBase): substrs = ['(NSNumber *) num1 = ',' (int)5', '(NSNumber *) num2 = ',' (float)3.1', '(NSNumber *) num3 = ',' (double)3.14', - '(NSNumber *) num4 = ',' (long)18446744073709551614', + '(NSNumber *) num4 = ',' (long)-2', '(NSNumber *) num5 = ',' (char)65', '(NSNumber *) num6 = ',' (long)255', '(NSNumber *) num7 = ','2000000', '(NSNumber *) num8_Y = ',' @"1"', '(NSNumber *) num8_N = ',' @"0"', - '(NSNumber *) num9 = ',' (short)33920']) + '(NSNumber *) num9 = ',' (short)-31616']) + self.expect('frame variable num_at1 num_at2 num_at3 num_at4', + substrs = ['(NSNumber *) num_at1 = ',' (int)12', + '(NSNumber *) num_at2 = ',' (int)-12', + '(NSNumber *) num_at3 = ',' (double)12.5', + '(NSNumber *) num_at4 = ',' (double)-12.5']) + + self.expect('frame variable str0 str1 str2 str3 str4 str5 str6 str8 str9 str10 str11 label1 label2 processName str12', substrs = ['(NSString *) str1 = ',' @"A rather short ASCII NSString object is here"', '(NSString *) str0 = ',' @"255"', diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/main.m b/lldb/test/functionalities/data-formatter/data-formatter-objc/main.m index 16be0c4fdbb..eaf372b6103 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-objc/main.m +++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/main.m @@ -153,6 +153,10 @@ int main (int argc, const char * argv[]) NSNumber* num8_Y = [NSNumber numberWithBool:YES]; NSNumber* num8_N = [NSNumber numberWithBool:NO]; NSNumber* num9 = [NSNumber numberWithShort:0x1E8480]; + NSNumber* num_at1 = @12; + NSNumber* num_at2 = @-12; + NSNumber* num_at3 = @12.5; + NSNumber* num_at4 = @-12.5; NSString *str0 = [num6 stringValue]; |
