<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><span class="">I needed to revert this in r327327 to get the bots going again.</span><div class=""><font face="Segoe UI, Segoe UI Emoji, Segoe UI Symbol, Lato, Helvetica Neue, Helvetica, Arial, sans-serif" size="2" class=""><span style="background-color: rgb(255, 255, 255);" class=""><br class=""></span></font></div><div class=""><font face="Segoe UI, Segoe UI Emoji, Segoe UI Symbol, Lato, Helvetica Neue, Helvetica, Arial, sans-serif" size="2" class=""><span style="background-color: rgb(255, 255, 255);" class="">vedant</span></font></div><div class=""><font face="Segoe UI, Segoe UI Emoji, Segoe UI Symbol, Lato, Helvetica Neue, Helvetica, Arial, sans-serif" size="2" class=""><span style="background-color: rgb(255, 255, 255);" class=""><br class=""></span></font><div style=""><blockquote type="cite" class=""><div class="">On Mar 12, 2018, at 1:26 PM, Vedant Kumar via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org" class="">lldb-commits@lists.llvm.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><meta http-equiv="Content-Type" content="text/html charset=us-ascii" class=""><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hi Jim,<div class=""><br class=""></div><div class="">I think this breaks the Xcode bot: <a href="http://green.lab.llvm.org/green/job/lldb-xcode/5430/" class="">http://green.lab.llvm.org/green/job/lldb-xcode/5430/</a>. The CMake build looks broken too. Mind taking a look or reverting?</div><div class=""><br class=""></div><div class=""><pre style="word-wrap: break-word; white-space: pre-wrap;" class="">CompileC build/lldb.build/Release/lldb-core.build/Objects-normal/x86_64/ArchitecturePPC64.o source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler
    cd /Users/buildslave/jenkins/workspace/lldb-xcode/lldb
    export LANG=en_US.US-ASCII
    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c++ -arch x86_64 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=c++11 -stdlib=libc++ -Wno-trigraphs -fpascal-strings -Os -fno-common -Wmissing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wnon-virtual-dtor -Woverloaded-virtual -Wno-exit-time-destructors -Wmissing-braces -Wparentheses -Wswitch -Wunused-function -Wunused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-shorten-64-to-32 -Wnewline-eof -Wno-c++11-extensions -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DLLDB_CONFIGURATION_RELEASE -DLLDB_VERSION_STRING=lldb-360.99.0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -mmacosx-version-min=10.12 -g -Wno-sign-conversion -Wno-infinite-recursion -Wno-move -iquote /Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/lldb.build/Release/lldb-core.build/liblldb-core-generated-files.hmap -I/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/lldb.build/Release/lldb-core.build/liblldb-core-own-target-headers.hmap -I/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/lldb.build/Release/lldb-core.build/liblldb-core-all-target-headers.hmap -iquote /Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/lldb.build/Release/lldb-core.build/liblldb-core-project-headers.hmap -iquote/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/include -iquote/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/source -iquote/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/llvm/include -iquote/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/llvm/tools/clang/include -iquote/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/llvm-build/Release+Asserts/x86_64/include -iquote/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/llvm-build/Release+Asserts/x86_64/tools/clang/include -iquote/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/llvm-build/Release+Asserts/x86_64/lib/Target/ARM -I/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/Release/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/libxml2 -I/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/lldb.build/Release/lldb-core.build/DerivedSources/x86_64 -I/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/lldb.build/Release/lldb-core.build/DerivedSources -Wreorder -F/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/Release -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/PrivateFrameworks -I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 -fno-rtti -Wglobal-constructors -Wparentheses -DHAVE_LIBZ=1 -Wimplicit-fallthrough -DLLDB_USE_BUILTIN_DEMANGLER -DLIBXML2_DEFINED -MMD -MT dependencies -MF /Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/lldb.build/Release/lldb-core.build/Objects-normal/x86_64/ArchitecturePPC64.d --serialize-diagnostics /Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/lldb.build/Release/lldb-core.build/Objects-normal/x86_64/ArchitecturePPC64.dia -c /Users/buildslave/jenkins/workspace/lldb-xcode/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp -o /Users/buildslave/jenkins/workspace/lldb-xcode/lldb/build/lldb.build/Release/lldb-core.build/Objects-normal/x86_64/ArchitecturePPC64.o
