Mirrors/plcrashreporter
0
0
Fork 0
mirror of https://github.com/microsoft/plcrashreporter.git synced 2026-01-18 04:01:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tests warnings fixed

Browse Source
This commit is contained in:
Oleg Misal
2020-04-30 14:06:32 +03:00
parent 196d70c393
commit 2c4ecb61a2
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/Libunwind Regression Tests/unwind_test_harness.c
View File

@@ -250,7 +250,7 @@ static plcrash_error_t unwind_current_state (plcrash_async_thread_state_t *state
/* Initialize the image list */
plcrash_nasync_image_list_init(&image_list, mach_task_self());
for (uint32_t i = 0; i < _dyld_image_count(); i++)
plcrash_nasync_image_list_append(&image_list, _dyld_get_image_header(i), _dyld_get_image_name(i));
plcrash_nasync_image_list_append(&image_list, (pl_vm_address_t) _dyld_get_image_header(i), _dyld_get_image_name(i));
/* Initialie our cursor */
plframe_cursor_init(&cursor, mach_task_self(), state, &image_list);
@@ -274,7 +274,7 @@ static plcrash_error_t unwind_current_state (plcrash_async_thread_state_t *state
if (err != PLFRAME_ESUCCESS) {
PLCF_DEBUG("Step within test function failed: %d (%s)", err, plframe_strerror(err));
return PLFRAME_EINVAL;
return (plcrash_error_t) PLFRAME_EINVAL;
}
/* Now in unwind_tester; verify that we unwound to the correct IP */

8
Tests/PLCrashAsyncCompactUnwindEncodingTests.m
View File

@@ -110,7 +110,7 @@
plcrash_error_t err;
NSData *mappedImage = [self nativeBinaryFromTestResource: TEST_BINARY];
err = plcrash_nasync_macho_init(&_image, mach_task_self(), [TEST_BINARY UTF8String], [mappedImage bytes]);
err = plcrash_nasync_macho_init(&_image, mach_task_self(), [TEST_BINARY UTF8String], (pl_vm_address_t) [mappedImage bytes]);
STAssertEquals(err, PLCRASH_ESUCCESS, @"Failed to initialize Mach-O parser");
/* Map the unwind section */
@@ -957,7 +957,7 @@
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_cfe_entry_init(&entry, CPU_TYPE_X86_64, encoding), @"Failed to initialize CFE entry");
/* Initialize default thread state */
plcrash_greg_t stack_addr = &stackframe[4]; // rbp
plcrash_greg_t stack_addr = (plcrash_greg_t) &stackframe[4]; // rbp
STAssertEquals(plcrash_async_thread_state_init(&ts, CPU_TYPE_X86_64), PLCRASH_ESUCCESS, @"Failed to initialize thread state");
plcrash_async_thread_state_set_reg(&ts, PLCRASH_REG_FP, stack_addr);
@@ -1081,7 +1081,7 @@
/* Initialize default thread state */
STAssertEquals(plcrash_async_thread_state_init(&ts, CPU_TYPE_X86_64), PLCRASH_ESUCCESS, @"Failed to initialize thread state");
plcrash_async_thread_state_set_reg(&ts, PLCRASH_REG_SP, &stackframe);
plcrash_async_thread_state_set_reg(&ts, PLCRASH_REG_SP, (plcrash_greg_t) &stackframe);
/* Apply */
plcrash_async_thread_state_t nts;
@@ -1148,7 +1148,7 @@
/* Initialize default thread state */
STAssertEquals(plcrash_async_thread_state_init(&ts, CPU_TYPE_X86_64), PLCRASH_ESUCCESS, @"Failed to initialize thread state");
plcrash_async_thread_state_set_reg(&ts, PLCRASH_REG_SP, &stackframe);
plcrash_async_thread_state_set_reg(&ts, PLCRASH_REG_SP, (plcrash_greg_t) &stackframe);
/* Apply */
plcrash_async_thread_state_t nts;

2
Tests/PLCrashAsyncDwarfCIETests.mm
View File

@@ -227,7 +227,7 @@ struct __attribute__((packed)) cie_data {
plcrash_async_mobject_t mobj;
plcrash_error_t err;
_cie_data.cie_version = 9999; // invalid version
_cie_data.cie_version = (uint8_t)9999; // invalid version
err = plcrash_async_mobject_init(&mobj, mach_task_self(), (pl_vm_address_t) &_cie_data, sizeof(_cie_data), true);
STAssertEquals(err, PLCRASH_ESUCCESS, @"Failed to initialize mobj");

10
Tests/PLCrashAsyncMObjectTests.m
View File

@@ -177,26 +177,26 @@
/* Map the memory */
plcrash_async_mobject_t mobj;
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_mobject_init(&mobj, mach_task_self(), test_bytes, sizeof(test_bytes), true), @"Failed to initialize mapping");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_mobject_init(&mobj, mach_task_self(), (pl_vm_address_t) test_bytes, sizeof(test_bytes), true), @"Failed to initialize mapping");
/* uint8 */
uint8_t u8;
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_mobject_read_uint8(&mobj, test_bytes-1, 1, &u8), @"Failed to read data");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_mobject_read_uint8(&mobj, (pl_vm_address_t)(test_bytes-1), 1, &u8), @"Failed to read data");
STAssertEquals(u8, (uint8_t) 0x0, @"Incorrect data");
/* uint16 */
uint16_t u16;
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_mobject_read_uint16(&mobj, byteorder, test_bytes-1, 1, &u16), @"Failed to read data");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_mobject_read_uint16(&mobj, byteorder, (pl_vm_address_t) (test_bytes-1), 1, &u16), @"Failed to read data");
STAssertEquals(u16, (uint16_t) 0x0001, @"Incorrect data");
/* uint32 */
uint32_t u32;
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_mobject_read_uint32(&mobj, byteorder, test_bytes-1, 1, &u32), @"Failed to read data");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_mobject_read_uint32(&mobj, byteorder, (pl_vm_address_t) (test_bytes-1), 1, &u32), @"Failed to read data");
STAssertEquals(u32, (uint32_t) 0x00010203, @"Incorrect data");
/* uint64 */
uint64_t u64;
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_mobject_read_uint64(&mobj, byteorder, test_bytes-1, 1, &u64), @"Failed to read data");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_mobject_read_uint64(&mobj, byteorder, (pl_vm_address_t) (test_bytes-1), 1, &u64), @"Failed to read data");
STAssertEquals(u64, (uint64_t) 0x0001020304050607ULL, @"Incorrect data");
/* Clean up */

