diff options
195 files changed, 948 insertions, 429 deletions
diff --git a/lldb/include/lldb/API/SBInstruction.h b/lldb/include/lldb/API/SBInstruction.h index cdc4040c756..aad2d87f4f3 100644 --- a/lldb/include/lldb/API/SBInstruction.h +++ b/lldb/include/lldb/API/SBInstruction.h @@ -70,7 +70,7 @@ public: EmulateWithFrame (lldb::SBFrame &frame, uint32_t evaluate_options); bool - DumpEmulation (const char * triple); // triple is to specify the architecture, e.g. 'armv6' or 'arm-apple-darwin' + DumpEmulation (const char * triple); // triple is to specify the architecture, e.g. 'armv6' or 'armv7-apple-ios' bool TestEmulation (lldb::SBStream &output_stream, const char *test_file); diff --git a/lldb/include/lldb/Core/ArchSpec.h b/lldb/include/lldb/Core/ArchSpec.h index 879f1cd4ad0..798a27fc2da 100644 --- a/lldb/include/lldb/Core/ArchSpec.h +++ b/lldb/include/lldb/Core/ArchSpec.h @@ -86,21 +86,24 @@ public: kCore_invalid, // The following constants are used for wildcard matching only - kCore_any, - + kCore_any, kCore_arm_any, + kCore_ppc_any, + kCore_ppc64_any, + kCore_x86_32_any, + kCore_arm_first = eCore_arm_generic, kCore_arm_last = eCore_arm_xscale, - kCore_ppc_any, + kCore_thumb_first = eCore_thumb, + kCore_thumb_last = eCore_thumbv7s, + kCore_ppc_first = eCore_ppc_generic, kCore_ppc_last = eCore_ppc_ppc970, - kCore_ppc64_any, kCore_ppc64_first = eCore_ppc64_generic, kCore_ppc64_last = eCore_ppc64_ppc970_64, - kCore_x86_32_any, kCore_x86_32_first = eCore_x86_32_i386, kCore_x86_32_last = eCore_x86_32_i486sx }; @@ -122,6 +125,8 @@ public: explicit ArchSpec (const llvm::Triple &triple); explicit + ArchSpec (const char *triple_cstr); + explicit ArchSpec (const char *triple_cstr, Platform *platform); //------------------------------------------------------------------ /// Constructor over architecture name. @@ -202,6 +207,17 @@ public: return m_core >= eCore_arm_generic && m_core < kNumCores; } + bool + TripleVendorWasSpecified() const + { + return !m_triple.getVendorName().empty(); + } + + bool + TripleOSWasSpecified() const + { + return !m_triple.getOSName().empty(); + } //------------------------------------------------------------------ /// Sets this ArchSpec according to the given architecture name. @@ -334,7 +350,11 @@ public: SetTriple (const llvm::Triple &triple); bool - SetTriple (const char *triple_cstr, Platform *platform); + SetTriple (const char *triple_cstr); + + bool + SetTriple (const char *triple_cstr, + Platform *platform); //------------------------------------------------------------------ /// Returns the default endianness of the architecture. diff --git a/lldb/include/lldb/Interpreter/OptionGroupPlatform.h b/lldb/include/lldb/Interpreter/OptionGroupPlatform.h index e987e26e034..970ad328ccb 100644 --- a/lldb/include/lldb/Interpreter/OptionGroupPlatform.h +++ b/lldb/include/lldb/Interpreter/OptionGroupPlatform.h @@ -62,7 +62,8 @@ public: CreatePlatformWithOptions (CommandInterpreter &interpreter, const ArchSpec &arch, bool make_selected, - Error& error) const; + Error& error, + ArchSpec &platform_arch) const; bool PlatformWasSpecified () const diff --git a/lldb/include/lldb/Target/Platform.h b/lldb/include/lldb/Target/Platform.h index fa5b3d546d0..ce9d6fd936f 100644 --- a/lldb/include/lldb/Target/Platform.h +++ b/lldb/include/lldb/Target/Platform.h @@ -58,7 +58,8 @@ namespace lldb_private { GetDefaultPlatform (); static lldb::PlatformSP - GetPlatformForArchitecture (const ArchSpec &arch); + GetPlatformForArchitecture (const ArchSpec &arch, + ArchSpec *platform_arch_ptr); static const char * GetHostPlatformName (); @@ -70,7 +71,7 @@ namespace lldb_private { Create (const char *platform_name, Error &error); static lldb::PlatformSP - Create (const ArchSpec &arch, Error &error); + Create (const ArchSpec &arch, ArchSpec *platform_arch_ptr, Error &error); static uint32_t GetNumConnectedRemotePlatforms (); @@ -284,7 +285,7 @@ namespace lldb_private { /// architecture and the target triple contained within. //------------------------------------------------------------------ virtual bool - IsCompatibleWithArchitecture (const ArchSpec &arch); + IsCompatibleArchitecture (const ArchSpec &arch, ArchSpec *compatible_arch_ptr = NULL); //------------------------------------------------------------------ /// Not all platforms will support debugging a process by spawning diff --git a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/lldb-tool.xcscheme b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/lldb-tool.xcscheme index 5c24cc3fc9b..9caf152c6cd 100644 --- a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/lldb-tool.xcscheme +++ b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/lldb-tool.xcscheme @@ -100,6 +100,20 @@ ReferencedContainer = "container:lldb.xcodeproj"> </BuildableReference> </BuildableProductRunnable> + <CommandLineArguments> + <CommandLineArgument + argument = "-a armv7 " + isEnabled = "NO"> + </CommandLineArgument> + <CommandLineArgument + argument = "/Volumes/work/gclayton/Documents/devb/attach/a.out" + isEnabled = "NO"> + </CommandLineArgument> + <CommandLineArgument + argument = "/bin/cat" + isEnabled = "NO"> + </CommandLineArgument> + </CommandLineArguments> <EnvironmentVariables> <EnvironmentVariable key = "LLDB_LAUNCH_FLAG_DISABLE_ASLR" diff --git a/lldb/scripts/Python/interface/SBInstruction.i b/lldb/scripts/Python/interface/SBInstruction.i index 3c0d65ef842..039e04454d4 100644 --- a/lldb/scripts/Python/interface/SBInstruction.i +++ b/lldb/scripts/Python/interface/SBInstruction.i @@ -61,7 +61,7 @@ public: EmulateWithFrame (lldb::SBFrame &frame, uint32_t evaluate_options); bool - DumpEmulation (const char * triple); // triple is to specify the architecture, e.g. 'armv6' or 'arm-apple-darwin' + DumpEmulation (const char * triple); // triple is to specify the architecture, e.g. 'armv6' or 'armv7-apple-ios' bool TestEmulation (lldb::SBStream &output_stream, const char *test_file); diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp index 46d5118ef51..8eea87af239 100644 --- a/lldb/source/API/SBDebugger.cpp +++ b/lldb/source/API/SBDebugger.cpp @@ -435,7 +435,7 @@ SBDebugger::SetDefaultArchitecture (const char *arch_name) { if (arch_name) { - ArchSpec arch (arch_name, NULL); + ArchSpec arch (arch_name); if (arch.IsValid()) { Target::SetDefaultArchitecture (arch); diff --git a/lldb/source/Commands/CommandObjectDisassemble.cpp b/lldb/source/Commands/CommandObjectDisassemble.cpp index 357ff956a58..6a29be2bb07 100644 --- a/lldb/source/Commands/CommandObjectDisassemble.cpp +++ b/lldb/source/Commands/CommandObjectDisassemble.cpp @@ -134,7 +134,8 @@ CommandObjectDisassemble::CommandOptions::SetOptionValue (uint32_t option_idx, c break; case 'a': - arch.SetTriple (option_arg, m_interpreter.GetPlatform (true).get()); + if (!arch.SetTriple (option_arg, m_interpreter.GetPlatform (true).get())) + arch.SetTriple (option_arg); break; default: diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp index e4d02733276..7d99e714546 100644 --- a/lldb/source/Commands/CommandObjectPlatform.cpp +++ b/lldb/source/Commands/CommandObjectPlatform.cpp @@ -63,7 +63,8 @@ public: const bool select = true; m_platform_options.SetPlatformName (platform_name); Error error; - PlatformSP platform_sp (m_platform_options.CreatePlatformWithOptions (m_interpreter, ArchSpec(), select, error)); + ArchSpec platform_arch; + PlatformSP platform_sp (m_platform_options.CreatePlatformWithOptions (m_interpreter, ArchSpec(), select, error, platform_arch)); if (platform_sp) { platform_sp->GetStatus (result.GetOutputStream()); diff --git a/lldb/source/Core/ArchSpec.cpp b/lldb/source/Core/ArchSpec.cpp index 91e5ae8f1a5..1e1497b446c 100644 --- a/lldb/source/Core/ArchSpec.cpp +++ b/lldb/source/Core/ArchSpec.cpp @@ -323,6 +323,16 @@ ArchSpec::ArchSpec (const char *triple_cstr, Platform *platform) : SetTriple(triple_cstr, platform); } + +ArchSpec::ArchSpec (const char *triple_cstr) : + m_triple (), + m_core (kCore_invalid), + m_byte_order (eByteOrderInvalid) +{ + if (triple_cstr) + SetTriple(triple_cstr); +} + ArchSpec::ArchSpec(const llvm::Triple &triple) : m_triple (), m_core (kCore_invalid), @@ -473,6 +483,34 @@ ArchSpec::SetTriple (const llvm::Triple &triple) } bool +ArchSpec::SetTriple (const char *triple_cstr) +{ + if (triple_cstr && triple_cstr[0]) + { + llvm::StringRef triple_stref (triple_cstr); + if (triple_stref.startswith (LLDB_ARCH_DEFAULT)) + { + // Special case for the current host default architectures... + if (triple_stref.equals (LLDB_ARCH_DEFAULT_32BIT)) + *this = Host::GetArchitecture (Host::eSystemDefaultArchitecture32); + else if (triple_stref.equals (LLDB_ARCH_DEFAULT_64BIT)) + *this = Host::GetArchitecture (Host::eSystemDefaultArchitecture64); + else if (triple_stref.equals (LLDB_ARCH_DEFAULT)) + *this = Host::GetArchitecture (Host::eSystemDefaultArchitecture); + } + else + { + std::string normalized_triple_sstr (llvm::Triple::normalize(triple_stref)); + triple_stref = normalized_triple_sstr; + SetTriple (llvm::Triple (triple_stref)); + } + } + else + Clear(); + return IsValid(); +} + +bool ArchSpec::SetTriple (const char *triple_cstr, Platform *platform) { if (triple_cstr && triple_cstr[0]) @@ -490,6 +528,8 @@ ArchSpec::SetTriple (const char *triple_cstr, Platform *platform) } else { + ArchSpec raw_arch (triple_cstr); + std::string normalized_triple_sstr (llvm::Triple::normalize(triple_stref)); triple_stref = normalized_triple_sstr; llvm::Triple normalized_triple (triple_stref); @@ -507,18 +547,24 @@ ArchSpec::SetTriple (const char *triple_cstr, Platform *platform) // If we were given a platform, use the platform's system // architecture. If this is not available (might not be // connected) use the first supported architecture. - ArchSpec platform_arch (platform->GetSystemArchitecture()); - if (!platform_arch.IsValid()) + ArchSpec compatible_arch; + if (platform->IsCompatibleArchitecture (raw_arch, &compatible_arch)) { - if (!platform->GetSupportedArchitectureAtIndex (0, platform_arch)) - platform_arch.Clear(); + if (compatible_arch.IsValid()) + { + const llvm::Triple &compatible_triple = compatible_arch.GetTriple(); + if (!vendor_specified) + normalized_triple.setVendor(compatible_triple.getVendor()); + if (!os_specified) + normalized_triple.setOS(compatible_triple.getOS()); + if (!env_specified && compatible_triple.getEnvironmentName().size()) + normalized_triple.setEnvironment(compatible_triple.getEnvironment()); + } } - - if (platform_arch.IsValid()) + else { - normalized_triple.setVendor(platform_arch.GetTriple().getVendor()); - normalized_triple.setOS(platform_arch.GetTriple().getOS()); - normalized_triple.setEnvironment(platform_arch.GetTriple().getEnvironment()); + *this = raw_arch; + return IsValid(); } } else @@ -526,9 +572,12 @@ ArchSpec::SetTriple (const char *triple_cstr, Platform *platform) // No platform specified, fall back to the host system for // the default vendor, os, and environment. llvm::Triple host_triple(llvm::sys::getDefaultTargetTriple()); - normalized_triple.setVendor(host_triple.getVendor()); - normalized_triple.setOS(host_triple.getOS()); - normalized_triple.setEnvironment(host_triple.getEnvironment()); + if (!vendor_specified) + normalized_triple.setVendor(host_triple.getVendor()); + if (!vendor_specified) + normalized_triple.setOS(host_triple.getOS()); + if (!env_specified && host_triple.getEnvironmentName().size()) + normalized_triple.setEnvironment(host_triple.getEnvironment()); } } SetTriple (normalized_triple); @@ -561,7 +610,20 @@ ArchSpec::SetArchitecture (ArchitectureType arch_type, uint32_t cpu, uint32_t su if (arch_type == eArchTypeMachO) { m_triple.setVendor (llvm::Triple::Apple); - m_triple.setOS (llvm::Triple::Darwin); + + switch (core_def->machine) + { + case llvm::Triple::arm: + case llvm::Triple::thumb: + m_triple.setOS (llvm::Triple::IOS); + break; + + case llvm::Triple::x86: + case llvm::Triple::x86_64: + default: + m_triple.setOS (llvm::Triple::MacOSX); + break; + } } else { @@ -620,6 +682,155 @@ ArchSpec::CoreUpdated (bool update_triple) //===----------------------------------------------------------------------===// // Operators. +static bool +cores_match (const ArchSpec::Core core1, const ArchSpec::Core core2, bool try_inverse) +{ + switch (core1) + { +// case ArchSpec::eCore_arm_armv4: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_thumb) +// return true; +// break; +// +// case ArchSpec::eCore_arm_armv4t: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_thumbv4t) +// return true; +// break; +// +// case ArchSpec::eCore_arm_armv5: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_thumbv5) +// return true; +// break; +// +// case ArchSpec::eCore_arm_armv5t: +// case ArchSpec::eCore_arm_armv5e: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_thumbv5e) +// return true; +// break; +// +// case ArchSpec::eCore_arm_armv6: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_thumbv6) +// return true; +// break; +// +// case ArchSpec::eCore_arm_armv7: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_thumbv7) +// return true; +// break; +// +// case ArchSpec::eCore_arm_armv7f: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_thumbv7f) +// return true; +// break; +// +// case ArchSpec::eCore_arm_armv7k: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_thumbv7k) +// return true; +// break; +// +// case ArchSpec::eCore_arm_armv7s: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_thumbv7s) +// return true; +// break; +// +// case ArchSpec::eCore_thumb: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_arm_armv4) +// return true; +// break; +// +// case ArchSpec::eCore_thumbv4t: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_arm_armv4t) +// return true; +// break; +// +// case ArchSpec::eCore_thumbv5: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_arm_armv5) +// return true; +// break; +// +// case ArchSpec::eCore_thumbv5e: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_arm_armv5t || core2 == ArchSpec::eCore_arm_armv5e) +// return true; +// break; +// +// case ArchSpec::eCore_thumbv6: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_arm_armv6) +// return true; +// break; +// +// case ArchSpec::eCore_thumbv7: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_arm_armv7) +// return true; +// break; +// +// case ArchSpec::eCore_thumbv7f: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_arm_armv7f) +// return true; +// break; +// +// case ArchSpec::eCore_thumbv7k: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_arm_armv7k) +// return true; +// break; +// +// case ArchSpec::eCore_thumbv7s: +// try_inverse = false; +// if (core2 == ArchSpec::eCore_arm_armv7s) +// return true; +// break; + + case ArchSpec::kCore_any: + return true; + + case ArchSpec::kCore_arm_any: + if (core2 >= ArchSpec::kCore_arm_first && core2 <= ArchSpec::kCore_arm_last) + return true; + if (core2 >= ArchSpec::kCore_thumb_first && core2 <= ArchSpec::kCore_thumb_last) + return true; + if (core2 == ArchSpec::kCore_arm_any) + return true; + break; + + case ArchSpec::kCore_x86_32_any: + if ((core2 >= ArchSpec::kCore_x86_32_first && core2 <= ArchSpec::kCore_x86_32_last) || (core2 == ArchSpec::kCore_x86_32_any)) + return true; + break; + + case ArchSpec::kCore_ppc_any: + if ((core2 >= ArchSpec::kCore_ppc_first && core2 <= ArchSpec::kCore_ppc_last) || (core2 == ArchSpec::kCore_ppc_any)) + return true; + break; + + case ArchSpec::kCore_ppc64_any: + if ((core2 >= ArchSpec::kCore_ppc64_first && core2 <= ArchSpec::kCore_ppc64_last) || (core2 == ArchSpec::kCore_ppc64_any)) + return true; + break; + + default: + break; + } + if (try_inverse) + return cores_match (core2, core1, false); + return false; +} + bool lldb_private::operator== (const ArchSpec& lhs, const ArchSpec& rhs) { @@ -629,61 +840,11 @@ lldb_private::operator== (const ArchSpec& lhs, const ArchSpec& rhs) const ArchSpec::Core lhs_core = lhs.GetCore (); const ArchSpec::Core rhs_core = rhs.GetCore (); - bool core_match = false; - if (lhs_core == rhs_core) - core_match = true; - else - { + // Check if the cores match, or check a little closer watching for wildcard + // and equivalent cores + const bool core_match = (lhs_core == rhs_core) || cores_match (lhs_core, rhs_core, true); - if (lhs_core == ArchSpec::kCore_any || rhs_core == ArchSpec::kCore_any) - core_match = true; - else - { - if (lhs_core == ArchSpec::kCore_arm_any) - { - if ((rhs_core >= ArchSpec::kCore_arm_first && rhs_core <= ArchSpec::kCore_arm_last) || (rhs_core == ArchSpec::kCore_arm_any)) - core_match = true; - } - else if (rhs_core == ArchSpec::kCore_arm_any) - { - if ((lhs_core >= ArchSpec::kCore_arm_first && lhs_core <= ArchSpec::kCore_arm_last) || (lhs_core == ArchSpec::kCore_arm_any)) - core_match = true; - } - else if (lhs_core == ArchSpec::kCore_x86_32_any) - { - if ((rhs_core >= ArchSpec::kCore_x86_32_first && rhs_core <= ArchSpec::kCore_x86_32_last) || (rhs_core == ArchSpec::kCore_x86_32_any)) - core_match = true; - } - else if (rhs_core == ArchSpec::kCore_x86_32_any) - { - if ((lhs_core >= ArchSpec::kCore_x86_32_first && lhs_core <= ArchSpec::kCore_x86_32_last) || (lhs_core == ArchSpec::kCore_x86_32_any)) - core_match = true; - } - else if (lhs_core == ArchSpec::kCore_ppc_any) - { - if ((rhs_core >= ArchSpec::kCore_ppc_first && rhs_core <= ArchSpec::kCore_ppc_last) || (rhs_core == ArchSpec::kCore_ppc_any)) - core_match = true; - } - else if (rhs_core == ArchSpec::kCore_ppc_any) - { - if ((lhs_core >= ArchSpec::kCore_ppc_first && lhs_core <= ArchSpec::kCore_ppc_last) || (lhs_core == ArchSpec::kCore_ppc_any)) - core_match = true; - } - else if (lhs_core == ArchSpec::kCore_ppc64_any) - { - if ((rhs_core >= ArchSpec::kCore_ppc64_first && rhs_core <= ArchSpec::kCore_ppc64_last) || (rhs_core == ArchSpec::kCore_ppc64_any)) - core_match = true; - } - else if (rhs_core == ArchSpec::kCore_ppc64_any) - { - if ((lhs_core >= ArchSpec::kCore_ppc64_first && lhs_core <= ArchSpec::kCore_ppc64_last) || (lhs_core == ArchSpec::kCore_ppc64_any)) - core_match = true; - } - } - } - if (!core_match) - return false; - else + if (core_match) { const llvm::Triple &lhs_triple = lhs.GetTriple(); const llvm::Triple &rhs_triple = rhs.GetTriple(); @@ -692,6 +853,13 @@ lldb_private::operator== (const ArchSpec& lhs, const ArchSpec& rhs) const llvm::Triple::VendorType rhs_triple_vendor = rhs_triple.getVendor(); if (lhs_triple_vendor != rhs_triple_vendor) { + const bool rhs_vendor_specified = rhs.TripleVendorWasSpecified(); + const bool lhs_vendor_specified = lhs.TripleVendorWasSpecified(); + // Both architectures had the vendor specified, so if they aren't + // equal then we return false + if (rhs_vendor_specified && lhs_vendor_specified) + return false; + // Only fail if both vendor types are not unknown if (lhs_triple_vendor != llvm::Triple::UnknownVendor && rhs_triple_vendor != llvm::Triple::UnknownVendor) @@ -702,6 +870,12 @@ lldb_private::operator== (const ArchSpec& lhs, const ArchSpec& rhs) const llvm::Triple::OSType rhs_triple_os = rhs_triple.getOS(); if (lhs_triple_os != rhs_triple_os) { + const bool rhs_os_specified = rhs.TripleOSWasSpecified(); + const bool lhs_os_specified = lhs.TripleOSWasSpecified(); + // Both architectures had the OS specified, so if they aren't + // equal then we return false + if (rhs_os_specified && lhs_os_specified) + return false; // Only fail if both os types are not unknown if (lhs_triple_os != llvm::Triple::UnknownOS && rhs_triple_os != llvm::Triple::UnknownOS) @@ -720,6 +894,7 @@ lldb_private::operator== (const ArchSpec& lhs, const ArchSpec& rhs) } return true; } + return false; } bool diff --git a/lldb/source/Interpreter/OptionGroupPlatform.cpp b/lldb/source/Interpreter/OptionGroupPlatform.cpp index ca2f3ffc937..8602ca87b1f 100644 --- a/lldb/source/Interpreter/OptionGroupPlatform.cpp +++ b/lldb/source/Interpreter/OptionGroupPlatform.cpp @@ -21,17 +21,30 @@ using namespace lldb; using namespace lldb_private; PlatformSP -OptionGroupPlatform::CreatePlatformWithOptions (CommandInterpreter &interpreter, const ArchSpec &arch, bool make_selected, Error& error) const +OptionGroupPlatform::CreatePlatformWithOptions (CommandInterpreter &interpreter, + const ArchSpec &arch, + bool make_selected, + Error& error, + ArchSpec &platform_arch) const { PlatformSP platform_sp; if (!m_platform_name.empty()) { platform_sp = Platform::Create (m_platform_name.c_str(), error); + if (platform_sp) + { + if (!platform_sp->IsCompatibleArchitecture(arch, &platform_arch)) + { + error.SetErrorStringWithFormat("platform '%s' doesn't support '%s'", platform_sp->GetName(), arch.GetTriple().getTriple().c_str()); + platform_sp.reset(); + return platform_sp; + } + } } else if (arch.IsValid()) { - platform_sp = Platform::Create (arch, error); + platform_sp = Platform::Create (arch, &platform_arch, error); } if (platform_sp) diff --git a/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp b/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp index d629aea88ed..9ec2e64e0e8 100644 --- a/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp +++ b/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp @@ -592,7 +592,7 @@ ABIMacOSX_arm::CreateDefaultUnwindPlan (UnwindPlan &unwind_plan) row.SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true); unwind_plan.AppendRow (row); - unwind_plan.SetSourceName ("arm-apple-darwin default unwind plan"); + unwind_plan.SetSourceName ("arm-apple-ios default unwind plan"); return true; } @@ -623,7 +623,7 @@ ABIMacOSX_arm::RegisterIsVolatile (const RegisterInfo *reg_info) case '2': return name[2] == '\0'; // r2 case '3': return name[2] == '\0'; // r3 - case '9': return name[2] == '\0'; // r9 (apple-darwin only...) + case '9': return name[2] == '\0'; // r9 (apple-ios only...) break; } diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp index 47e6ddb208c..dd77e3061d4 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp @@ -684,7 +684,10 @@ DisassemblerLLVM::DisassemblerLLVM(const ArchSpec &arch) : // addresses. if (llvm_arch == llvm::Triple::arm) { - if (EDGetDisassembler(&m_disassembler_thumb, "thumbv7-apple-darwin", kEDAssemblySyntaxARMUAL)) + ArchSpec thumb_arch(arch); + thumb_arch.GetTriple().setArchName(llvm::StringRef("thumbv7")); + std::string thumb_triple(thumb_arch.GetTriple().getTriple()); + if (EDGetDisassembler(&m_disassembler_thumb, thumb_triple.c_str(), kEDAssemblySyntaxARMUAL)) m_disassembler_thumb = NULL; } } diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index 93b8b949779..b2df3105453 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -65,7 +65,17 @@ DynamicLoaderDarwinKernel::CreateInstance (Process* process, bool force) if (create) { const llvm::Triple &triple_ref = process->GetTarget().GetArchitecture().GetTriple(); - create = triple_ref.getOS() == llvm::Triple::Darwin && triple_ref.getVendor() == llvm::Triple::Apple; + switch (triple_ref.getOS()) + { + case llvm::Triple::Darwin: + case llvm::Triple::MacOSX: + case llvm::Triple::IOS: + create = triple_ref.getVendor() == llvm::Triple::Apple; + break; + default: + create = false; + break; + } } } diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index 2ea134c42d7..6219fef98b2 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -105,7 +105,17 @@ DynamicLoaderMacOSXDYLD::CreateInstance (Process* process, bool force) if (create) { const llvm::Triple &triple_ref = process->GetTarget().GetArchitecture().GetTriple(); - create = triple_ref.getOS() == llvm::Triple::Darwin && triple_ref.getVendor() == llvm::Triple::Apple; + switch (triple_ref.getOS()) + { + case llvm::Triple::Darwin: + case llvm::Triple::MacOSX: + case llvm::Triple::IOS: + create = triple_ref.getVendor() == llvm::Triple::Apple; + break; + default: + create = false; + break; + } } } diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp index 4f09f00ae9d..b443bf349e3 100644 --- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp +++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp @@ -280,19 +280,37 @@ EmulateInstructionARM::GetRegisterInfo (uint32_t reg_kind, uint32_t reg_num, Reg uint32_t EmulateInstructionARM::GetFramePointerRegisterNumber () const { - if (m_opcode_mode == eModeThumb || m_arch.GetTriple().getOS() == llvm::Triple::Darwin) - return 7; - else - return 11; + if (m_opcode_mode == eModeThumb) + { + switch (m_arch.GetTriple().getOS()) + { + case llvm::Triple::Darwin: + case llvm::Triple::MacOSX: + case llvm::Triple::IOS: + return 7; + default: + break; + } + } + return 11; } uint32_t EmulateInstructionARM::GetFramePointerDWARFRegisterNumber () const { - if (m_opcode_mode == eModeThumb || m_arch.GetTriple().getOS() == llvm::Triple::Darwin) - return dwarf_r7; - else - return dwarf_r11; + if (m_opcode_mode == eModeThumb) + { + switch (m_arch.GetTriple().getOS()) + { + case llvm::Triple::Darwin: + case llvm::Triple::MacOSX: + case llvm::Triple::IOS: + return dwarf_r7; + default: + break; + } + } + return dwarf_r11; } // Push Multiple Registers stores multiple registers to the stack, storing to diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp index 1abb0293e61..c2d97bc2cc9 100644 --- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp +++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp @@ -197,7 +197,7 @@ ObjectContainerUniversalMachO::GetObjectFile (const FileSpec *file) { arch = Target::GetDefaultArchitecture (); if (!arch.IsValid()) - arch.SetTriple (LLDB_ARCH_DEFAULT, NULL); + arch.SetTriple (LLDB_ARCH_DEFAULT); } else arch = module_sp->GetArchitecture(); diff --git a/lldb/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.cpp b/lldb/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.cpp index 4598f64ebbc..1243e8133d8 100644 --- a/lldb/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.cpp +++ b/lldb/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.cpp @@ -75,7 +75,7 @@ OperatingSystemDarwinKernel::CreateInstance (Process *process, bool force) } } - // We can limit the creation of this plug-in to "*-apple-darwin" triples + // We can limit the creation of this plug-in to "*-apple-macosx" or "*-apple-ios" triples // if we command out the lines below... // if (create) // { diff --git a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp index 4a262279ef7..45d3cdc55e0 100644 --- a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp +++ b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp @@ -35,9 +35,37 @@ PlatformFreeBSD::CreateInstance (bool force, const lldb_private::ArchSpec *arch) if (create == false && arch && arch->IsValid()) { const llvm::Triple &triple = arch->GetTriple(); - const llvm::Triple::OSType os = triple.getOS(); - if (os == llvm::Triple::FreeBSD || os == llvm::Triple::KFreeBSD) - create = true; + switch (triple.getVendor()) + { + case llvm::Triple::PC: + create = true; + break; + + case llvm::Triple::UnknownArch: + create = !arch->TripleVendorWasSpecified(); + break; + + default: + break; + } + + if (create) + { + switch (triple.getOS()) + { + case llvm::Triple::FreeBSD: + case llvm::Triple::KFreeBSD: + break; + + case llvm::Triple::UnknownOS: + create = arch->TripleOSWasSpecified(); + break; + + default: + create = false; + break; + } + } } if (create) return new PlatformFreeBSD (is_host); diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp index c1dc25de277..c4dd4a8044f 100644 --- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp +++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp @@ -39,9 +39,36 @@ PlatformLinux::CreateInstance (bool force, const ArchSpec *arch) if (create == false && arch && arch->IsValid()) { const llvm::Triple &triple = arch->GetTriple(); - const llvm::Triple::OSType os = triple.getOS(); - if (os == llvm::Triple::Linux) - create = true; + switch (triple.getVendor()) + { + case llvm::Triple::PC: + create = true; + break; + + case llvm::Triple::UnknownArch: + create = !arch->TripleVendorWasSpecified(); + break; + + default: + break; + } + + if (create) + { + switch (triple.getOS()) + { + case llvm::Triple::Linux: + break; + + case llvm::Triple::UnknownOS: + create = !arch->TripleOSWasSpecified(); + break; + + default: + create = false; + break; + } + } } if (create) return new PlatformLinux(true); diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp index eea30625be0..fc6180e13b2 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp @@ -612,14 +612,22 @@ PlatformDarwin::ARMGetSupportedArchitectureAtIndex (uint32_t idx, ArchSpec &arch default: switch (idx) { - case 0: arch.SetTriple ("armv7-apple-darwin", NULL); return true; - case 1: arch.SetTriple ("armv7f-apple-darwin", NULL); return true; - case 2: arch.SetTriple ("armv7k-apple-darwin", NULL); return true; - case 3: arch.SetTriple ("armv7s-apple-darwin", NULL); return true; - case 4: arch.SetTriple ("armv6-apple-darwin", NULL); return true; - case 5: arch.SetTriple ("armv5-apple-darwin", NULL); return true; - case 6: arch.SetTriple ("armv4-apple-darwin", NULL); return true; - case 7: arch.SetTriple ("arm-apple-darwin", NULL); return true; + case 0: arch.SetTriple ("armv7-apple-ios"); return true; + case 1: arch.SetTriple ("armv7f-apple-ios"); return true; + case 2: arch.SetTriple ("armv7k-apple-ios"); return true; + case 3: arch.SetTriple ("armv7s-apple-ios"); return true; + case 4: arch.SetTriple ("armv6-apple-ios"); return true; + case 5: arch.SetTriple ("armv5-apple-ios"); return true; + case 6: arch.SetTriple ("armv4-apple-ios"); return true; + case 7: arch.SetTriple ("arm-apple-ios"); return true; + case 8: arch.SetTriple ("thumbv7-apple-ios"); return true; + case 9: arch.SetTriple ("thumbv7f-apple-ios"); return true; + case 10: arch.SetTriple ("thumbv7k-apple-ios"); return true; + case 11: arch.SetTriple ("thumbv7s-apple-ios"); return true; + case 12: arch.SetTriple ("thumbv6-apple-ios"); return true; + case 13: arch.SetTriple ("thumbv5-apple-ios"); return true; + case 14: arch.SetTriple ("thumbv4t-apple-ios"); return true; + case 15: arch.SetTriple ("thumb-apple-ios"); return true; default: break; } break; @@ -627,81 +635,113 @@ PlatformDarwin::ARMGetSupportedArchitectureAtIndex (uint32_t idx, ArchSpec &arch case ArchSpec::eCore_arm_armv7f: switch (idx) { - case 0: arch.SetTriple ("armv7f-apple-darwin", NULL); return true; - case 1: arch.SetTriple ("armv7-apple-darwin", NULL); return true; - case 2: arch.SetTriple ("armv6-apple-darwin", NULL); return true; - case 3: arch.SetTriple ("armv5-apple-darwin", NULL); return true; - case 4: arch.SetTriple ("armv4-apple-darwin", NULL); return true; - case 5: arch.SetTriple ("arm-apple-darwin", NULL); return true; - default: break; + case 0: arch.SetTriple ("armv7f-apple-ios"); return true; + case 1: arch.SetTriple ("armv7-apple-ios"); return true; + case 2: arch.SetTriple ("armv6-apple-ios"); return true; + case 3: arch.SetTriple ("armv5-apple-ios"); return true; + case 4: arch.SetTriple ("armv4-apple-ios"); return true; + case 5: arch.SetTriple ("arm-apple-ios"); return true; + case 6: arch.SetTriple ("thumbv7f-apple-ios"); return true; + case 7: arch.SetTriple ("thumbv7-apple-ios"); return true; + case 8: arch.SetTriple ("thumbv6-apple-ios"); return true; + case 9: arch.SetTriple ("thumbv5-apple-ios"); return true; + case 10: arch.SetTriple ("thumbv4t-apple-ios"); return true; + case 11: arch.SetTriple ("thumb-apple-ios"); return true; + default: break; } break; case ArchSpec::eCore_arm_armv7k: switch (idx) { - case 0: arch.SetTriple ("armv7k-apple-darwin", NULL); return true; - case 1: arch.SetTriple ("armv7-apple-darwin", NULL); return true; - case 2: arch.SetTriple ("armv6-apple-darwin", NULL); return true; - case 3: arch.SetTriple ("armv5-apple-darwin", NULL); return true; - case 4: arch.SetTriple ("armv4-apple-darwin", NULL); return true; - case 5: arch.SetTriple ("arm-apple-darwin", NULL); return true; - default: break; + case 0: arch.SetTriple ("armv7k-apple-ios"); return true; + case 1: arch.SetTriple ("armv7-apple-ios"); return true; + case 2: arch.SetTriple ("armv6-apple-ios"); return true; + case 3: arch.SetTriple ("armv5-apple-ios"); return true; + case 4: arch.SetTriple ("armv4-apple-ios"); return true; + case 5: arch.SetTriple ("arm-apple-ios"); return true; + case 6: arch.SetTriple ("thumbv7k-apple-ios"); return true; + case 7: arch.SetTriple ("thumbv7-apple-ios"); return true; + case 8: arch.SetTriple ("thumbv6-apple-ios"); return true; + case 9: arch.SetTriple ("thumbv5-apple-ios"); return true; + case 10: arch.SetTriple ("thumbv4t-apple-ios"); return true; + case 11: arch.SetTriple ("thumb-apple-ios"); return true; + default: break; } break; case ArchSpec::eCore_arm_armv7s: switch (idx) { - case 0: arch.SetTriple ("armv7s-apple-darwin", NULL); return true; - case 1: arch.SetTriple ("armv7-apple-darwin", NULL); return true; - case 2: arch.SetTriple ("armv6-apple-darwin", NULL); return true; - case 3: arch.SetTriple ("armv5-apple-darwin", NULL); return true; - case 4: arch.SetTriple ("armv4-apple-darwin", NULL); return true; - case 5: arch.SetTriple ("arm-apple-darwin", NULL); return true; - default: break; + case 0: arch.SetTriple ("armv7s-apple-ios"); return true; + case 1: arch.SetTriple ("armv7-apple-ios"); return true; + case 2: arch.SetTriple ("armv6-apple-ios"); return true; + case 3: arch.SetTriple ("armv5-apple-ios"); return true; + case 4: arch.SetTriple ("armv4-apple-ios"); return true; + case 5: arch.SetTriple ("arm-apple-ios"); return true; + case 6: arch.SetTriple ("thumbv7s-apple-ios"); return true; + case 7: arch.SetTriple ("thumbv7-apple-ios"); return true; + case 8: arch.SetTriple ("thumbv6-apple-ios"); return true; + case 9: arch.SetTriple ("thumbv5-apple-ios"); return true; + case 10: arch.SetTriple ("thumbv4t-apple-ios"); return true; + case 11: arch.SetTriple ("thumb-apple-ios"); return true; + default: break; } break; case ArchSpec::eCore_arm_armv7: switch (idx) { - case 0: arch.SetTriple ("armv7-apple-darwin", NULL); return true; - case 1: arch.SetTriple ("armv6-apple-darwin", NULL); return true; - case 2: arch.SetTriple ("armv5-apple-darwin", NULL); return true; - case 3: arch.SetTriple ("armv4-apple-darwin", NULL); return true; - case 4: arch.SetTriple ("arm-apple-darwin", NULL); return true; - default: break; + case 0: arch.SetTriple ("armv7-apple-ios"); return true; + case 1: arch.SetTriple ("armv6-apple-ios"); return true; + case 2: arch.SetTriple ("armv5-apple-ios"); return true; + case 3: arch.SetTriple ("armv4-apple-ios"); return true; + case 4: arch.SetTriple ("arm-apple-ios"); return true; + case 5: arch.SetTriple ("thumbv7-apple-ios"); return true; + case 6: arch.SetTriple ("thumbv6-apple-ios"); return true; + case 7: arch.SetTriple ("thumbv5-apple-ios"); return true; + case 8: arch.SetTriple ("thumbv4t-apple-ios"); return true; + case 9: arch.SetTriple ("thumb-apple-ios"); return true; + default: break; } break; case ArchSpec::eCore_arm_armv6: switch (idx) { - case 0: arch.SetTriple ("armv6-apple-darwin", NULL); return true; - case 1: arch.SetTriple ("armv5-apple-darwin", NULL); return true; - case 2: arch.SetTriple ("armv4-apple-darwin", NULL); return true; - case 3: arch.SetTriple ("arm-apple-darwin", NULL); return true; - default: break; + case 0: arch.SetTriple ("armv6-apple-ios"); return true; + case 1: arch.SetTriple ("armv5-apple-ios"); return true; + case 2: arch.SetTriple ("armv4-apple-ios"); return true; + case 3: arch.SetTriple ("arm-apple-ios"); return true; + case 4: arch.SetTriple ("thumbv6-apple-ios"); return true; + case 5: arch.SetTriple ("thumbv5-apple-ios"); return true; + case 6: arch.SetTriple ("thumbv4t-apple-ios"); return true; + case 7: arch.SetTriple ("thumb-apple-ios"); return true; + default: break; } break; case ArchSpec::eCore_arm_armv5: switch (idx) { - case 0: arch.SetTriple ("armv5-apple-darwin", NULL); return true; - case 1: arch.SetTriple ("armv4-apple-darwin", NULL); return true; - case 2: arch.SetTriple ("arm-apple-darwin", NULL); return true; - default: break; + case 0: arch.SetTriple ("armv5-apple-ios"); return true; + case 1: arch.SetTriple ("armv4-apple-ios"); return true; + case 2: arch.SetTriple ("arm-apple-ios"); return true; + case 3: arch.SetTriple ("thumbv5-apple-ios"); return true; + case 4: arch.SetTriple ("thumbv4t-apple-ios"); return true; + case 5: arch.SetTriple ("thumb-apple-ios"); return true; + default: break; } break; case ArchSpec::eCore_arm_armv4: switch (idx) { - case 0: arch.SetTriple ("armv4-apple-darwin", NULL); return true; - case 1: arch.SetTriple ("arm-apple-darwin", NULL); return true; - default: break; + case 0: arch.SetTriple ("armv4-apple-ios"); return true; + case 1: arch.SetTriple ("arm-apple-ios"); return true; + case 2: arch.SetTriple ("thumbv4t-apple-ios"); return true; + case 3: arch.SetTriple ("thumb-apple-ios"); return true; + default: break; } break; } diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp index f7c2374da2c..613a08b8135 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp @@ -71,10 +71,37 @@ PlatformMacOSX::CreateInstance (bool force, const ArchSpec *arch) if (create == false && arch && arch->IsValid()) { const llvm::Triple &triple = arch->GetTriple(); - const llvm::Triple::OSType os = triple.getOS(); - const llvm::Triple::VendorType vendor = triple.getVendor(); - if (os == llvm::Triple::Darwin && vendor == llvm::Triple::Apple) - create = true; + switch (triple.getVendor()) + { + case llvm::Triple::Apple: + create = true; + break; + + case llvm::Triple::UnknownArch: + create = !arch->TripleVendorWasSpecified(); + break; + + default: + break; + } + + if (create) + { + switch (triple.getOS()) + { + case llvm::Triple::Darwin: // Deprecated, but still support Darwin for historical reasons + case llvm::Triple::MacOSX: + break; + + case llvm::Triple::UnknownOS: + create = !arch->TripleOSWasSpecified(); + break; + + default: + create = false; + break; + } + } } if (create) return new PlatformMacOSX (is_host); diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp index a1fcaf2b953..e4699d61bb8 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp @@ -94,10 +94,37 @@ PlatformRemoteiOS::CreateInstance (bool force, const ArchSpec *arch) case llvm::Triple::thumb: { const llvm::Triple &triple = arch->GetTriple(); - const llvm::Triple::OSType os = triple.getOS(); - const llvm::Triple::VendorType vendor = triple.getVendor(); - if (os == llvm::Triple::Darwin && vendor == llvm::Triple::Apple) - create = true; + llvm::Triple::VendorType vendor = triple.getVendor(); + switch (vendor) + { + case llvm::Triple::Apple: + create = true; + + case llvm::Triple::UnknownArch: + create = !arch->TripleVendorWasSpecified(); + break; + + default: + break; + } + + if (create) + { + switch (triple.getOS()) + { + case llvm::Triple::Darwin: // Deprecated, but still support Darwin for historical reasons + case llvm::Triple::IOS: // This is the right triple value for iOS debugging + break; + + case llvm::Triple::UnknownOS: + create = !arch->TripleOSWasSpecified(); + break; + + default: + create = false; + break; + } + } } break; default: diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp index 7a8884eba0a..5dfa11bffc1 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp @@ -71,10 +71,38 @@ PlatformiOSSimulator::CreateInstance (bool force, const ArchSpec *arch) case llvm::Triple::x86: { const llvm::Triple &triple = arch->GetTriple(); - const llvm::Triple::OSType os = triple.getOS(); - const llvm::Triple::VendorType vendor = triple.getVendor(); - if (os == llvm::Triple::Darwin && vendor == llvm::Triple::Apple) - create = true; + switch (triple.getVendor()) + { + case llvm::Triple::Apple: + create = true; + break; + + case llvm::Triple::UnknownArch: + create = !arch->TripleVendorWasSpecified(); + break; + + default: + break; + } + + if (create) + { + switch (triple.getOS()) + { + case llvm::Triple::Darwin: // Deprecated, but still support Darwin for historical reasons + case llvm::Triple::MacOSX: + case llvm::Triple::IOS: // IOS is not used for simulator triples, but accept it just in case + break; + + case llvm::Triple::UnknownOS: + create = !arch->TripleOSWasSpecified(); + break; + + default: + create = false; + break; + } + } } break; default: diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp index 4d9cd96def4..a596618ab51 100644 --- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp +++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp @@ -58,9 +58,17 @@ PlatformRemoteGDBServer::Terminate () Platform* PlatformRemoteGDBServer::CreateInstance (bool force, const lldb_private::ArchSpec *arch) { - return new PlatformRemoteGDBServer (); + bool create = force; + if (!create) + { + create = !arch->TripleVendorWasSpecified() && !arch->TripleOSWasSpecified(); + } + if (create) + return new PlatformRemoteGDBServer (); + return NULL; } + const char * PlatformRemoteGDBServer::GetShortPluginNameStatic() { diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp index 45ed9b5f854..3c08a147246 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -71,13 +71,22 @@ ProcessKDP::CanDebug(Target &target, bool plugin_specified_by_name) if (exe_module) { const llvm::Triple &triple_ref = target.GetArchitecture().GetTriple(); - if (triple_ref.getOS() == llvm::Triple::Darwin && - triple_ref.getVendor() == llvm::Triple::Apple) + switch (triple_ref.getOS()) { - ObjectFile *exe_objfile = exe_module->GetObjectFile(); - if (exe_objfile->GetType() == ObjectFile::eTypeExecutable && - exe_objfile->GetStrata() == ObjectFile::eStrataKernel) - return true; + case llvm::Triple::Darwin: // Should use "macosx" for desktop and "ios" for iOS, but accept darwin just in case + case llvm::Triple::MacOSX: // For desktop targets + case llvm::Triple::IOS: // For arm targets + if (triple_ref.getVendor() == llvm::Triple::Apple) + { + ObjectFile *exe_objfile = exe_module->GetObjectFile(); + if (exe_objfile->GetType() == ObjectFile::eTypeExecutable && + exe_objfile->GetStrata() == ObjectFile::eStrataKernel) + return true; + } + break; + + default: + break; } } return false; diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index 7ed0f5f2c7b..6774b5f807d 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -1020,6 +1020,20 @@ GDBRemoteCommunicationClient::GetHostInfo (bool force) { assert (byte_order == m_host_arch.GetByteOrder()); } + + if (!os_name.empty() && vendor_name.compare("apple") == 0 && os_name.find("darwin") == 0) + { + switch (m_host_arch.GetMachine()) + { + case llvm::Triple::arm: + case llvm::Triple::thumb: + os_name = "ios"; + break; + default: + os_name = "macosx"; + break; + } + } if (!vendor_name.empty()) m_host_arch.GetTriple().setVendorName (llvm::StringRef (vendor_name)); if (!os_name.empty()) @@ -1031,17 +1045,35 @@ GDBRemoteCommunicationClient::GetHostInfo (bool force) { std::string triple; triple += arch_name; - triple += '-'; - if (vendor_name.empty()) - triple += "unknown"; - else - triple += vendor_name; - triple += '-'; - if (os_name.empty()) - triple += "unknown"; - else - triple += os_name; - m_host_arch.SetTriple (triple.c_str(), NULL); + if (!vendor_name.empty() || !os_name.empty()) + { + triple += '-'; + if (vendor_name.empty()) + triple += "unknown"; + else + triple += vendor_name; + triple += '-'; + if (os_name.empty()) + triple += "unknown"; + else + triple += os_name; + } + m_host_arch.SetTriple (triple.c_str()); + + llvm::Triple &host_triple = m_host_arch.GetTriple(); + if (host_triple.getVendor() == llvm::Triple::Apple && host_triple.getOS() == llvm::Triple::Darwin) + { + switch (m_host_arch.GetMachine()) + { + case llvm::Triple::arm: + case llvm::Triple::thumb: + host_triple.setOS(llvm::Triple::IOS); + break; + default: + host_triple.setOS(llvm::Triple::MacOSX); + break; + } + } if (pointer_byte_size) { assert (pointer_byte_size == m_host_arch.GetAddressByteSize()); @@ -1055,7 +1087,7 @@ GDBRemoteCommunicationClient::GetHostInfo (bool force) } else { - m_host_arch.SetTriple (triple.c_str(), NULL); + m_host_arch.SetTriple (triple.c_str()); if (pointer_byte_size) { assert (pointer_byte_size == m_host_arch.GetAddressByteSize()); @@ -1402,7 +1434,7 @@ GDBRemoteCommunicationClient::DecodeProcessInfoResponse (StringExtractorGDBRemot extractor.GetStringRef().swap(value); extractor.SetFilePos(0); extractor.GetHexByteString (value); - process_info.GetArchitecture ().SetTriple (value.c_str(), NULL); + process_info.GetArchitecture ().SetTriple (value.c_str()); } else if (name.compare("name") == 0) { diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 5b59289bb9a..0cad8366c66 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -383,15 +383,16 @@ ProcessGDBRemote::BuildDynamicRegisterInfo (bool force) // We didn't get anything. See if we are debugging ARM and fill with // a hard coded register set until we can get an updated debugserver // down on the devices. - - if (!GetTarget().GetArchitecture().IsValid() - && m_gdb_comm.GetHostArchitecture().IsValid() - && m_gdb_comm.GetHostArchitecture().GetMachine() == llvm::Triple::arm - && m_gdb_comm.GetHostArchitecture().GetTriple().getVendor() == llvm::Triple::Apple) + const ArchSpec &target_arch = GetTarget().GetArchitecture(); + const ArchSpec &remote_arch = m_gdb_comm.GetHostArchitecture(); + if (!target_arch.IsValid()) { - m_register_info.HardcodeARMRegisters(); + if (remote_arch.IsValid() + && remote_arch.GetMachine() == llvm::Triple::arm + && remote_arch.GetTriple().getVendor() == llvm::Triple::Apple) + m_register_info.HardcodeARMRegisters(); } - else if (GetTarget().GetArchitecture().GetMachine() == llvm::Triple::arm) + else if (target_arch.GetMachine() == llvm::Triple::arm) { m_register_info.HardcodeARMRegisters(); } diff --git a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp index abff31688d0..e9fe81e8b53 100644 --- a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp +++ b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp @@ -81,8 +81,7 @@ ProcessMachCore::CanDebug(Target &target, bool plugin_specified_by_name) if (m_core_module_sp) { const llvm::Triple &triple_ref = m_core_module_sp->GetArchitecture().GetTriple(); - if (triple_ref.getOS() == llvm::Triple::Darwin && - triple_ref.getVendor() == llvm::Triple::Apple) + if (triple_ref.getVendor() == llvm::Triple::Apple) { ObjectFile *core_objfile = m_core_module_sp->GetObjectFile(); if (core_objfile && core_objfile->GetType() == ObjectFile::eTypeCoreFile) diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index 1d7063b4ebb..2ab9d762d26 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -622,7 +622,7 @@ ClangASTContext::getTargetOptions() TargetInfo * ClangASTContext::getTargetInfo() { - // target_triple should be something like "x86_64-apple-darwin10" + // target_triple should be something like "x86_64-apple-macosx" if (m_target_info_ap.get() == NULL && !m_target_triple.empty()) m_target_info_ap.reset (TargetInfo::CreateTargetInfo(*getDiagnosticsEngine(), *getTargetOptions())); return m_target_info_ap.get(); diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp index 03b9d91aed3..af4b7a83af5 100644 --- a/lldb/source/Target/Platform.cpp +++ b/lldb/source/Target/Platform.cpp @@ -130,22 +130,26 @@ Platform::Create (const char *platform_name, Error &error) PlatformSP -Platform::Create (const ArchSpec &arch, Error &error) +Platform::Create (const ArchSpec &arch, ArchSpec *platform_arch_ptr, Error &error) { lldb::PlatformSP platform_sp; if (arch.IsValid()) { + uint32_t idx; PlatformCreateInstance create_callback; - for (uint32_t idx = 0; (create_callback = PluginManager::GetPlatformCreateCallbackAtIndex (idx)); ++idx) + for (idx = 0; (create_callback = PluginManager::GetPlatformCreateCallbackAtIndex (idx)); ++idx) { if (create_callback) platform_sp.reset(create_callback(false, &arch)); - if (platform_sp && platform_sp->IsCompatibleWithArchitecture(arch)) - break; + if (platform_sp && platform_sp->IsCompatibleArchitecture(arch, platform_arch_ptr)) + return platform_sp; } } else error.SetErrorString ("invalid platform name"); + if (platform_arch_ptr) + platform_arch_ptr->Clear(); + platform_sp.reset(); return platform_sp; } @@ -632,12 +636,12 @@ Platform::DebugProcess (ProcessLaunchInfo &launch_info, lldb::PlatformSP -Platform::GetPlatformForArchitecture (const ArchSpec &arch) +Platform::GetPlatformForArchitecture (const ArchSpec &arch, ArchSpec *platform_arch_ptr) { lldb::PlatformSP platform_sp; Error error; if (arch.IsValid()) - platform_sp = Platform::Create (arch, error); + platform_sp = Platform::Create (arch, platform_arch_ptr, error); return platform_sp; } @@ -647,18 +651,24 @@ Platform::GetPlatformForArchitecture (const ArchSpec &arch) /// architecture and the target triple contained within. //------------------------------------------------------------------ bool -Platform::IsCompatibleWithArchitecture (const ArchSpec &arch) +Platform::IsCompatibleArchitecture (const ArchSpec &arch, ArchSpec *compatible_arch_ptr) { // If the architecture is invalid, we must answer true... - if (!arch.IsValid()) - return true; - - ArchSpec platform_arch; - for (uint32_t arch_idx=0; GetSupportedArchitectureAtIndex (arch_idx, platform_arch); ++arch_idx) + if (arch.IsValid()) { - if (arch == platform_arch) - return true; + ArchSpec platform_arch; + for (uint32_t arch_idx=0; GetSupportedArchitectureAtIndex (arch_idx, platform_arch); ++arch_idx) + { + if (arch == platform_arch) + { + if (compatible_arch_ptr) + *compatible_arch_ptr = platform_arch; + return true; + } + } } + if (compatible_arch_ptr) + compatible_arch_ptr->Clear(); return false; } diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index deb657c2664..79efa38d93d 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -592,8 +592,8 @@ ProcessLaunchCommandOptions::SetOptionValue (uint32_t option_idx, const char *op break; case 'a': - launch_info.GetArchitecture().SetTriple (option_arg, - m_interpreter.GetPlatform(true).get()); + if (!launch_info.GetArchitecture().SetTriple (option_arg, m_interpreter.GetPlatform(true).get())) + launch_info.GetArchitecture().SetTriple (option_arg); break; case 'A': @@ -2741,23 +2741,25 @@ Process::CompleteAttach () assert (platform_sp.get()); if (platform_sp) { - const ArchSpec &target_arch = m_target.GetArchitecture(); - if (target_arch.IsValid() && !platform_sp->IsCompatibleWithArchitecture (target_arch)) - { - platform_sp = platform_sp->GetPlatformForArchitecture (target_arch); - if (platform_sp) - { - m_target.SetPlatform (platform_sp); - } - } - else - { - ProcessInstanceInfo process_info; - platform_sp->GetProcessInfo (GetID(), process_info); - const ArchSpec &process_arch = process_info.GetArchitecture(); - if (process_arch.IsValid() && m_target.GetArchitecture() != process_arch) - m_target.SetArchitecture (process_arch); - } + const ArchSpec &target_arch = m_target.GetArchitecture(); + if (target_arch.IsValid() && !platform_sp->IsCompatibleArchitecture (target_arch)) + { + ArchSpec platform_arch; + platform_sp = platform_sp->GetPlatformForArchitecture (target_arch, &platform_arch); + if (platform_sp) + { + m_target.SetPlatform (platform_sp); + m_target.SetArchitecture(platform_arch); + } + } + else + { + ProcessInstanceInfo process_info; + platform_sp->GetProcessInfo (GetID(), process_info); + const ArchSpec &process_arch = process_info.GetArchitecture(); + if (process_arch.IsValid() && m_target.GetArchitecture() != process_arch) + m_target.SetArchitecture (process_arch); + } } // We have completed the attach, now it is time to find the dynamic loader diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index 59927fcdf03..18368e6aa42 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -926,15 +926,12 @@ Target::SetExecutableModule (ModuleSP& executable_sp, bool get_dependent_files) bool Target::SetArchitecture (const ArchSpec &arch_spec) { - if (m_arch == arch_spec) + if (m_arch == arch_spec || !m_arch.IsValid()) { - // If we're setting the architecture to our current architecture, we - // don't need to do anything. - return true; - } - else if (!m_arch.IsValid()) - { - // If we haven't got a valid arch spec, then we just need to set it. + // If we haven't got a valid arch spec, or the architectures are + // compatible, so just update the architecture. Architectures can be + // equal, yet the triple OS and vendor might change, so we need to do + // the assignment here just in case. m_arch = arch_spec; return true; } @@ -963,16 +960,9 @@ Target::SetArchitecture (const ArchSpec &arch_spec) SetExecutableModule (executable_sp, true); return true; } - else - { - return false; - } - } - else - { - return false; } } + return false; } void @@ -2254,7 +2244,7 @@ Target::SettingsController::SetGlobalVariable (const ConstString &var_name, { if (var_name == GetSettingNameForDefaultArch()) { - m_default_architecture.SetTriple (value, NULL); + m_default_architecture.SetTriple (value); if (!m_default_architecture.IsValid()) err.SetErrorStringWithFormat ("'%s' is not a valid architecture or triple.", value); } diff --git a/lldb/source/Target/TargetList.cpp b/lldb/source/Target/TargetList.cpp index d9879139dc5..3ec4b08c190 100644 --- a/lldb/source/Target/TargetList.cpp +++ b/lldb/source/Target/TargetList.cpp @@ -68,11 +68,9 @@ TargetList::CreateTarget (Debugger &debugger, // This is purposely left empty unless it is specified by triple_cstr. // If not initialized via triple_cstr, then the currently selected platform // will set the architecture correctly. - ArchSpec arch; - - if (triple_cstr) + const ArchSpec arch(triple_cstr); + if (triple_cstr && triple_cstr[0]) { - arch.SetTriple(triple_cstr, platform_sp.get()); if (!arch.IsValid()) { error.SetErrorStringWithFormat("invalid triple '%s'", triple_cstr); @@ -80,6 +78,7 @@ TargetList::CreateTarget (Debugger &debugger, } } + ArchSpec platform_arch(arch); CommandInterpreter &interpreter = debugger.GetCommandInterpreter(); if (platform_options) { @@ -89,7 +88,8 @@ TargetList::CreateTarget (Debugger &debugger, platform_sp = platform_options->CreatePlatformWithOptions (interpreter, arch, select_platform, - error); + error, + platform_arch); if (!platform_sp) return error; } @@ -101,15 +101,18 @@ TargetList::CreateTarget (Debugger &debugger, // current architecture if we have a valid architecture. platform_sp = debugger.GetPlatformList().GetSelectedPlatform (); - if (arch.IsValid() && !platform_sp->IsCompatibleWithArchitecture(arch)) + if (arch.IsValid() && !platform_sp->IsCompatibleArchitecture(arch, &platform_arch)) { - platform_sp = Platform::GetPlatformForArchitecture(arch); + platform_sp = Platform::GetPlatformForArchitecture(arch, &platform_arch); } } + + if (!platform_arch.IsValid()) + platform_arch = arch; error = TargetList::CreateTarget (debugger, file, - arch, + platform_arch, get_dependent_files, platform_sp, target_sp); @@ -131,7 +134,7 @@ TargetList::CreateTarget ( Debugger &debugger, const FileSpec& file, - const ArchSpec& arch, + const ArchSpec& specified_arch, bool get_dependent_files, PlatformSP &platform_sp, TargetSP &target_sp @@ -141,28 +144,38 @@ TargetList::CreateTarget "TargetList::CreateTarget (file = '%s/%s', arch = '%s')", file.GetDirectory().AsCString(), file.GetFilename().AsCString(), - arch.GetArchitectureName()); + specified_arch.GetArchitectureName()); Error error; + ArchSpec arch(specified_arch); + + if (platform_sp) + { + if (arch.IsValid()) + { + if (!platform_sp->IsCompatibleArchitecture(arch)) + platform_sp = Platform::GetPlatformForArchitecture(specified_arch, &arch); + } + } + else if (arch.IsValid()) + { + platform_sp = Platform::GetPlatformForArchitecture(specified_arch, &arch); + } + if (!platform_sp) + platform_sp = debugger.GetPlatformList().GetSelectedPlatform(); + if (file) { ModuleSP exe_module_sp; FileSpec resolved_file(file); - if (platform_sp) { FileSpecList executable_search_paths (Target::GetDefaultExecutableSearchPaths()); - error = platform_sp->ResolveExecutable (file, arch, + error = platform_sp->ResolveExecutable (file, + arch, exe_module_sp, executable_search_paths.GetSize() ? &executable_search_paths : NULL); - - if (exe_module_sp) - { - const ArchSpec &arch = exe_module_sp->GetArchitecture(); - if (arch.IsValid() && !platform_sp->IsCompatibleWithArchitecture(arch)) - platform_sp = Platform::GetPlatformForArchitecture(arch); - } } if (error.Success() && exe_module_sp) diff --git a/lldb/test/arm_emulation/new-test-files/test-add-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-1-arm.dat index a4c2ec5e99e..64b2506f9d5 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r0, r0, r15" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe080000f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-1-thumb.dat index ac4004dff9d..daa32d25a41 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r0, r13, #0" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xa800 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-10-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-10-thumb.dat index 53bacf6ec65..bb3d760219b 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-10-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-10-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add sp, r13" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x44ed before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-11-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-11-thumb.dat index a56a2b23a38..e26f2218cbc 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-11-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-11-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add sp, r15" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x44fd before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-12-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-12-thumb.dat index 95a9e2419a8..a7f7344e7d9 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-12-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-12-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add sp, r8" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x44c5 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-2-arm.dat index c4cbdee8de0..cf6e0a9779a 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r0, r13, #0" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe28d0000 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-2-thumb.dat index 40f48311c13..9a178a0a159 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r0, sp, r0" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4468 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-3-arm.dat index a3aef4d6391..9fc44b79395 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-3-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-3-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r0, r1, r0, lsl #2" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe0810100 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-3-thumb.dat index fe80313a616..c8f96ec09d3 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add.w r10, r13, #31" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf10d0a1f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-4-arm.dat index 11c150d9627..12b40ed76fc 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-4-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-4-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r0, r2, r7, lsl r1" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe0820117 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-4-thumb.dat index f83b59b18e4..922b8ecdba5 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-4-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-4-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r3, r13, #16" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xab04 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-5-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-5-arm.dat index 5582c57b6bf..dfb6a87f014 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-5-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-5-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r10, r13, #31" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe28da01f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-5-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-5-thumb.dat index a775813bd76..16ff517436b 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-5-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-5-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r3, sp, r3" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x446b before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-6-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-6-arm.dat index d3418e815b4..8a87eff5f00 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-6-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-6-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r12, r13, #24" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe28dc018 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-6-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-6-thumb.dat index 67c432ed97f..e8abd6950f2 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-6-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-6-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r5, r13, #32" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xad08 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-7-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-7-arm.dat index ba2b701da6a..312514246e3 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-7-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-7-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add r6, sp, #8" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe28d6008 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-7-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-7-thumb.dat index edb4a61d76c..506071309d7 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-7-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-7-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add sp, #16" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xb004 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-8-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-8-arm.dat index 6b828a21227..44a400f5287 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-8-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-8-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add sp, r8" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe08dd008 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-8-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-8-thumb.dat index a5dbf09cb80..8bc6c789a51 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-8-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-8-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add sp, #4" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xb001 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-add-9-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-9-thumb.dat index a205d01e98c..832af4cf0b4 100644 --- a/lldb/test/arm_emulation/new-test-files/test-add-9-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-add-9-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="add sp, r10" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x44d5 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-bic-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-bic-1-arm.dat index d3e0ec96d6c..c1cd4f15ab3 100644 --- a/lldb/test/arm_emulation/new-test-files/test-bic-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-bic-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="bic r4, r9" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe1c44009 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-bic-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-bic-1-thumb.dat index f703a179fbc..c6242265018 100644 --- a/lldb/test/arm_emulation/new-test-files/test-bic-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-bic-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="bics r4, r6" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x43b4 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat index 234a08aa373..e1922d9edb9 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldmia r0!, {r1, r3}" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe8b0000a before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat index 14ae78cdf82..60a805e09d8 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldmia r0!, {r1, r3}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xc80a before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat index 54b34310f45..99401bbd2e2 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldmia r0!, {r2, r4, r6, r8, r10, r12}" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe8b01554 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat index 05063714c3b..39ecf947c6d 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldmia.w r0!,{r2,r4,r6,r8,r10,r12}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xe8b01554 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat index 6bcab43e117..427d7b27485 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldmia r14!, {r1, r3}" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe8be000a before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat index 0126f72e175..9738073c038 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldmia.w r14!, {r1, r3}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xe8be000a before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-1-arm.dat index a4def30ef77..307402fd2f5 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r0, [pc, #+24]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe59f0018 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat index fb9549c7a0a..471669b0cb6 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r0, [pc, #12]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4803 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat index 72821aa7e0b..bc7693c9a68 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr.w r10,[ pc, #4]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf8dfa004 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat index aac725e9f11..b5bf18127cd 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr.w r8, [pc , #0]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf8df8000 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat index d5c503faa19..5c3a5485f0b 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr.w r9, [pc, #-4]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf85f9004 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-2-arm.dat index c611535ea69..068297e3edc 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r0, [pc, #256]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe59f0100 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat index 12507564f3b..27727831d6d 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r0, [pc, #+24]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4806 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-3-arm.dat index 9d39a2d1747..f0d6d8aaba6 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-3-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-3-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r0, [r13, #+24]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe59d0018 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat index 9ebf9678944..012e1c53e66 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r0, [pc, #256]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4840 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-4-arm.dat index 8e9fb941190..e2d2aa6aa88 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-4-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-4-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r1, [r5, #16]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe5951010 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat index d90788fe0d7..3eb6f167b48 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r0, [r13, #+24]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x9806 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-5-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-5-arm.dat index 1d20ac8fe36..45210d9600d 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-5-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-5-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r2, [r0]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe5902000 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat index fcfff65ff78..45289e7e899 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r1, [pc, #0]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4900 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-6-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-6-arm.dat index 7dfd2eceecb..0f379fd4980 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-6-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-6-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r2, [r6], +r8, lsl #2" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe6962108 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat index 9d51ad0298c..5b3c119e743 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r1, [r5, #16]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x6929 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-7-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-7-arm.dat index 3a25f73a3f7..ff425ef5284 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-7-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-7-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r2, [sp, #24]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe59d2018 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat index cf03ddade55..db8d58796ca 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r2, [r0]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x6802 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-8-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-8-arm.dat index e26a3c28738..c11dfc133e5 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-8-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-8-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r3, [r11, #-8]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe51b3008 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat index b16894540c7..01d7013ceaa 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr r2, [sp, #24]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x9a06 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat index acafc42bdbe..cc3c4db2f4d 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldr.w r3, [r11, #8]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf8db3008 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat index 88f37b677ac..970f8aa7c0a 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldrd r0, r1, [r12, #+4]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe1cc00d4 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat index 2681f89564d..7ab41ce35db 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldrd r0, r1, [r12, #+4]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xe9dc0101 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat index 529afd07117..70fe6f5cfff 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldrd r4, r5, [pc, #-0]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xe9df4500 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat index 058f536f01a..2a47002fb65 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldrh r0, [r2, #16]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x8a10 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat index f1c0b825eb6..cecf397f1d4 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldrsh r0, [r2], #+15" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe0d200ff before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat index 32c046c4137..660b3d3b5db 100644 --- a/lldb/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="ldrsh r14, [r2], #+15" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe0d2e0ff before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-1-arm.dat index 789c45ae670..232bc967fed 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r12, #256" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe3a0cc01 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-1-thumb.dat index a9d5cde9775..569510dbd3b 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov ip, pc" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46fc before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-10-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-10-thumb.dat index d0e74c1336a..6bf9b0d7ef7 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-10-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-10-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r0, r15" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4678 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-11-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-11-thumb.dat index 2e8f6574a22..82043ef335b 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-11-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-11-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r0, r7" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4638 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-12-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-12-thumb.dat index 1cc37d85ea6..1fce18af917 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-12-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-12-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov.w r12, #256" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf44f7c80 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-13-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-13-thumb.dat index d76c9713b05..d1c1a4428c9 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-13-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-13-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r12, r13" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46ec before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-14-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-14-thumb.dat index 950b70cf69d..dfd89c265fb 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-14-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-14-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r14, r2" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4696 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-15-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-15-thumb.dat index 4b5c7b110c2..0ff8e5d7dc5 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-15-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-15-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r1, r14" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4671 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-16-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-16-thumb.dat index 4ee60510ef8..1baf42dfc56 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-16-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-16-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r2, ip" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4662 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-17-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-17-thumb.dat index f97ab61e4c4..70cee03fb54 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-17-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-17-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r2, r13" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x466a before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-18-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-18-thumb.dat index 456eea302bd..1893e188b0d 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-18-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-18-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r2, r9" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x464a before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-19-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-19-thumb.dat index e9a5facdbb0..238e16b4aa4 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-19-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-19-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r3, r12" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4663 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-2-arm.dat index 530a2005572..6d6c0cbf80c 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r12, r13" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe1a0c00d before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-2-thumb.dat index f12562db273..ad6854427fb 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov ip, r8" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46c4 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-20-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-20-thumb.dat index 9746af4577e..15ecd2ebfa0 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-20-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-20-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r3, r13" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x466b before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-21-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-21-thumb.dat index 7cdf9fd08c6..6a38f1671b7 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-21-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-21-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r3, sp" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x466b before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-22-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-22-thumb.dat index c25c45b9e73..242b5682419 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-22-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-22-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r4, r11" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x465c before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-23-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-23-thumb.dat index 09957915731..7f57440a842 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-23-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-23-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r5, r10" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4655 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-24-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-24-thumb.dat index b9489568a5e..9a1756e8473 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-24-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-24-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r6, r9" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x464e before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-25-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-25-thumb.dat index 08f2a4b7f4f..c2fd6a73964 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-25-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-25-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r7, lr" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4677 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-26-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-26-thumb.dat index 0c11874d871..2cc155d8071 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-26-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-26-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r7, r8" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4647 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-27-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-27-thumb.dat index 68c93d90a8c..0b35377b08e 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-27-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-27-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r9, pc" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46f9 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-28-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-28-thumb.dat index 29582778f11..f7d7778a251 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-28-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-28-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov sp, ip" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46e5 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-29-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-29-thumb.dat index 773cfb749b1..5e9098f99d2 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-29-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-29-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov sp, pc" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46fd before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-3-arm.dat index f5478945856..1fe7155bd3a 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-3-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-3-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r14, r2" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe1a0e002 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-3-thumb.dat index 7cf8fefd1aa..8ce129682bf 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov ip, sp" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46ec before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-30-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-30-thumb.dat index 2b394fcede0..a0dddad6b5a 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-30-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-30-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov sp, r7" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46bd before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-31-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-31-thumb.dat index 190f7e66b84..20d8dc7c06f 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-31-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-31-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="movs r3, #1" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x2301 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-4-arm.dat index 568fcb26bf3..8ef83b26805 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-4-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-4-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r2, r9" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe1a02009 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-4-thumb.dat index 29c31d2d6d4..f854ba26641 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-4-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-4-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov lr, pc" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46fe before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-5-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-5-arm.dat index 5166f9a7c55..ee85779083f 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-5-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-5-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r3, #2147483648" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe3a03102 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-5-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-5-thumb.dat index 6921b0f2a32..d6140bdb92d 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-5-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-5-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov lr, r2" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x4696 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-6-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-6-arm.dat index e9cc1b83058..863a6d3e9bd 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-6-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-6-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov r3, r13" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe1a0300d before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-6-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-6-thumb.dat index 43ff7501d49..fac96bf5a5a 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-6-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-6-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov pc, ip" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46e7 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-7-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-7-thumb.dat index 49d77942fc6..c537d30cb24 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-7-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-7-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov pc, lr" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46f7 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-8-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-8-thumb.dat index 9d8b2de16a3..b724c79a0d5 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-8-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-8-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov pc, r4" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46a7 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-9-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-9-thumb.dat index 621591903f6..ccf7ea6c342 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mov-9-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mov-9-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mov pc, sp" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x46ef before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-moveq-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-moveq-1-arm.dat index 5fe8d97ca30..f46b1bfd6e8 100644 --- a/lldb/test/arm_emulation/new-test-files/test-moveq-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-moveq-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="moveq r3, #1" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0x3a03001 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-movs-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-movs-1-arm.dat index a3258e39ccc..38292508d43 100644 --- a/lldb/test/arm_emulation/new-test-files/test-movs-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-movs-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="movs r12, r13" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe1b0c00d before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-1-arm.dat index 30004671b40..024dd9fa4bc 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mvn-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mvn-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mvn r14, #1" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe3e0e001 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat index c81eaf4d7bc..c5c385c8522 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mvn r0, #1" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf06f0001 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-2-arm.dat index b1f6d10b80e..10df542fcad 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mvn-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mvn-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mvn r0, #1" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe3e00001 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat index b7fe679e8d4..3c2f6f4da27 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mvn r0, #31" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf06f001f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-3-arm.dat index 1c4fa30cfaa..742708978b6 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mvn-3-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mvn-3-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mvn r0, #31" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe3e0001f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat index 597db3fc2a4..ff4ca7331a9 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mvn r14, #1" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf06f0e01 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-4-arm.dat index fdc76101aed..4efc18cc5f2 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mvn-4-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mvn-4-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mvn r3, r8" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe1e03008 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat index 82703765d7b..f8b1569e906 100644 --- a/lldb/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="mvns r3, r8" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xea7f0308 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-pop-1-arm.dat index 17b42b4a960..07163f80aeb 100644 --- a/lldb/test/arm_emulation/new-test-files/test-pop-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-pop-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="pop {r3, r4, r8, r10}" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe8bd0518 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-pop-1-thumb.dat index 3811dcadbb8..fad6765be9a 100644 --- a/lldb/test/arm_emulation/new-test-files/test-pop-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-pop-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="pop.w {r3, r4, r8, r10}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xe8bd0518 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-pop-2-arm.dat index e61ead6bdbc..4b6ae43ca28 100644 --- a/lldb/test/arm_emulation/new-test-files/test-pop-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-pop-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="pop {r9}" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe8bd0200 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-pop-2-thumb.dat index fd2ad24ac3c..9f3efe57e9d 100644 --- a/lldb/test/arm_emulation/new-test-files/test-pop-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-pop-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="pop {r3}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xbc08 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-pop-3-thumb.dat index bee5c93cf0d..a2adc418c4a 100644 --- a/lldb/test/arm_emulation/new-test-files/test-pop-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-pop-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="pop {r6}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xbc40 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-push-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-push-1-arm.dat index 80f39c1c871..b2f6e0965ab 100644 --- a/lldb/test/arm_emulation/new-test-files/test-push-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-push-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="push {r0, r1, r2, r3, r7, r14}" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe92d408f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-push-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-push-1-thumb.dat index 5b97db909a0..6f5b29ed199 100644 --- a/lldb/test/arm_emulation/new-test-files/test-push-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-push-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="push {r0, r1, r2, r3, r7, r14}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xb58f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-push-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-push-2-arm.dat index 14871ad6d54..6f1f4389e80 100644 --- a/lldb/test/arm_emulation/new-test-files/test-push-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-push-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="push {r6}" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe92d0040 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-push-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-push-2-thumb.dat index 0867f8108dd..23e4df446bf 100644 --- a/lldb/test/arm_emulation/new-test-files/test-push-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-push-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="push {r6}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xb440 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-push-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-push-3-arm.dat index a7dcd022c4b..06847a5ff3b 100644 --- a/lldb/test/arm_emulation/new-test-files/test-push-3-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-push-3-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="push {r7, r14}" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe92d4080 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-push-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-push-3-thumb.dat index d1eea468d07..e3330f537cb 100644 --- a/lldb/test/arm_emulation/new-test-files/test-push-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-push-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="push {r7, r14}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xb580 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-str-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-str-1-arm.dat index 3ca1303a121..70a5be3cb69 100644 --- a/lldb/test/arm_emulation/new-test-files/test-str-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-str-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="str r0, [r13]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe58d0000 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-str-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-str-1-thumb.dat index 46b495cf27d..3559652ce6c 100644 --- a/lldb/test/arm_emulation/new-test-files/test-str-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-str-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="str r0, [r13]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x9000 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-str-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-str-2-arm.dat index 14d4dc92b07..3d77724b4f9 100644 --- a/lldb/test/arm_emulation/new-test-files/test-str-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-str-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="str r1, [r0, #+4]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe5801004 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-str-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-str-2-thumb.dat index cbcdcb7d690..73e8cd3e548 100644 --- a/lldb/test/arm_emulation/new-test-files/test-str-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-str-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="str r0, [sp, #0]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x9000 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-str-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-str-3-arm.dat index b729f853b8c..97c90a0050c 100644 --- a/lldb/test/arm_emulation/new-test-files/test-str-3-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-str-3-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="str r2, [r0]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe5802000 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-str-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-str-3-thumb.dat index 7d5dc53160a..8e891c04287 100644 --- a/lldb/test/arm_emulation/new-test-files/test-str-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-str-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="str r1, [sp, #32]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x9108 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-str-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-str-4-arm.dat index 1b700969d46..ed3b54eaf38 100644 --- a/lldb/test/arm_emulation/new-test-files/test-str-4-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-str-4-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="str r2, [r13, #+4]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe58d2004 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-str-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-str-4-thumb.dat index 092135fe1ae..ec9e2dc1e54 100644 --- a/lldb/test/arm_emulation/new-test-files/test-str-4-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-str-4-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="str.w r7, [r13, #-12]!" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf84d7d0c before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-str-5-arm.dat b/lldb/test/arm_emulation/new-test-files/test-str-5-arm.dat index fbf6c071d04..98b8dfb16b3 100644 --- a/lldb/test/arm_emulation/new-test-files/test-str-5-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-str-5-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="str r7, [r13, #-12]!" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe52d700c before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-strb-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-strb-1-arm.dat index 4f167cf9b42..2f7320d007a 100644 --- a/lldb/test/arm_emulation/new-test-files/test-strb-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-strb-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="strb r0, [r2], #+15" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe4c2000f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-strb-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-strb-2-arm.dat index 9ebeb9db366..495c8e720a1 100644 --- a/lldb/test/arm_emulation/new-test-files/test-strb-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-strb-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="strb r3, [r0, #+8]" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe5c03008 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-strbt-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-strbt-1-arm.dat index 5c86f56f11f..494c49af952 100644 --- a/lldb/test/arm_emulation/new-test-files/test-strbt-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-strbt-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="strbt r14, [r2], #+15" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe4e2e00f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-strd-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-strd-1-thumb.dat index e96571df1dc..4876f8741b0 100644 --- a/lldb/test/arm_emulation/new-test-files/test-strd-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-strd-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="strd r10, r11, [r6, #+28]" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xe9c6ab07 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-strt-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-strt-1-arm.dat index b0c97794616..9fc311565ea 100644 --- a/lldb/test/arm_emulation/new-test-files/test-strt-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-strt-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="strt r0, [r2], #+15" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe4a2000f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-1-arm.dat index e07e5fb9aa0..98c435d616a 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub r0, sp, r8" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe04d0008 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-1-thumb.dat index d872a284b2c..482480d0cd4 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub.w r10, sp, #16" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf1ad0a10 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-10-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-10-arm.dat index 7c0b9452531..9f07a947f7d 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-10-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-10-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub r7, r12, #8" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe24c7008 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-2-arm.dat index 5b6ee1738c1..9a67268196e 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-2-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-2-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub r10, r12, #31" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe24ca01f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-2-thumb.dat index 2997cf5b594..11d213803e2 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub.w r10, sp, #31" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf1ad0a1f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-3-arm.dat index 288680198a5..4dfe680ce47 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-3-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-3-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub r12, r13, #12" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe24dc00c before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-3-thumb.dat index 48e178b3a6e..a017f528430 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub.w r12, sp, #31" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf1ad0c1f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-4-arm.dat index b63f66e3164..50d13c99475 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-4-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-4-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub r13, r13, #24" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe24dd018 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-4-thumb.dat index 9fc0f547b0d..214808d6a42 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-4-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-4-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub.w r1, sp, r3, lsl #2" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xebad0183 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-5-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-5-arm.dat index 7f286191b90..58de27b5d4e 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-5-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-5-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub r13, r13, #4" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe24dd004 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-5-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-5-thumb.dat index 27f2bfeed41..12688286685 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-5-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-5-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub.w r7, sp, #1" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf1ad0701 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-6-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-6-arm.dat index 0be88bb2c88..be6891307db 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-6-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-6-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub r1, r13, #4" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe24d1004 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-6-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-6-thumb.dat index 87dd111479d..d48c42eb8d8 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-6-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-6-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub.w sp, sp, #4" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf1ad0d04 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-8-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-8-arm.dat index db79a2702ff..21b17dfbcd8 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-8-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-8-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub r2, r2, r3" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe0422003 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-9-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-9-arm.dat index 3fb03d95bed..06888ad3a4b 100644 --- a/lldb/test/arm_emulation/new-test-files/test-sub-9-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-sub-9-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="sub r4, r12, r7" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe04c4007 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-subs-1-arm.dat index b296e98d9b4..856a55749b1 100644 --- a/lldb/test/arm_emulation/new-test-files/test-subs-1-arm.dat +++ b/lldb/test/arm_emulation/new-test-files/test-subs-1-arm.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="subs r10, r13, #31" -triple=arm-apple-darwin +triple=arm-apple-ios opcode=0xe25da01f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-1-thumb.dat index 0ccbb064c10..63aa7b8ed13 100644 --- a/lldb/test/arm_emulation/new-test-files/test-subs-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-subs-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="subs r0, r6, #0" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x1e30 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-10-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-10-thumb.dat index 0b3c705f2e4..75938b4e1d5 100644 --- a/lldb/test/arm_emulation/new-test-files/test-subs-10-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-subs-10-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="subs.w r1, sp, #4" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf1bd0104 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-2-thumb.dat index cc990ad92a7..74bddcea97c 100644 --- a/lldb/test/arm_emulation/new-test-files/test-subs-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-subs-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="subs r0, r7, r5" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x1b78 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-3-thumb.dat index 79489f0ca17..965ebf37017 100644 --- a/lldb/test/arm_emulation/new-test-files/test-subs-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-subs-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="subs.w r10, r13, #31" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf1bd0a1f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-4-thumb.dat index 99555012a5b..068724170d5 100644 --- a/lldb/test/arm_emulation/new-test-files/test-subs-4-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-subs-4-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="subs r1, r3, #4" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x1f19 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-5-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-5-thumb.dat index a8fa4628dc3..72ed2ef25c0 100644 --- a/lldb/test/arm_emulation/new-test-files/test-subs-5-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-subs-5-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="subs r4, r2, r6" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x1b94 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-6-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-6-thumb.dat index 298daf28016..67133b2832e 100644 --- a/lldb/test/arm_emulation/new-test-files/test-subs-6-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-subs-6-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="subs r7, r5, #7" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0x1fef before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-8-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-8-thumb.dat index 79489f0ca17..965ebf37017 100644 --- a/lldb/test/arm_emulation/new-test-files/test-subs-8-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-subs-8-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="subs.w r10, r13, #31" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf1bd0a1f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-9-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-9-thumb.dat index 4ca60de1cb8..ea159774316 100644 --- a/lldb/test/arm_emulation/new-test-files/test-subs-9-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-subs-9-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="subs.w r10, sp, #31" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xf1bd0a1f before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat index 2ab965f90c5..22dd9d88b4b 100644 --- a/lldb/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="vpop {d11, d12, d13, d14}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xecbdbb08 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat index 691b64477c4..e69cd9eef2d 100644 --- a/lldb/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="vpop {s0}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xecbd0a01 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat index 0384beeba8c..375a92eaaab 100644 --- a/lldb/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="vpop {s11, s12, s13, s14}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xecfd5a04 before_state={ memory={ diff --git a/lldb/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat index 2202f196b82..ac4ef56be66 100644 --- a/lldb/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="vpush {d11, d12, d13, d14}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xed2dbb08 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat index 60a69fa57fb..58055d6539c 100644 --- a/lldb/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="vpush {s0}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xed2d0a01 before_state={ registers={ diff --git a/lldb/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat index 9e1104113fc..2658b43bc88 100644 --- a/lldb/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat +++ b/lldb/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat @@ -1,6 +1,6 @@ InstructionEmulationState={ assembly_string="vpush {s11, s12, s13, s14}" -triple=thumb-apple-darwin +triple=thumb-apple-ios opcode=0xed6d5a04 before_state={ registers={ diff --git a/lldb/test/macosx/universal/TestUniversal.py b/lldb/test/macosx/universal/TestUniversal.py index 49fa864875d..9daf0b9f438 100644 --- a/lldb/test/macosx/universal/TestUniversal.py +++ b/lldb/test/macosx/universal/TestUniversal.py @@ -27,7 +27,7 @@ class UniversalTestCase(TestBase): exe = os.path.join(os.getcwd(), "testit") # Create a target by the debugger. - target = self.dbg.CreateTargetWithFileAndTargetTriple(exe, "i386-apple-darwin") + target = self.dbg.CreateTargetWithFileAndTargetTriple(exe, "i386-apple-macosx") self.assertTrue(target, VALID_TARGET) # Now launch the process, and do not stop at entry point. diff --git a/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py b/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py index e0a7815cc39..e716545ec17 100644 --- a/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py +++ b/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py @@ -21,7 +21,7 @@ class DisassembleRawDataTestCase(TestBase): """Test disassembling raw bytes with the API.""" # Create a target from the debugger. - target = self.dbg.CreateTargetWithFileAndTargetTriple ("", "x86_64-apple-darwin") + target = self.dbg.CreateTargetWithFileAndTargetTriple ("", "x86_64") self.assertTrue(target, VALID_TARGET) raw_bytes = bytearray([0x48, 0x89, 0xe5]) diff --git a/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py b/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py index 275a669c32a..d2e985a12ca 100644 --- a/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py +++ b/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py @@ -21,7 +21,7 @@ class Disassemble_VST1_64(TestBase): """Test disassembling invalid vst1.64 raw bytes with the API.""" # Create a target from the debugger. - target = self.dbg.CreateTargetWithFileAndTargetTriple ("", "thumbv7-apple-darwin") + target = self.dbg.CreateTargetWithFileAndTargetTriple ("", "thumbv7") self.assertTrue(target, VALID_TARGET) raw_bytes = bytearray([0xf0, 0xb5, 0x03, 0xaf, diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp index e776cef689e..3900ab949eb 100644 --- a/lldb/tools/debugserver/source/RNBRemote.cpp +++ b/lldb/tools/debugserver/source/RNBRemote.cpp @@ -3553,14 +3553,25 @@ RNBRemote::HandlePacket_qHostInfo (const char *p) strm << "cpusubtype:" << std::dec << cpusubtype << ';'; } - char ostype[64]; - len = sizeof(ostype); - if (::sysctlbyname("kern.ostype", &ostype, &len, NULL, 0) == 0) + // The OS in the triple should be "ios" or "macosx" which doesn't match our + // "Darwin" which gets returned from "kern.ostype", so we need to hardcode + // this for now. + if (cputype == CPU_TYPE_ARM) { - len = strlen(ostype); - std::transform (ostype, ostype + len, ostype, tolower); - strm << "ostype:" << std::dec << ostype << ';'; + strm << "ostype:ios;"; } + else + { + strm << "ostype:macosx;"; + } +// char ostype[64]; +// len = sizeof(ostype); +// if (::sysctlbyname("kern.ostype", &ostype, &len, NULL, 0) == 0) +// { +// len = strlen(ostype); +// std::transform (ostype, ostype + len, ostype, tolower); +// strm << "ostype:" << std::dec << ostype << ';'; +// } strm << "vendor:apple;"; |