clang: error: no such file or directory: '/Users/buildslave/jenkins/workspace/lldb-xcode/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp'
clang: error: no input files</pre><div class=""><br class=""></div></div><div class="">thanks,</div><div class="">vedant</div><div class=""><br class=""><div class=""><blockquote type="cite" class=""><div class="">On Mar 12, 2018, at 12:21 PM, Jim Ingham via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org" class="">lldb-commits@lists.llvm.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">Author: jingham<br class="">Date: Mon Mar 12 12:21:59 2018<br class="">New Revision: 327318<br class=""><br class="">URL: <a href="http://llvm.org/viewvc/llvm-project?rev=327318&view=rev" class="">http://llvm.org/viewvc/llvm-project?rev=327318&view=rev</a><br class="">Log:<br class="">Improve prologue handling to support functions with multiple entry points.<br class=""><br class=""><a href="https://reviews.llvm.org/D42582" class="">https://reviews.llvm.org/D42582</a><br class=""><br class="">Patch from Leandro Lupori.<br class=""><br class="">Modified:<br class="">    lldb/trunk/include/lldb/Core/Architecture.h<br class="">    lldb/trunk/lit/lit.cfg<br class="">    lldb/trunk/lldb.xcodeproj/project.pbxproj<br class="">    lldb/trunk/source/API/SystemInitializerFull.cpp<br class="">    lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp<br class="">    lldb/trunk/source/Plugins/Architecture/CMakeLists.txt<br class="">    lldb/trunk/source/Target/ThreadPlanStepInRange.cpp<br class="">    lldb/trunk/tools/lldb-test/SystemInitializerTest.cpp<br class="">    lldb/trunk/tools/lldb-test/lldb-test.cpp<br class=""><br class="">Modified: lldb/trunk/include/lldb/Core/Architecture.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Architecture.h?rev=327318&r1=327317&r2=327318&view=diff" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Architecture.h?rev=327318&r1=327317&r2=327318&view=diff</a><br class="">==============================================================================<br class="">--- lldb/trunk/include/lldb/Core/Architecture.h (original)<br class="">+++ lldb/trunk/include/lldb/Core/Architecture.h Mon Mar 12 12:21:59 2018<br class="">@@ -33,6 +33,40 @@ public:<br class="">   //------------------------------------------------------------------<br class="">   virtual void OverrideStopInfo(Thread &thread) = 0;<br class=""><br class="">+  //------------------------------------------------------------------<br class="">+  /// This method is used to get the number of bytes that should be<br class="">+  /// skipped, from function start address, to reach the first<br class="">+  /// instruction after the prologue. If overrode, it must return<br class="">+  /// non-zero only if the current address matches one of the known<br class="">+  /// function entry points.<br class="">+  ///<br class="">+  /// This method is called only if the standard platform-independent<br class="">+  /// code fails to get the number of bytes to skip, giving the plugin<br class="">+  /// a chance to try to find the missing info.<br class="">+  ///<br class="">+  /// This is specifically used for PPC64, where functions may have<br class="">+  /// more than one entry point, global and local, so both should<br class="">+  /// be compared with current address, in order to find out the<br class="">+  /// number of bytes that should be skipped, in case we are stopped<br class="">+  /// at either function entry point.<br class="">+  //------------------------------------------------------------------<br class="">+  virtual size_t GetBytesToSkip(Symbol &func, const Address &curr_addr) const {<br class="">+    return 0;<br class="">+  }<br class="">+<br class="">+  //------------------------------------------------------------------<br class="">+  /// Adjust function breakpoint address, if needed. In some cases,<br class="">+  /// the function start address is not the right place to set the<br class="">+  /// breakpoint, specially in functions with multiple entry points.<br class="">+  ///<br class="">+  /// This is specifically used for PPC64, for functions that have<br class="">+  /// both a global and a local entry point. In this case, the<br class="">+  /// breakpoint is adjusted to the first function address reached<br class="">+  /// by both entry points.<br class="">+  //------------------------------------------------------------------<br class="">+  virtual void AdjustBreakpointAddress(const Symbol &func,<br class="">+                                       Address &addr) const {}<br class="">+<br class=""> private:<br class="">   Architecture(const Architecture &) = delete;<br class="">   void operator=(const Architecture &) = delete;<br class=""><br class="">Modified: lldb/trunk/lit/lit.cfg<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/lit.cfg?rev=327318&r1=327317&r2=327318&view=diff" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/lit.cfg?rev=327318&r1=327317&r2=327318&view=diff</a><br class="">==============================================================================<br class="">--- lldb/trunk/lit/lit.cfg (original)<br class="">+++ lldb/trunk/lit/lit.cfg Mon Mar 12 12:21:59 2018<br class="">@@ -155,6 +155,8 @@ if re.search(r'ARM', llvm_config_output_<br class="">     config.available_features.add('arm')<br class=""> if re.search(r'Mips', llvm_config_output_list[2]):<br class="">     config.available_features.add('mips')<br class="">+if re.search(r'PowerPC', llvm_config_output_list[2]):<br class="">+    config.available_features.add('powerpc')<br class=""> if re.search(r'X86', llvm_config_output_list[2]):<br class="">     config.available_features.add('x86')<br class=""> llvm_config_cmd.wait()<br class=""><br class="">Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=327318&r1=327317&r2=327318&view=diff" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=327318&r1=327317&r2=327318&view=diff</a><br class="">==============================================================================<br class="">--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)<br class="">+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Mon Mar 12 12:21:59 2018<br class="">@@ -712,6 +712,7 @@<br class=""> <span class="Apple-tab-span" style="white-space:pre">  </span><span class="Apple-tab-span" style="white-space:pre">    </span>49F811F31E931B2100F4E163 /* CPlusPlusNameParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49F811EF1E931B1500F4E163 /* CPlusPlusNameParser.cpp */; };<br class=""> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C0083401B9F9BA900D5CF24 /* UtilityFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C00833F1B9F9BA900D5CF24 /* UtilityFunction.cpp */; };<br class=""> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C05332B1F62121E00DED368 /* SBBreakpointOptionCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C0533291F6211FB00DED368 /* SBBreakpointOptionCommon.cpp */; };<br class="">+<span class="Apple-tab-span" style="white-space:pre">       </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C14CEF020570AA300DEEF94 /* ArchitecturePPC64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C14CEEE20570AA300DEEF94 /* ArchitecturePPC64.cpp */; };<br class=""> <span class="Apple-tab-span" style="white-space:pre">     </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C2479BD1BA39295009C9A7B /* FunctionCaller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C0083321B9A5DE200D5CF24 /* FunctionCaller.cpp */; };<br class=""> <span class="Apple-tab-span" style="white-space:pre">   </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C3ADCD61810D88B00357218 /* BreakpointResolverFileRegex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CAA56141422D986001FFA01 /* BreakpointResolverFileRegex.cpp */; };<br class=""> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C4EB7811E6A4DCC002035C0 /* DumpDataExtractor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C4EB77F1E6A4DB8002035C0 /* DumpDataExtractor.cpp */; };<br class="">@@ -2541,6 +2542,8 @@<br class=""> <span class="Apple-tab-span" style="white-space:pre">   </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C08CDEB11C81F1E001610A8 /* ThreadSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadSpec.h; path = include/lldb/Target/ThreadSpec.h; sourceTree = "<group>"; };<br class=""> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C09CB73116BD98B00C7A725 /* CommandCompletions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandCompletions.h; path = include/lldb/Interpreter/CommandCompletions.h; sourceTree = "<group>"; };<br class=""> <span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C09CB74116BD98B00C7A725 /* CommandCompletions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandCompletions.cpp; path = source/Commands/CommandCompletions.cpp; sourceTree = "<group>"; };<br class="">+<span class="Apple-tab-span" style="white-space:pre">   </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C14CEED20570AA300DEEF94 /* ArchitecturePPC64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ArchitecturePPC64.h; path = PPC64/ArchitecturePPC64.h; sourceTree = "<group>"; };<br class="">+<span class="Apple-tab-span" style="white-space:pre">  </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C14CEEE20570AA300DEEF94 /* ArchitecturePPC64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ArchitecturePPC64.cpp; path = PPC64/ArchitecturePPC64.cpp; sourceTree = "<group>"; };<br class=""> <span class="Apple-tab-span" style="white-space:pre">        </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C2479BE1BA39843009C9A7B /* ExpressionParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ExpressionParser.h; path = include/lldb/Expression/ExpressionParser.h; sourceTree = "<group>"; };<br class=""> <span class="Apple-tab-span" style="white-space:pre">     </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C29E77D1BA2403F00DFF855 /* ExpressionTypeSystemHelper.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = ExpressionTypeSystemHelper.h; path = include/lldb/Expression/ExpressionTypeSystemHelper.h; sourceTree = "<group>"; };<br class=""> <span class="Apple-tab-span" style="white-space:pre">      </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C2FAE2E135E3A70001EDE44 /* SharedCluster.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedCluster.h; path = include/lldb/Utility/SharedCluster.h; sourceTree = "<group>"; };<br class="">@@ -5963,6 +5966,15 @@<br class=""> <span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>name = Clang;<br class=""> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>sourceTree = "<group>";<br class=""> <span class="Apple-tab-span" style="white-space:pre">       </span><span class="Apple-tab-span" style="white-space:pre">    </span>};<br class="">+<span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C14CEEC20570A7D00DEEF94 /* PPC64 */ = {<br class="">+<span class="Apple-tab-span" style="white-space:pre">      </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>isa = PBXGroup;<br class="">+<span class="Apple-tab-span" style="white-space:pre">       </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>children = (<br class="">+<span class="Apple-tab-span" style="white-space:pre">  </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C14CEEE20570AA300DEEF94 /* ArchitecturePPC64.cpp */,<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C14CEED20570AA300DEEF94 /* ArchitecturePPC64.h */,<br class="">+<span class="Apple-tab-span" style="white-space:pre">   </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>);<br class="">+<span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>name = PPC64;<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>sourceTree = "<group>";<br class="">+<span class="Apple-tab-span" style="white-space:pre">       </span><span class="Apple-tab-span" style="white-space:pre">    </span>};<br class=""> <span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>4CC7C64B1D5298AB0076FF94 /* OCaml */ = {<br class=""> <span class="Apple-tab-span" style="white-space:pre">      </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>isa = PBXGroup;<br class=""> <span class="Apple-tab-span" style="white-space:pre">       </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>children = (<br class="">@@ -6600,6 +6612,7 @@<br class=""> <span class="Apple-tab-span" style="white-space:pre">        </span><span class="Apple-tab-span" style="white-space:pre">    </span>AF2E029F1FA2CE8A00A86C34 /* Architecture */ = {<br class=""> <span class="Apple-tab-span" style="white-space:pre">       </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>isa = PBXGroup;<br class=""> <span class="Apple-tab-span" style="white-space:pre">       </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>children = (<br class="">+<span class="Apple-tab-span" style="white-space:pre">  </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C14CEEC20570A7D00DEEF94 /* PPC64 */,<br class=""> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>AF2E02A01FA2CE9900A86C34 /* Arm */,<br class=""> <span class="Apple-tab-span" style="white-space:pre">   </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>);<br class=""> <span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>path = Architecture;<br class="">@@ -7611,6 +7624,7 @@<br class=""> <span class="Apple-tab-span" style="white-space:pre">        </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>943BDEFE1AA7B2F800789CE8 /* LLDBAssert.cpp in Sources */,<br class=""> <span class="Apple-tab-span" style="white-space:pre">     </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>26474CB418D0CB180073DEBA /* RegisterContextLinux_x86_64.cpp in Sources */,<br class=""> <span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>2689006613353E0E00698AC0 /* DWARFExpression.cpp in Sources */,<br class="">+<span class="Apple-tab-span" style="white-space:pre">        </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>4C14CEF020570AA300DEEF94 /* ArchitecturePPC64.cpp in Sources */,<br class=""> <span class="Apple-tab-span" style="white-space:pre">      </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>2689006713353E0E00698AC0 /* ASTDumper.cpp in Sources */,<br class=""> <span class="Apple-tab-span" style="white-space:pre">      </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>AFC234091AF85CE100CDE8B6 /* CommandObjectLanguage.cpp in Sources */,<br class=""> <span class="Apple-tab-span" style="white-space:pre">  </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span><span class="Apple-tab-span" style="white-space:pre">    </span>2689006813353E0E00698AC0 /* ASTResultSynthesizer.cpp in Sources */,<br class=""><br class="">Modified: lldb/trunk/source/API/SystemInitializerFull.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SystemInitializerFull.cpp?rev=327318&r1=327317&r2=327318&view=diff" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SystemInitializerFull.cpp?rev=327318&r1=327317&r2=327318&view=diff</a><br class="">==============================================================================<br class="">--- lldb/trunk/source/API/SystemInitializerFull.cpp (original)<br class="">+++ lldb/trunk/source/API/SystemInitializerFull.cpp Mon Mar 12 12:21:59 2018<br class="">@@ -43,6 +43,7 @@<br class=""> #include "Plugins/ABI/SysV-s390x/ABISysV_s390x.h"<br class=""> #include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h"<br class=""> #include "Plugins/Architecture/Arm/ArchitectureArm.h"<br class="">+#include "Plugins/Architecture/PPC64/ArchitecturePPC64.h"<br class=""> #include "Plugins/Disassembler/llvm/DisassemblerLLVMC.h"<br class=""> #include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h"<br class=""> #include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h"<br class="">@@ -308,6 +309,7 @@ void SystemInitializerFull::Initialize()<br class="">   ABISysV_s390x::Initialize();<br class=""><br class="">   ArchitectureArm::Initialize();<br class="">+  ArchitecturePPC64::Initialize();<br class=""><br class="">   DisassemblerLLVMC::Initialize();<br class=""><br class=""><br class="">Modified: lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp?rev=327318&r1=327317&r2=327318&view=diff" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp?rev=327318&r1=327317&r2=327318&view=diff</a><br class="">==============================================================================<br class="">--- lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp (original)<br class="">+++ lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp Mon Mar 12 12:21:59 2018<br class="">@@ -16,11 +16,13 @@<br class=""> #include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h"<br class=""> #include "Plugins/Language/ObjC/ObjCLanguage.h"<br class=""> #include "lldb/Breakpoint/BreakpointLocation.h"<br class="">+#include "lldb/Core/Architecture.h"<br class=""> #include "lldb/Core/Module.h"<br class=""> #include "lldb/Symbol/Block.h"<br class=""> #include "lldb/Symbol/Function.h"<br class=""> #include "lldb/Symbol/Symbol.h"<br class=""> #include "lldb/Symbol/SymbolContext.h"<br class="">+#include "lldb/Target/Target.h"<br class=""> #include "lldb/Utility/Log.h"<br class=""> #include "lldb/Utility/StreamString.h"<br class=""><br class="">@@ -365,6 +367,12 @@ BreakpointResolverName::SearchCallback(S<br class="">                 sc.symbol->GetPrologueByteSize();<br class="">             if (prologue_byte_size)<br class="">               break_addr.SetOffset(break_addr.GetOffset() + prologue_byte_size);<br class="">+            else {<br class="">+              Architecture *arch =<br class="">+                  m_breakpoint->GetTarget().GetArchitecturePlugin();<br class="">+              if (arch)<br class="">+                arch->AdjustBreakpointAddress(*sc.symbol, break_addr);<br class="">+            }<br class="">           }<br class="">         }<br class=""><br class=""><br class="">Modified: lldb/trunk/source/Plugins/Architecture/CMakeLists.txt<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Architecture/CMakeLists.txt?rev=327318&r1=327317&r2=327318&view=diff" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Architecture/CMakeLists.txt?rev=327318&r1=327317&r2=327318&view=diff</a><br class="">==============================================================================<br class="">--- lldb/trunk/source/Plugins/Architecture/CMakeLists.txt (original)<br class="">+++ lldb/trunk/source/Plugins/Architecture/CMakeLists.txt Mon Mar 12 12:21:59 2018<br class="">@@ -1 +1,2 @@<br class=""> add_subdirectory(Arm)<br class="">+add_subdirectory(PPC64)<br class=""><br class="">Modified: lldb/trunk/source/Target/ThreadPlanStepInRange.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanStepInRange.cpp?rev=327318&r1=327317&r2=327318&view=diff" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanStepInRange.cpp?rev=327318&r1=327317&r2=327318&view=diff</a><br class="">==============================================================================<br class="">--- lldb/trunk/source/Target/ThreadPlanStepInRange.cpp (original)<br class="">+++ lldb/trunk/source/Target/ThreadPlanStepInRange.cpp Mon Mar 12 12:21:59 2018<br class="">@@ -12,11 +12,13 @@<br class=""> // Other libraries and framework includes<br class=""> // Project includes<br class=""> #include "lldb/Target/ThreadPlanStepInRange.h"<br class="">+#include "lldb/Core/Architecture.h"<br class=""> #include "lldb/Core/Module.h"<br class=""> #include "lldb/Symbol/Function.h"<br class=""> #include "lldb/Symbol/Symbol.h"<br class=""> #include "lldb/Target/Process.h"<br class=""> #include "lldb/Target/RegisterContext.h"<br class="">+#include "lldb/Target/SectionLoadList.h"<br class=""> #include "lldb/Target/Target.h"<br class=""> #include "lldb/Target/Thread.h"<br class=""> #include "lldb/Target/ThreadPlanStepOut.h"<br class="">@@ -277,6 +279,17 @@ bool ThreadPlanStepInRange::ShouldStop(E<br class="">             bytes_to_skip = sc.symbol->GetPrologueByteSize();<br class="">         }<br class=""><br class="">+        if (bytes_to_skip == 0 && sc.symbol) {<br class="">+          TargetSP target = m_thread.CalculateTarget();<br class="">+          Architecture *arch = target->GetArchitecturePlugin();<br class="">+          if (arch) {<br class="">+            Address curr_sec_addr;<br class="">+            target->GetSectionLoadList().ResolveLoadAddress(curr_addr,<br class="">+                                                            curr_sec_addr);<br class="">+            bytes_to_skip = arch->GetBytesToSkip(*sc.symbol, curr_sec_addr);<br class="">+          }<br class="">+        }<br class="">+<br class="">         if (bytes_to_skip != 0) {<br class="">           func_start_address.Slide(bytes_to_skip);<br class="">           log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_STEP);<br class=""><br class="">Modified: lldb/trunk/tools/lldb-test/SystemInitializerTest.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-test/SystemInitializerTest.cpp?rev=327318&r1=327317&r2=327318&view=diff" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-test/SystemInitializerTest.cpp?rev=327318&r1=327317&r2=327318&view=diff</a><br class="">==============================================================================<br class="">--- lldb/trunk/tools/lldb-test/SystemInitializerTest.cpp (original)<br class="">+++ lldb/trunk/tools/lldb-test/SystemInitializerTest.cpp Mon Mar 12 12:21:59 2018<br class="">@@ -33,6 +33,7 @@<br class=""> #include "Plugins/ABI/SysV-s390x/ABISysV_s390x.h"<br class=""> #include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h"<br class=""> #include "Plugins/Architecture/Arm/ArchitectureArm.h"<br class="">+#include "Plugins/Architecture/PPC64/ArchitecturePPC64.h"<br class=""> #include "Plugins/Disassembler/llvm/DisassemblerLLVMC.h"<br class=""> #include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h"<br class=""> #include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h"<br class="">@@ -162,6 +163,7 @@ void SystemInitializerTest::Initialize()<br class="">   ABISysV_s390x::Initialize();<br class=""><br class="">   ArchitectureArm::Initialize();<br class="">+  ArchitecturePPC64::Initialize();<br class=""><br class="">   DisassemblerLLVMC::Initialize();<br class=""><br class=""><br class="">Modified: lldb/trunk/tools/lldb-test/lldb-test.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-test/lldb-test.cpp?rev=327318&r1=327317&r2=327318&view=diff" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-test/lldb-test.cpp?rev=327318&r1=327317&r2=327318&view=diff</a><br class="">==============================================================================<br class="">--- lldb/trunk/tools/lldb-test/lldb-test.cpp (original)<br class="">+++ lldb/trunk/tools/lldb-test/lldb-test.cpp Mon Mar 12 12:21:59 2018<br class="">@@ -98,9 +98,12 @@ void opts::breakpoint::dumpState(const B<br class="">       AutoIndent Indent(P, 2);<br class="">       P.formatLine("Enabled: {0}", Loc->IsEnabled());<br class="">       P.formatLine("Resolved: {0}", Loc->IsResolved());<br class="">-      P.formatLine("Address: {0}+{1:x}",<br class="">-                   Loc->GetAddress().GetSection()->GetName(),<br class="">-                   Loc->GetAddress().GetOffset());<br class="">+      SymbolContext sc;<br class="">+      Loc->GetAddress().CalculateSymbolContext(&sc);<br class="">+      lldb_private::StreamString S;<br class="">+      sc.DumpStopContext(&S, BP->GetTarget().GetProcessSP().get(),<br class="">+                         Loc->GetAddress(), false, true, false, true, true);<br class="">+      P.formatLine("Address: {0}", S.GetString());<br class="">     }<br class="">   }<br class="">   P.NewLine();<br class=""><br class=""><br class="">_______________________________________________<br class="">lldb-commits mailing list<br class=""><a href="mailto:lldb-commits@lists.llvm.org" class="">lldb-commits@lists.llvm.org</a><br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits<br class=""></div></div></blockquote></div><br class=""></div></div>_______________________________________________<br class="">lldb-commits mailing list<br class=""><a href="mailto:lldb-commits@lists.llvm.org" class="">lldb-commits@lists.llvm.org</a><br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits<br class=""></div></blockquote></div><br class=""></div></body></html>