4
Tests/PLCrashAsyncMachOImageTests.m
View File

@@ -57,7 +57,7 @@
for (uint32_t i = 0; i < _dyld_image_count(); i++) {
if (_dyld_get_image_header(i) == info.dli_fbase) {
vmaddr_slide = _dyld_get_image_vmaddr_slide(i);
text_vmaddr = info.dli_fbase - vmaddr_slide;
text_vmaddr = (uintptr_t) (info.dli_fbase - vmaddr_slide);
found_image = true;
break;
}
@@ -418,7 +418,7 @@ static void testFindSymbol_cb (pl_vm_address_t address, const char *name, void *
/* Perform our symbol lookup */
pl_vm_address_t pc;
plcrash_error_t res = plcrash_async_macho_find_symbol_by_name(&_image, (pl_vm_address_t) dli.dli_sname, &pc);
plcrash_error_t res = plcrash_async_macho_find_symbol_by_name(&_image, (const char *) dli.dli_sname, &pc);
STAssertEquals(res, PLCRASH_ESUCCESS, @"Failed to locate symbol %s", dli.dli_sname);
/* Compare the results */

8
Tests/PLCrashAsyncTests.m
View File

@@ -120,16 +120,16 @@
union test_data dest;
src.u64 = 0xCAFEF00DDEADBEEFULL;
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_task_read_uint64(mach_task_self(), byteorder, &src, 0, &dest.u64), @"Failed to read value");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_task_read_uint64(mach_task_self(), byteorder, (pl_vm_address_t) &src, 0, &dest.u64), @"Failed to read value");
STAssertEquals(byteorder->swap64(dest.u64), src.u64, @"Incorrect value read");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_task_read_uint32(mach_task_self(), byteorder, &src, 0, &dest.u32), @"Failed to read value");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_task_read_uint32(mach_task_self(), byteorder, (pl_vm_address_t) &src, 0, &dest.u32), @"Failed to read value");
STAssertEquals(byteorder->swap32(dest.u32), src.u32, @"Incorrect value read");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_task_read_uint16(mach_task_self(), byteorder, &src, 0, &dest.u16), @"Failed to read value");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_task_read_uint16(mach_task_self(), byteorder, (pl_vm_address_t) &src, 0, &dest.u16), @"Failed to read value");
STAssertEquals(byteorder->swap16(dest.u16), src.u16, @"Incorrect value read");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_task_read_uint8(mach_task_self(), &src, 0, &dest.u8), @"Failed to read value");
STAssertEquals(PLCRASH_ESUCCESS, plcrash_async_task_read_uint8(mach_task_self(), (pl_vm_address_t) &src, 0, &dest.u8), @"Failed to read value");
STAssertEquals(dest.u8, src.u8, @"Incorrect value read");
}

