From 47ebdceea1fcb9b7bc3efd3dc6167463f5bb7a41 Mon Sep 17 00:00:00 2001 From: Lubos Dolezel Date: Tue, 31 Jul 2018 15:35:04 +0200 Subject: [PATCH] More LLDB improvements --- src/DebugSymbols/DebugSymbols.c | 3 +++ src/kernel/emulation/linux/misc/proc_info.c | 2 +- src/lkm | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/DebugSymbols/DebugSymbols.c b/src/DebugSymbols/DebugSymbols.c index d735cca4c..a84fd149b 100644 --- a/src/DebugSymbols/DebugSymbols.c +++ b/src/DebugSymbols/DebugSymbols.c @@ -19,6 +19,8 @@ CFURLRef DBGCopyFullDSYMURLForUUID(CFUUIDRef uuid, CFURLRef exec_url) CFRelease(dsymPath); return url; } + + fprintf(stderr, "Didn't find debug symbols at %s based on UUID\n",CFStringGetCStringPtr(dsymPath, kCFStringEncodingUTF8)); CFRelease(dsymPath); } @@ -36,6 +38,7 @@ CFURLRef DBGCopyFullDSYMURLForUUID(CFUUIDRef uuid, CFURLRef exec_url) CFRelease(dsymPath); return url; } + fprintf(stderr, "Debug symbols not found at %s\n", CFStringGetCStringPtr(exec_path, kCFStringEncodingUTF8)); CFRelease(dsymPath); } diff --git a/src/kernel/emulation/linux/misc/proc_info.c b/src/kernel/emulation/linux/misc/proc_info.c index 4ea441004..073e2a56a 100644 --- a/src/kernel/emulation/linux/misc/proc_info.c +++ b/src/kernel/emulation/linux/misc/proc_info.c @@ -339,7 +339,7 @@ static long _proc_pidinfo_regionpathinfo(int32_t pid, uint64_t arg, void* buffer // This call returns true if we see the start of another mapping. if (parse_smaps_firstline(line, &my_rpi.prp_prinfo, &my_rpi.prp_vip)) { - if (my_rpi.prp_prinfo.pri_address + my_rpi.prp_prinfo.pri_size >= arg) + if (arg >= my_rpi.prp_prinfo.pri_address && arg < (my_rpi.prp_prinfo.pri_address + my_rpi.prp_prinfo.pri_size)) { foundRegion = true; } diff --git a/src/lkm b/src/lkm index ca4645353..8e232d5c7 160000 --- a/src/lkm +++ b/src/lkm @@ -1 +1 @@ -Subproject commit ca464535397b654d35f3683c893ad57e0c1e7951 +Subproject commit 8e232d5c78902fbe5e58534a764c96816dd95bd1 -- 2.51.2