From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Thu, 15 Aug 2019 19:14:42 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Aug 2019 19:14:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,391,1559545200"; d="scan'208";a="201406976" Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by fmsmga004.fm.intel.com with ESMTP; 15 Aug 2019 19:14:42 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jordan Justen , Ray Ni , Andrew Fish Subject: [Patch V4 06/10] EmulatorPkg: Fix XCODE5 lldb issues Date: Thu, 15 Aug 2019 19:14:33 -0700 Message-Id: <20190816021437.7516-7-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190816021437.7516-1-michael.d.kinney@intel.com> References: <20190816021437.7516-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Fix scripts to support lldb symbolic debugging when using XCODE5 tool chain. Cc: Jordan Justen Cc: Ray Ni Cc: Michael D Kinney Signed-off-by: Andrew Fish --- EmulatorPkg/Unix/lldbefi.py | 8 +++++--- EmulatorPkg/build.sh | 17 ++--------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/EmulatorPkg/Unix/lldbefi.py b/EmulatorPkg/Unix/lldbefi.py index 218326b8cb..099192d8b5 100755 --- a/EmulatorPkg/Unix/lldbefi.py +++ b/EmulatorPkg/Unix/lldbefi.py @@ -346,6 +346,7 @@ def TypePrintFormating(debugger): debugger.HandleCommand("type summary add CHAR8 --python-function lldbefi.CHAR8_TypeSummary") debugger.HandleCommand('type summary add --regex "CHAR8 \[[0-9]+\]" --python-function lldbefi.CHAR8_TypeSummary') + debugger.HandleCommand('setting set frame-format "frame #${frame.index}: ${frame.pc}{ ${module.file.basename}{:${function.name}()${function.pc-offset}}}{ at ${line.file.fullpath}:${line.number}}\n"') gEmulatorBreakWorkaroundNeeded = True @@ -381,15 +382,16 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , internal_dict): Error = lldb.SBError() FileNamePtr = frame.FindVariable ("FileName").GetValueAsUnsigned() FileNameLen = frame.FindVariable ("FileNameLength").GetValueAsUnsigned() + FileName = frame.thread.process.ReadCStringFromMemory (FileNamePtr, FileNameLen, Error) if not Error.Success(): print "!ReadCStringFromMemory() did not find a %d byte C string at %x" % (FileNameLen, FileNamePtr) # make breakpoint command contiue - frame.GetThread().GetProcess().Continue() + return False debugger = frame.thread.process.target.debugger if frame.FindVariable ("AddSymbolFlag").GetValueAsUnsigned() == 1: - LoadAddress = frame.FindVariable ("LoadAddress").GetValueAsUnsigned() + LoadAddress = frame.FindVariable ("LoadAddress").GetValueAsUnsigned() - 0x240 debugger.HandleCommand ("target modules add %s" % FileName) print "target modules load --slid 0x%x %s" % (LoadAddress, FileName) @@ -405,7 +407,7 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , internal_dict): print "!lldb.target.RemoveModule (%s) FAILED" % SBModule # make breakpoint command contiue - frame.thread.process.Continue() + return False def GuidToCStructStr (guid, Name=False): # diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh index 60056e1b6c..35912a7775 100755 --- a/EmulatorPkg/build.sh +++ b/EmulatorPkg/build.sh @@ -209,21 +209,8 @@ fi if [[ "$RUN_EMULATOR" == "yes" ]]; then case `uname` in Darwin*) - # - # On Darwin we can't use dlopen, so we have to load the real PE/COFF images. - # This .gdbinit script sets a breakpoint that loads symbols for the PE/COFFEE - # images that get loaded in Host - # - if [[ "$CLANG_VER" == *-ccc-host-triple* ]] - then - # only older versions of Xcode support -ccc-host-tripe, for newer versions - # it is -target - cp $WORKSPACE/EmulatorPkg/Unix/lldbefi.py "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS/$PROCESSOR" - cd $BUILD_ROOT_ARCH; /usr/bin/lldb --source $WORKSPACE/EmulatorPkg/Unix/lldbinit Host - exit $? - else - cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS/$PROCESSOR" - fi + cd $BUILD_ROOT_ARCH; /usr/bin/lldb -o "command script import $WORKSPACE/EmulatorPkg/Unix/lldbefi.py" -o 'script lldb.debugger.SetAsync(True)' -o "run" ./Host + exit $? ;; esac -- 2.21.0.windows.1