2
Tests/PLCrashFrameCompactUnwindTests.m
View File

@@ -69,7 +69,7 @@
plframe_error_t err;
plcrash_async_thread_state_clear_all_regs(&frame.thread_state);
plcrash_async_thread_state_set_reg(&frame.thread_state, PLCRASH_REG_IP, NULL);
plcrash_async_thread_state_set_reg(&frame.thread_state, PLCRASH_REG_IP, (plcrash_greg_t) NULL);
err = plframe_cursor_read_compact_unwind(mach_task_self(), &_image_list, &frame, NULL, &next);
STAssertEquals(err, PLFRAME_ENOTSUP, @"Unexpected result for a frame missing a valid image");

2
Tests/PLCrashFrameDWARFUnwindTests.m
View File

@@ -71,7 +71,7 @@
plframe_error_t err;
plcrash_async_thread_state_clear_all_regs(&frame.thread_state);
plcrash_async_thread_state_set_reg(&frame.thread_state, PLCRASH_REG_IP, NULL);
plcrash_async_thread_state_set_reg(&frame.thread_state, PLCRASH_REG_IP, (plcrash_greg_t) NULL);
err = plframe_cursor_read_dwarf_unwind(mach_task_self(), &_image_list, &frame, NULL, &next);
STAssertEquals(err, PLFRAME_ENOTSUP, @"Unexpected result for a frame missing a valid image");

12
Tests/PLCrashFrameStackUnwindTests.m
View File

@@ -64,9 +64,9 @@ struct stack_frame {
- (void) testNULLFrame {
/* Set up test stack */
struct stack_frame frames[] = {
{ .fp = &frames[1], .pc = 0x1 },
{ .fp = &frames[2], .pc = 0x2 },
{ .fp = 0x0, .pc = 0x3 },
{ .fp = (uintptr_t) &frames[1], .pc = 0x1 },
{ .fp = (uintptr_t) &frames[2], .pc = 0x2 },
{ .fp = (uintptr_t) 0x0, .pc = 0x3 },
};
size_t frame_count = sizeof(frames) / sizeof(frames[0]);
@@ -112,9 +112,9 @@ struct stack_frame {
- (void) testStackDirection {
/* Set up test stack */
struct stack_frame frames[] = {
{ .fp = &frames[1], .pc = 0x1 },
{ .fp = &frames[2], .pc = 0x2 },
{ .fp = &frames[0], .pc = 0x3 },
{ .fp = (uintptr_t) &frames[1], .pc = 0x1 },
{ .fp = (uintptr_t) &frames[2], .pc = 0x2 },
{ .fp = (uintptr_t) &frames[0], .pc = 0x3 },
};
size_t frame_count = sizeof(frames) / sizeof(frames[0]);

2
Tests/PLCrashLogWriterTests.m
View File

@@ -328,7 +328,7 @@
/* Initialize the image list */
plcrash_nasync_image_list_init(&image_list, mach_task_self());
for (uint32_t i = 0; i < _dyld_image_count(); i++)
plcrash_nasync_image_list_append(&image_list, _dyld_get_image_header(i), _dyld_get_image_name(i));
plcrash_nasync_image_list_append(&image_list, (pl_vm_address_t) _dyld_get_image_header(i), _dyld_get_image_name(i));
/* Initialze faux crash data */
plcrash_log_signal_info_t info;