From gclayton at apple.com Mon Apr 18 03:33:37 2011 From: gclayton at apple.com (Greg Clayton) Date: Mon, 18 Apr 2011 08:33:37 -0000 Subject: [Lldb-commits] [lldb] r129695 - in /lldb/trunk: include/lldb/Interpreter/ include/lldb/Target/ lldb.xcodeproj/ source/Commands/ source/Core/ source/Interpreter/ source/Plugins/Disassembler/llvm/ source/Plugins/Platform/MacOSX/ source/Symbol/ source/Target/ test/abbreviation_tests/ test/array_types/ test/bitfields/ test/breakpoint_command/ test/class_static/ test/class_types/ test/conditional_break/ test/dead-strip/ test/enum_types/ test/forward/ test/function_types/ test/global_variables/ test/inferior-crashing/ test/i... Message-ID: <20110418083338.137152A6C12C@llvm.org> Author: gclayton Date: Mon Apr 18 03:33:37 2011 New Revision: 129695 URL: http://llvm.org/viewvc/llvm-project?rev=129695&view=rev Log: Centralized a lot of the status information for processes, threads, and stack frame down in the lldb_private::Process, lldb_private::Thread, lldb_private::StackFrameList and the lldb_private::StackFrame classes. We had some command line commands that had duplicate versions of the process status output ("thread list" and "process status" for example). Removed the "file" command and placed it where it should have been: "target create". Made an alias for "file" to "target create" so we stay compatible with GDB commands. We can now have multple usable targets in lldb at the same time. This is nice for comparing two runs of a program or debugging more than one binary at the same time. The new command is "target select " and also to see a list of the current targets you can use the new "target list" command. The flow in a debug session can be: (lldb) target create /path/to/exe/a.out (lldb) breakpoint set --name main (lldb) run ... hit breakpoint (lldb) target create /bin/ls (lldb) run /tmp Process 36001 exited with status = 0 (0x00000000) (lldb) target list Current targets: target #0: /tmp/args/a.out ( arch=x86_64-apple-darwin, platform=localhost, pid=35999, state=stopped ) * target #1: /bin/ls ( arch=x86_64-apple-darwin, platform=localhost, pid=36001, state=exited ) (lldb) target select 0 Current targets: * target #0: /tmp/args/a.out ( arch=x86_64-apple-darwin, platform=localhost, pid=35999, state=stopped ) target #1: /bin/ls ( arch=x86_64-apple-darwin, platform=localhost, pid=36001, state=exited ) (lldb) bt * thread #1: tid = 0x2d03, 0x0000000100000b9a a.out`main + 42 at main.c:16, stop reason = breakpoint 1.1 frame #0: 0x0000000100000b9a a.out`main + 42 at main.c:16 frame #1: 0x0000000100000b64 a.out`start + 52 Above we created a target for "a.out" and ran and hit a breakpoint at "main". Then we created a new target for /bin/ls and ran it. Then we listed the targest and selected our original "a.out" program, so we showed two concurent debug sessions going on at the same time. Added: lldb/trunk/include/lldb/Interpreter/OptionGroupArchitecture.h lldb/trunk/include/lldb/Interpreter/OptionGroupPlatform.h lldb/trunk/source/Interpreter/OptionGroupArchitecture.cpp lldb/trunk/source/Interpreter/OptionGroupPlatform.cpp Removed: lldb/trunk/source/Commands/CommandObjectFile.cpp lldb/trunk/source/Commands/CommandObjectFile.h Modified: lldb/trunk/include/lldb/Target/Process.h lldb/trunk/include/lldb/Target/StackFrame.h lldb/trunk/include/lldb/Target/StackFrameList.h lldb/trunk/include/lldb/Target/TargetList.h lldb/trunk/include/lldb/Target/Thread.h lldb/trunk/lldb.xcodeproj/project.pbxproj lldb/trunk/source/Commands/CommandObjectExpression.cpp lldb/trunk/source/Commands/CommandObjectFrame.cpp lldb/trunk/source/Commands/CommandObjectPlatform.cpp lldb/trunk/source/Commands/CommandObjectPlatform.h lldb/trunk/source/Commands/CommandObjectProcess.cpp lldb/trunk/source/Commands/CommandObjectTarget.cpp lldb/trunk/source/Commands/CommandObjectThread.cpp lldb/trunk/source/Commands/CommandObjectThread.h lldb/trunk/source/Core/PluginManager.cpp lldb/trunk/source/Interpreter/CommandInterpreter.cpp lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp lldb/trunk/source/Symbol/ClangASTContext.cpp lldb/trunk/source/Symbol/ClangASTType.cpp lldb/trunk/source/Target/Process.cpp lldb/trunk/source/Target/StackFrame.cpp lldb/trunk/source/Target/StackFrameList.cpp lldb/trunk/source/Target/Thread.cpp lldb/trunk/test/abbreviation_tests/TestAbbreviations.py lldb/trunk/test/array_types/TestArrayTypes.py lldb/trunk/test/bitfields/TestBitfields.py lldb/trunk/test/breakpoint_command/TestBreakpointCommand.py lldb/trunk/test/class_static/TestStaticVariables.py lldb/trunk/test/class_types/TestClassTypes.py lldb/trunk/test/class_types/TestClassTypesDisassembly.py lldb/trunk/test/conditional_break/TestConditionalBreak.py lldb/trunk/test/dead-strip/TestDeadStrip.py lldb/trunk/test/enum_types/TestEnumTypes.py lldb/trunk/test/forward/TestForwardDeclaration.py lldb/trunk/test/function_types/TestFunctionTypes.py lldb/trunk/test/global_variables/TestGlobalVariables.py lldb/trunk/test/inferior-crashing/TestInferiorCrashing.py lldb/trunk/test/inlined_breakpoints/TestInlinedBreakpoints.py lldb/trunk/test/load_unload/TestLoadUnload.py lldb/trunk/test/namespace/TestNamespace.py lldb/trunk/test/set_values/TestSetValues.py lldb/trunk/test/signal/TestSendSignal.py lldb/trunk/test/signed_types/TestSignedTypes.py lldb/trunk/test/source-manager/TestSourceManager.py lldb/trunk/test/unique-types/TestUniqueTypes.py lldb/trunk/test/unsigned_types/TestUnsignedTypes.py lldb/trunk/tools/driver/Driver.cpp Added: lldb/trunk/include/lldb/Interpreter/OptionGroupArchitecture.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionGroupArchitecture.h?rev=129695&view=auto ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionGroupArchitecture.h (added) +++ lldb/trunk/include/lldb/Interpreter/OptionGroupArchitecture.h Mon Apr 18 03:33:37 2011 @@ -0,0 +1,73 @@ +//===-- OptionGroupArchitecture.h -------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef liblldb_OptionGroupArchitecture_h_ +#define liblldb_OptionGroupArchitecture_h_ + +// C Includes +// C++ Includes +// Other libraries and framework includes +// Project includes +#include "lldb/Interpreter/Options.h" +#include "lldb/Core/ArchSpec.h" + +namespace lldb_private { + +//------------------------------------------------------------------------- +// OptionGroupArchitecture +//------------------------------------------------------------------------- + +class OptionGroupArchitecture : public OptionGroup +{ +public: + + OptionGroupArchitecture (); + + virtual + ~OptionGroupArchitecture (); + + + virtual uint32_t + GetNumDefinitions (); + + virtual const OptionDefinition* + GetDefinitions (); + + virtual Error + SetOptionValue (CommandInterpreter &interpreter, + uint32_t option_idx, + const char *option_value); + + virtual void + OptionParsingStarting (CommandInterpreter &interpreter); + + bool + GetArchitecture (Platform *platform, ArchSpec &arch); + + bool + ArchitectureWasSpecified () const + { + return !m_arch_str.empty(); + } + const char * + GetArchitectureName () + { + if (m_arch_str.empty()) + return NULL; + return m_arch_str.c_str(); + } + +protected: + + std::string m_arch_str; // Save the arch triple in case a platform is specified after the architecture +}; + +} // namespace lldb_private + +#endif // liblldb_OptionGroupArchitecture_h_ Added: lldb/trunk/include/lldb/Interpreter/OptionGroupPlatform.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionGroupPlatform.h?rev=129695&view=auto ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionGroupPlatform.h (added) +++ lldb/trunk/include/lldb/Interpreter/OptionGroupPlatform.h Mon Apr 18 03:33:37 2011 @@ -0,0 +1,89 @@ +//===-- OptionGroupPlatform.h -----------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef liblldb_OptionGroupPlatform_h_ +#define liblldb_OptionGroupPlatform_h_ + +// C Includes +// C++ Includes +// Other libraries and framework includes +// Project includes +#include "lldb/Interpreter/Options.h" + +namespace lldb_private { + +//------------------------------------------------------------------------- +// PlatformOptionGroup +// +// Make platform options available to any commands that need the settings. +//------------------------------------------------------------------------- +class OptionGroupPlatform : public OptionGroup +{ +public: + + OptionGroupPlatform (bool include_platform_option) : + OptionGroup(), + m_platform_name (), + m_os_version_major (UINT32_MAX), + m_os_version_minor (UINT32_MAX), + m_os_version_update (UINT32_MAX), + m_include_platform_option (include_platform_option) + { + } + + virtual + ~OptionGroupPlatform () + { + } + + virtual uint32_t + GetNumDefinitions (); + + virtual const OptionDefinition* + GetDefinitions (); + + virtual Error + SetOptionValue (CommandInterpreter &interpreter, + uint32_t option_idx, + const char *option_value); + + virtual void + OptionParsingStarting (CommandInterpreter &interpreter); + + lldb::PlatformSP + CreatePlatformWithOptions (CommandInterpreter &interpreter, + bool make_selected, + Error& error); + + bool + PlatformWasSpecified () const + { + return !m_platform_name.empty(); + } + + void + SetPlatformName (const char *platform_name) + { + if (platform_name && platform_name[0]) + m_platform_name.assign (platform_name); + else + m_platform_name.clear(); + } + +protected: + std::string m_platform_name; + uint32_t m_os_version_major; + uint32_t m_os_version_minor; + uint32_t m_os_version_update; + bool m_include_platform_option; +}; + +} // namespace lldb_private + +#endif // liblldb_OptionGroupPlatform_h_ Modified: lldb/trunk/include/lldb/Target/Process.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Process.h?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/Process.h (original) +++ lldb/trunk/include/lldb/Target/Process.h Mon Apr 18 03:33:37 2011 @@ -1896,6 +1896,16 @@ static const char * ExecutionResultAsCString (ExecutionResults result); + void + GetStatus (Stream &ostrm); + + size_t + GetThreadStatus (Stream &ostrm, + bool only_threads_with_stop_reason, + uint32_t start_frame, + uint32_t num_frames, + uint32_t num_frames_with_source); + protected: friend class CommandObjectProcessLaunch; friend class ProcessEventData; Modified: lldb/trunk/include/lldb/Target/StackFrame.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/StackFrame.h?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/StackFrame.h (original) +++ lldb/trunk/include/lldb/Target/StackFrame.h Mon Apr 18 03:33:37 2011 @@ -160,6 +160,13 @@ lldb::StackFrameSP GetSP (); + bool + GetStatus (Stream &strm, + bool show_frame_info, + bool show_source, + uint32_t source_lines_before, + uint32_t source_lines_after); + protected: friend class StackFrameList; Modified: lldb/trunk/include/lldb/Target/StackFrameList.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/StackFrameList.h?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/StackFrameList.h (original) +++ lldb/trunk/include/lldb/Target/StackFrameList.h Mon Apr 18 03:33:37 2011 @@ -68,6 +68,15 @@ lldb::StackFrameSP GetStackFrameSPForStackFramePtr (StackFrame *stack_frame_ptr); + size_t + GetStatus (Stream &strm, + uint32_t first_frame, + uint32_t num_frames, + bool show_frame_info, + uint32_t num_frames_with_source, + uint32_t source_lines_before, + uint32_t source_lines_after); + protected: friend class Thread; Modified: lldb/trunk/include/lldb/Target/TargetList.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/TargetList.h?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/TargetList.h (original) +++ lldb/trunk/include/lldb/Target/TargetList.h Mon Apr 18 03:33:37 2011 @@ -182,9 +182,6 @@ uint32_t SetSelectedTarget (Target *target); - void - SetSelectedTargetWithIndex (uint32_t idx); - lldb::TargetSP GetSelectedTarget (); Modified: lldb/trunk/include/lldb/Target/Thread.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Thread.h?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/Thread.h (original) +++ lldb/trunk/include/lldb/Target/Thread.h Mon Apr 18 03:33:37 2011 @@ -703,6 +703,21 @@ lldb::StackFrameSP GetStackFrameSPForStackFramePtr (StackFrame *stack_frame_ptr); + + size_t + GetStatus (Stream &strm, + uint32_t start_frame, + uint32_t num_frames, + uint32_t num_frames_with_source); + + size_t + GetStackFrameStatus (Stream& strm, + uint32_t first_frame, + uint32_t num_frames, + bool show_frame_info, + uint32_t num_frames_with_source, + uint32_t source_lines_before, + uint32_t source_lines_after); protected: Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/lldb.xcodeproj/project.pbxproj (original) +++ lldb/trunk/lldb.xcodeproj/project.pbxproj Mon Apr 18 03:33:37 2011 @@ -94,7 +94,6 @@ 2689001613353DDE00698AC0 /* CommandObjectCommands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C5DBBC611E3FEC60035160F /* CommandObjectCommands.cpp */; }; 2689001713353DDE00698AC0 /* CommandObjectDisassemble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E3010F1B84700F91463 /* CommandObjectDisassemble.cpp */; }; 2689001813353DDE00698AC0 /* CommandObjectExpression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E3110F1B84700F91463 /* CommandObjectExpression.cpp */; }; - 2689001913353DDE00698AC0 /* CommandObjectFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E3210F1B84700F91463 /* CommandObjectFile.cpp */; }; 2689001A13353DDE00698AC0 /* CommandObjectFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2672D8461189055500FF4019 /* CommandObjectFrame.cpp */; }; 2689001B13353DDE00698AC0 /* CommandObjectHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E3310F1B84700F91463 /* CommandObjectHelp.cpp */; }; 2689001C13353DDE00698AC0 /* CommandObjectImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E3410F1B84700F91463 /* CommandObjectImage.cpp */; }; @@ -380,6 +379,8 @@ 26B42C4D1187ABA50079C8C8 /* LLDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B42C4C1187ABA50079C8C8 /* LLDB.h */; settings = {ATTRIBUTES = (Public, ); }; }; 26C72C94124322890068DC16 /* SBStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C72C93124322890068DC16 /* SBStream.h */; settings = {ATTRIBUTES = (Public, ); }; }; 26C72C961243229A0068DC16 /* SBStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26C72C951243229A0068DC16 /* SBStream.cpp */; }; + 26D5E15F135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D5E15E135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp */; }; + 26D5E163135BB054006EA0A7 /* OptionGroupPlatform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D5E162135BB054006EA0A7 /* OptionGroupPlatform.cpp */; }; 26DC6A171337FE8000FF7998 /* liblldb-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2689FFCA13353D7A00698AC0 /* liblldb-core.a */; }; 26DC6A1D1337FECA00FF7998 /* lldb-platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DC6A1C1337FECA00FF7998 /* lldb-platform.cpp */; }; 26DE1E6B11616C2E00A093E2 /* lldb-forward-rtti.h in Headers */ = {isa = PBXBuildFile; fileRef = 26DE1E6911616C2E00A093E2 /* lldb-forward-rtti.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -756,7 +757,6 @@ 26BC7D1410F1B76300F91463 /* CommandObjectBreakpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandObjectBreakpoint.h; path = source/Commands/CommandObjectBreakpoint.h; sourceTree = ""; }; 26BC7D1710F1B76300F91463 /* CommandObjectDisassemble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandObjectDisassemble.h; path = source/Commands/CommandObjectDisassemble.h; sourceTree = ""; }; 26BC7D1810F1B76300F91463 /* CommandObjectExpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandObjectExpression.h; path = source/Commands/CommandObjectExpression.h; sourceTree = ""; }; - 26BC7D1910F1B76300F91463 /* CommandObjectFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandObjectFile.h; path = source/Commands/CommandObjectFile.h; sourceTree = ""; }; 26BC7D1A10F1B76300F91463 /* CommandObjectHelp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandObjectHelp.h; path = source/Commands/CommandObjectHelp.h; sourceTree = ""; }; 26BC7D1B10F1B76300F91463 /* CommandObjectImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandObjectImage.h; path = source/Commands/CommandObjectImage.h; sourceTree = ""; }; 26BC7D1D10F1B76300F91463 /* CommandObjectMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandObjectMemory.h; path = source/Commands/CommandObjectMemory.h; sourceTree = ""; }; @@ -861,7 +861,6 @@ 26BC7E2D10F1B84700F91463 /* CommandObjectBreakpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectBreakpoint.cpp; path = source/Commands/CommandObjectBreakpoint.cpp; sourceTree = ""; }; 26BC7E3010F1B84700F91463 /* CommandObjectDisassemble.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectDisassemble.cpp; path = source/Commands/CommandObjectDisassemble.cpp; sourceTree = ""; }; 26BC7E3110F1B84700F91463 /* CommandObjectExpression.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectExpression.cpp; path = source/Commands/CommandObjectExpression.cpp; sourceTree = ""; }; - 26BC7E3210F1B84700F91463 /* CommandObjectFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectFile.cpp; path = source/Commands/CommandObjectFile.cpp; sourceTree = ""; }; 26BC7E3310F1B84700F91463 /* CommandObjectHelp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectHelp.cpp; path = source/Commands/CommandObjectHelp.cpp; sourceTree = ""; }; 26BC7E3410F1B84700F91463 /* CommandObjectImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectImage.cpp; path = source/Commands/CommandObjectImage.cpp; sourceTree = ""; }; 26BC7E3610F1B84700F91463 /* CommandObjectMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectMemory.cpp; path = source/Commands/CommandObjectMemory.cpp; sourceTree = ""; }; @@ -980,6 +979,10 @@ 26D0DD5510FE555900271C65 /* BreakpointResolverName.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BreakpointResolverName.cpp; path = source/Breakpoint/BreakpointResolverName.cpp; sourceTree = ""; }; 26D27C9D11ED3A4E0024D721 /* ELFHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ELFHeader.cpp; sourceTree = ""; }; 26D27C9E11ED3A4E0024D721 /* ELFHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ELFHeader.h; sourceTree = ""; }; + 26D5E15E135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OptionGroupArchitecture.cpp; path = source/Interpreter/OptionGroupArchitecture.cpp; sourceTree = ""; }; + 26D5E160135BAEB0006EA0A7 /* OptionGroupArchitecture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionGroupArchitecture.h; path = include/lldb/Interpreter/OptionGroupArchitecture.h; sourceTree = ""; }; + 26D5E161135BB040006EA0A7 /* OptionGroupPlatform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionGroupPlatform.h; path = include/lldb/Interpreter/OptionGroupPlatform.h; sourceTree = ""; }; + 26D5E162135BB054006EA0A7 /* OptionGroupPlatform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OptionGroupPlatform.cpp; path = source/Interpreter/OptionGroupPlatform.cpp; sourceTree = ""; }; 26D9FDC612F784E60003F2EE /* EmulateInstruction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmulateInstruction.h; path = include/lldb/Core/EmulateInstruction.h; sourceTree = ""; }; 26D9FDC812F784FD0003F2EE /* EmulateInstruction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmulateInstruction.cpp; path = source/Core/EmulateInstruction.cpp; sourceTree = ""; }; 26D9FDCC12F7853F0003F2EE /* EmulateInstructionARM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmulateInstructionARM.cpp; path = Instruction/ARM/EmulateInstructionARM.cpp; sourceTree = ""; }; @@ -2044,8 +2047,6 @@ 26BC7E3010F1B84700F91463 /* CommandObjectDisassemble.cpp */, 26BC7D1810F1B76300F91463 /* CommandObjectExpression.h */, 26BC7E3110F1B84700F91463 /* CommandObjectExpression.cpp */, - 26BC7D1910F1B76300F91463 /* CommandObjectFile.h */, - 26BC7E3210F1B84700F91463 /* CommandObjectFile.cpp */, 2672D8471189055500FF4019 /* CommandObjectFrame.h */, 2672D8461189055500FF4019 /* CommandObjectFrame.cpp */, 26BC7D1A10F1B76300F91463 /* CommandObjectHelp.h */, @@ -2164,6 +2165,10 @@ 26BC7F0A10F1B8DD00F91463 /* CommandReturnObject.cpp */, 26BC7D6D10F1B77400F91463 /* Options.h */, 26BC7E8610F1B85900F91463 /* Options.cpp */, + 26D5E160135BAEB0006EA0A7 /* OptionGroupArchitecture.h */, + 26D5E15E135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp */, + 26D5E161135BB040006EA0A7 /* OptionGroupPlatform.h */, + 26D5E162135BB054006EA0A7 /* OptionGroupPlatform.cpp */, 26BC7DE510F1B7F900F91463 /* ScriptInterpreter.h */, 9A82010B10FFB49800182560 /* ScriptInterpreter.cpp */, 9A2771FB1135A35C00E6ADB6 /* ScriptInterpreterNone.h */, @@ -2870,7 +2875,6 @@ 2689001613353DDE00698AC0 /* CommandObjectCommands.cpp in Sources */, 2689001713353DDE00698AC0 /* CommandObjectDisassemble.cpp in Sources */, 2689001813353DDE00698AC0 /* CommandObjectExpression.cpp in Sources */, - 2689001913353DDE00698AC0 /* CommandObjectFile.cpp in Sources */, 2689001A13353DDE00698AC0 /* CommandObjectFrame.cpp in Sources */, 2689001B13353DDE00698AC0 /* CommandObjectHelp.cpp in Sources */, 2689001C13353DDE00698AC0 /* CommandObjectImage.cpp in Sources */, @@ -3130,6 +3134,8 @@ 2671A0D013482601003A87BB /* ConnectionMachPort.cpp in Sources */, 4CABA9E0134A8BCD00539BDD /* ValueObjectMemory.cpp in Sources */, 4CD0BD0F134BFADF00CB44D4 /* ValueObjectDynamicValue.cpp in Sources */, + 26D5E15F135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp in Sources */, + 26D5E163135BB054006EA0A7 /* OptionGroupPlatform.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: lldb/trunk/source/Commands/CommandObjectExpression.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectExpression.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectExpression.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectExpression.cpp Mon Apr 18 03:33:37 2011 @@ -13,7 +13,6 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "CommandObjectThread.h" // For DisplayThreadInfo. #include "lldb/Interpreter/Args.h" #include "lldb/Core/Value.h" #include "lldb/Core/InputReader.h" @@ -32,6 +31,7 @@ #include "lldb/Target/Process.h" #include "lldb/Target/StackFrame.h" #include "lldb/Target/Target.h" +#include "lldb/Target/Thread.h" #include "llvm/ADT/StringRef.h" using namespace lldb; @@ -281,10 +281,25 @@ if (exe_results == eExecutionInterrupted && !m_options.unwind_on_error) { + uint32_t start_frame = 0; + uint32_t num_frames = 1; + uint32_t num_frames_with_source = 0; if (m_exe_ctx.thread) - lldb_private::DisplayThreadInfo (m_interpreter, result->GetOutputStream(), m_exe_ctx.thread, false, true); - else - lldb_private::DisplayThreadsInfo (m_interpreter, &m_exe_ctx, *result, true, true); + { + m_exe_ctx.thread->GetStatus (result->GetOutputStream(), + start_frame, + num_frames, + num_frames_with_source); + } + else if (m_exe_ctx.process) + { + bool only_threads_with_stop_reason = true; + m_exe_ctx.process->GetThreadStatus (result->GetOutputStream(), + only_threads_with_stop_reason, + start_frame, + num_frames, + num_frames_with_source); + } } if (result_valobj_sp) Removed: lldb/trunk/source/Commands/CommandObjectFile.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectFile.cpp?rev=129694&view=auto ============================================================================== --- lldb/trunk/source/Commands/CommandObjectFile.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectFile.cpp (removed) @@ -1,235 +0,0 @@ -//===-- CommandObjectFile.cpp -----------------------------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#include "CommandObjectFile.h" - -// C Includes -// C++ Includes -// Other libraries and framework includes -// Project includes -#include "lldb/Interpreter/Args.h" -#include "lldb/Core/Debugger.h" -#include "lldb/Core/Timer.h" -#include "lldb/Core/Debugger.h" -#include "lldb/Interpreter/CommandInterpreter.h" -#include "lldb/Interpreter/CommandReturnObject.h" -#include "lldb/Interpreter/CommandCompletions.h" -#include "lldb/Target/Process.h" - -using namespace lldb; -using namespace lldb_private; - -FileOptionGroup::FileOptionGroup() : - m_arch_str () -{ -} - -FileOptionGroup::~FileOptionGroup () -{ -} - -OptionDefinition g_file_option_table[] = -{ - { LLDB_OPT_SET_1 , false, "arch" , 'a', required_argument, NULL, 0, eArgTypeArchitecture , "Specify the architecture for the target."}, -}; -const uint32_t k_num_file_options = sizeof(g_file_option_table)/sizeof(OptionDefinition); - -uint32_t -FileOptionGroup::GetNumDefinitions () -{ - return k_num_file_options; -} - -const OptionDefinition * -FileOptionGroup::GetDefinitions () -{ - return g_file_option_table; -} - -bool -FileOptionGroup::GetArchitecture (Platform *platform, ArchSpec &arch) -{ - if (m_arch_str.empty()) - arch.Clear(); - else - arch.SetTriple(m_arch_str.c_str(), platform); - return arch.IsValid(); -} - - -Error -FileOptionGroup::SetOptionValue (CommandInterpreter &interpreter, - uint32_t option_idx, - const char *option_arg) -{ - Error error; - char short_option = (char) g_file_option_table[option_idx].short_option; - - switch (short_option) - { - case 'a': - m_arch_str.assign (option_arg); - break; - - default: - error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option); - break; - } - - return error; -} - -void -FileOptionGroup::OptionParsingStarting (CommandInterpreter &interpreter) -{ - m_arch_str.clear(); -} - -//------------------------------------------------------------------------- -// CommandObjectFile -//------------------------------------------------------------------------- - -CommandObjectFile::CommandObjectFile(CommandInterpreter &interpreter) : - CommandObject (interpreter, - "file", - "Set the file to be used as the main executable by the debugger.", - NULL), - m_option_group (interpreter), - m_file_options (), - m_platform_options(true) // Do include the "--platform" option in the platform settings by passing true -{ - CommandArgumentEntry arg; - CommandArgumentData file_arg; - - // Define the first (and only) variant of this arg. - file_arg.arg_type = eArgTypeFilename; - file_arg.arg_repetition = eArgRepeatPlain; - - // There is only one variant this argument could be; put it into the argument entry. - arg.push_back (file_arg); - - // Push the data for the first argument into the m_arguments vector. - m_arguments.push_back (arg); - - m_option_group.Append (&m_file_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1); - m_option_group.Append (&m_platform_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1); - m_option_group.Finalize(); -} - -CommandObjectFile::~CommandObjectFile () -{ -} - -Options * -CommandObjectFile::GetOptions () -{ - return &m_option_group; -} - -bool -CommandObjectFile::Execute -( - Args& command, - CommandReturnObject &result -) -{ - const char *file_path = command.GetArgumentAtIndex(0); - Timer scoped_timer(__PRETTY_FUNCTION__, "(lldb) file '%s'", file_path); - const int argc = command.GetArgumentCount(); - if (argc == 1) - { - FileSpec file_spec (file_path, true); - - bool select = true; - PlatformSP platform_sp; - - Error error; - - if (!m_platform_options.platform_name.empty()) - { - platform_sp = m_platform_options.CreatePlatformWithOptions(m_interpreter, select, error); - if (!platform_sp) - { - result.AppendError(error.AsCString()); - result.SetStatus (eReturnStatusFailed); - return false; - } - } - ArchSpec file_arch; - - if (!m_file_options.m_arch_str.empty()) - { - if (!platform_sp) - platform_sp = m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform(); - if (!m_file_options.GetArchitecture(platform_sp.get(), file_arch)) - { - result.AppendErrorWithFormat("invalid architecture '%s'", m_file_options.m_arch_str.c_str()); - result.SetStatus (eReturnStatusFailed); - return false; - } - } - - if (! file_spec.Exists() && !file_spec.ResolveExecutableLocation()) - { - result.AppendErrorWithFormat ("File '%s' does not exist.\n", file_path); - result.SetStatus (eReturnStatusFailed); - return false; - } - - TargetSP target_sp; - Debugger &debugger = m_interpreter.GetDebugger(); - error = debugger.GetTargetList().CreateTarget (debugger, file_spec, file_arch, true, target_sp); - - if (target_sp) - { - debugger.GetTargetList().SetSelectedTarget(target_sp.get()); - result.AppendMessageWithFormat ("Current executable set to '%s' (%s).\n", file_path, target_sp->GetArchitecture().GetArchitectureName()); - result.SetStatus (eReturnStatusSuccessFinishNoResult); - } - else - { - result.AppendError(error.AsCString()); - result.SetStatus (eReturnStatusFailed); - } - } - else - { - result.AppendErrorWithFormat("'%s' takes exactly one executable path argument.\n", m_cmd_name.c_str()); - result.SetStatus (eReturnStatusFailed); - } - return result.Succeeded(); - -} - -int -CommandObjectFile::HandleArgumentCompletion -( - Args &input, - int &cursor_index, - int &cursor_char_position, - OptionElementVector &opt_element_vector, - int match_start_point, - int max_return_elements, - bool &word_complete, - StringList &matches -) -{ - std::string completion_str (input.GetArgumentAtIndex(cursor_index)); - completion_str.erase (cursor_char_position); - - CommandCompletions::InvokeCommonCompletionCallbacks (m_interpreter, - CommandCompletions::eDiskFileCompletion, - completion_str.c_str(), - match_start_point, - max_return_elements, - NULL, - word_complete, - matches); - return matches.GetSize(); -} Removed: lldb/trunk/source/Commands/CommandObjectFile.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectFile.h?rev=129694&view=auto ============================================================================== --- lldb/trunk/source/Commands/CommandObjectFile.h (original) +++ lldb/trunk/source/Commands/CommandObjectFile.h (removed) @@ -1,95 +0,0 @@ -//===-- CommandObjectFile.h -------------------------------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef liblldb_CommandObjectFile_h_ -#define liblldb_CommandObjectFile_h_ - -// C Includes -// C++ Includes -#include -// Other libraries and framework includes -// Project includes -#include "lldb/Interpreter/Options.h" -#include "lldb/Core/ArchSpec.h" -#include "lldb/Interpreter/CommandObject.h" -#include "CommandObjectPlatform.h" - -namespace lldb_private { - -//------------------------------------------------------------------------- -// CommandObjectFile -//------------------------------------------------------------------------- - -class FileOptionGroup : public OptionGroup -{ -public: - - FileOptionGroup (); - - virtual - ~FileOptionGroup (); - - - virtual uint32_t - GetNumDefinitions (); - - virtual const OptionDefinition* - GetDefinitions (); - - virtual Error - SetOptionValue (CommandInterpreter &interpreter, - uint32_t option_idx, - const char *option_value); - - virtual void - OptionParsingStarting (CommandInterpreter &interpreter); - - bool - GetArchitecture (Platform *platform, ArchSpec &arch); - - std::string m_arch_str; // Save the arch triple in case a platform is specified after the architecture -}; - -class CommandObjectFile : public CommandObject -{ -public: - - CommandObjectFile (CommandInterpreter &interpreter); - - virtual - ~CommandObjectFile (); - - virtual bool - Execute (Args& command, - CommandReturnObject &result); - - virtual Options * - GetOptions (); - - - virtual int - HandleArgumentCompletion (Args &input, - int &cursor_index, - int &cursor_char_position, - OptionElementVector &opt_element_vector, - int match_start_point, - int max_return_elements, - bool &word_complete, - StringList &matches); - - -private: - OptionGroupOptions m_option_group; - FileOptionGroup m_file_options; - PlatformOptionGroup m_platform_options; -}; - -} // namespace lldb_private - -#endif // liblldb_CommandObjectFile_h_ Modified: lldb/trunk/source/Commands/CommandObjectFrame.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectFrame.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectFrame.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectFrame.cpp Mon Apr 18 03:33:37 2011 @@ -37,8 +37,6 @@ #include "lldb/Target/Thread.h" #include "lldb/Target/Target.h" -#include "CommandObjectThread.h" - using namespace lldb; using namespace lldb_private; @@ -243,14 +241,15 @@ already_shown = Host::OpenFileInExternalEditor (frame_sc.line_entry.file, frame_sc.line_entry.line); } - if (DisplayFrameForExecutionContext (exe_ctx.thread, - exe_ctx.frame, - m_interpreter, - result.GetOutputStream(), - true, - !already_shown, - 3, - 3)) + bool show_frame_info = true; + bool show_source = !already_shown; + uint32_t source_lines_before = 3; + uint32_t source_lines_after = 3; + if (exe_ctx.frame->GetStatus(result.GetOutputStream(), + show_frame_info, + show_source, + source_lines_before, + source_lines_after)) { result.SetStatus (eReturnStatusSuccessFinishResult); return result.Succeeded(); Modified: lldb/trunk/source/Commands/CommandObjectPlatform.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectPlatform.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectPlatform.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectPlatform.cpp Mon Apr 18 03:33:37 2011 @@ -19,7 +19,7 @@ #include "lldb/Interpreter/Args.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Interpreter/CommandReturnObject.h" -#include "lldb/Interpreter/Options.h" +#include "lldb/Interpreter/OptionGroupPlatform.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Platform.h" #include "lldb/Target/Process.h" @@ -28,94 +28,8 @@ using namespace lldb_private; -PlatformSP -PlatformOptionGroup::CreatePlatformWithOptions (CommandInterpreter &interpreter, bool select, Error& error) -{ - PlatformSP platform_sp; - if (!platform_name.empty()) - { - platform_sp = Platform::Create (platform_name.c_str(), error); - - if (platform_sp) - { - interpreter.GetDebugger().GetPlatformList().Append (platform_sp, select); - if (os_version_major != UINT32_MAX) - { - platform_sp->SetOSVersion (os_version_major, - os_version_minor, - os_version_update); - } - } - } - return platform_sp; -} - -void -PlatformOptionGroup::OptionParsingStarting (CommandInterpreter &interpreter) -{ - platform_name.clear(); - os_version_major = UINT32_MAX; - os_version_minor = UINT32_MAX; - os_version_update = UINT32_MAX; -} - -static OptionDefinition -g_option_table[] = -{ - { LLDB_OPT_SET_ALL, false, "platform" , 'p', required_argument, NULL, 0, eArgTypePlatform, "Specify name of the platform to use for this target, creating the platform if necessary."}, - { LLDB_OPT_SET_ALL, false, "sdk-version", 'v', required_argument, NULL, 0, eArgTypeNone, "Specify the initial SDK version to use prior to connecting." } -}; - -static const uint32_t k_option_table_size = sizeof(g_option_table)/sizeof (OptionDefinition); - -const OptionDefinition* -PlatformOptionGroup::GetDefinitions () -{ - if (m_include_platform_option) - return g_option_table; - return g_option_table + 1; -} - -uint32_t -PlatformOptionGroup::GetNumDefinitions () -{ - if (m_include_platform_option) - return k_option_table_size; - return k_option_table_size - 1; -} - - -Error -PlatformOptionGroup::SetOptionValue (CommandInterpreter &interpreter, - uint32_t option_idx, - const char *option_arg) -{ - Error error; - if (!m_include_platform_option) - --option_idx; - - char short_option = (char) g_option_table[option_idx].short_option; - - switch (short_option) - { - case 'p': - platform_name.assign (option_arg); - break; - - case 'v': - if (Args::StringToVersion (option_arg, os_version_major, os_version_minor, os_version_update) == option_arg) - error.SetErrorStringWithFormat ("invalid version string '%s'", option_arg); - break; - - default: - error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option); - break; - } - return error; -} - //---------------------------------------------------------------------- -// "platform create " +// "platform select " //---------------------------------------------------------------------- class CommandObjectPlatformSelect : public CommandObject { @@ -147,7 +61,7 @@ if (platform_name && platform_name[0]) { const bool select = true; - m_platform_options.platform_name.assign (platform_name); + m_platform_options.SetPlatformName (platform_name); Error error; PlatformSP platform_sp (m_platform_options.CreatePlatformWithOptions (m_interpreter, select, error)); if (platform_sp) @@ -175,6 +89,29 @@ return result.Succeeded(); } + + virtual int + HandleCompletion (Args &input, + int &cursor_index, + int &cursor_char_position, + int match_start_point, + int max_return_elements, + bool &word_complete, + StringList &matches) + { + std::string completion_str (input.GetArgumentAtIndex(cursor_index)); + completion_str.erase (cursor_char_position); + + CommandCompletions::PlatformPluginNames (m_interpreter, + completion_str.c_str(), + match_start_point, + max_return_elements, + NULL, + word_complete, + matches); + return matches.GetSize(); + } + virtual Options * GetOptions () { @@ -183,7 +120,7 @@ protected: OptionGroupOptions m_option_group; - PlatformOptionGroup m_platform_options; + OptionGroupPlatform m_platform_options; }; //---------------------------------------------------------------------- Modified: lldb/trunk/source/Commands/CommandObjectPlatform.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectPlatform.h?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectPlatform.h (original) +++ lldb/trunk/source/Commands/CommandObjectPlatform.h Mon Apr 18 03:33:37 2011 @@ -35,64 +35,6 @@ DISALLOW_COPY_AND_ASSIGN (CommandObjectPlatform); }; - -//------------------------------------------------------------------------- -// PlatformOptionGroup -// -// Make platform options available to to any other command in case they -// need them. The "file" command needs them, and by exposing them we can -// reuse the platform command options for any command, we can keep things -// consistent. -//------------------------------------------------------------------------- -class PlatformOptionGroup : public OptionGroup -{ -public: - - PlatformOptionGroup (bool include_platform_option) : - platform_name (), - os_version_major (UINT32_MAX), - os_version_minor (UINT32_MAX), - os_version_update (UINT32_MAX), - m_include_platform_option (include_platform_option) - { - } - - virtual - ~PlatformOptionGroup () - { - } - - virtual uint32_t - GetNumDefinitions (); - - virtual const OptionDefinition* - GetDefinitions (); - - virtual Error - SetOptionValue (CommandInterpreter &interpreter, - uint32_t option_idx, - const char *option_value); - - lldb::PlatformSP - CreatePlatformWithOptions (CommandInterpreter &interpreter, - bool select, - Error &error); - - virtual void - OptionParsingStarting (CommandInterpreter &interpreter); - - // Instance variables to hold the values for command options. - - std::string platform_name; - uint32_t os_version_major; - uint32_t os_version_minor; - uint32_t os_version_update; -protected: - bool m_include_platform_option; -}; - - - } // namespace lldb_private #endif // liblldb_CommandObjectPlatform_h_ Modified: lldb/trunk/source/Commands/CommandObjectProcess.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectProcess.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectProcess.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectProcess.cpp Mon Apr 18 03:33:37 2011 @@ -16,10 +16,9 @@ #include "lldb/Interpreter/Args.h" #include "lldb/Interpreter/Options.h" #include "lldb/Core/State.h" +#include "lldb/Host/Host.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Interpreter/CommandReturnObject.h" -#include "CommandObjectThread.h" -#include "lldb/Host/Host.h" #include "lldb/Target/Platform.h" #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" @@ -1491,52 +1490,26 @@ CommandReturnObject &result ) { - Stream &output_stream = result.GetOutputStream(); + Stream &strm = result.GetOutputStream(); result.SetStatus (eReturnStatusSuccessFinishNoResult); ExecutionContext exe_ctx(m_interpreter.GetExecutionContext()); if (exe_ctx.process) { - const StateType state = exe_ctx.process->GetState(); - if (StateIsStoppedState(state)) - { - if (state == eStateExited) - { - int exit_status = exe_ctx.process->GetExitStatus(); - const char *exit_description = exe_ctx.process->GetExitDescription(); - output_stream.Printf ("Process %d exited with status = %i (0x%8.8x) %s\n", - exe_ctx.process->GetID(), - exit_status, - exit_status, - exit_description ? exit_description : ""); - } - else - { - if (state == eStateConnected) - output_stream.Printf ("Connected to remote target.\n"); - else - output_stream.Printf ("Process %d %s\n", exe_ctx.process->GetID(), StateAsCString (state)); - if (exe_ctx.thread == NULL) - exe_ctx.thread = exe_ctx.process->GetThreadList().GetThreadAtIndex(0).get(); - if (exe_ctx.thread != NULL) - { - DisplayThreadsInfo (m_interpreter, &exe_ctx, result, true, true); - } - else - { - result.AppendError ("No valid thread found in current process."); - result.SetStatus (eReturnStatusFailed); - } - } - } - else - { - output_stream.Printf ("Process %d is running.\n", - exe_ctx.process->GetID()); - } + const bool only_threads_with_stop_reason = true; + const uint32_t start_frame = 0; + const uint32_t num_frames = 1; + const uint32_t num_frames_with_source = 1; + exe_ctx.process->GetStatus(strm); + exe_ctx.process->GetThreadStatus (strm, + only_threads_with_stop_reason, + start_frame, + num_frames, + num_frames_with_source); + } else { - result.AppendError ("No current location or status available."); + result.AppendError ("No process."); result.SetStatus (eReturnStatusFailed); } return result.Succeeded(); Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectTarget.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Mon Apr 18 03:33:37 2011 @@ -18,9 +18,12 @@ #include "lldb/Interpreter/Args.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/InputReader.h" +#include "lldb/Core/State.h" #include "lldb/Core/Timer.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Interpreter/CommandReturnObject.h" +#include "lldb/Interpreter/OptionGroupArchitecture.h" +#include "lldb/Interpreter/OptionGroupPlatform.h" #include "lldb/Target/Process.h" #include "lldb/Target/StackFrame.h" #include "lldb/Target/Thread.h" @@ -29,6 +32,360 @@ using namespace lldb; using namespace lldb_private; + + +static void +DumpTargetInfo (uint32_t target_idx, Target *target, const char *prefix_cstr, bool show_stopped_process_status, Stream &strm) +{ + ArchSpec &target_arch = target->GetArchitecture(); + + ModuleSP exe_module_sp (target->GetExecutableModule ()); + char exe_path[PATH_MAX]; + bool exe_valid = false; + if (exe_module_sp) + exe_valid = exe_module_sp->GetFileSpec().GetPath (exe_path, sizeof(exe_path)); + + if (!exe_valid) + ::strcpy (exe_path, ""); + + strm.Printf ("%starget #%u: %s", prefix_cstr ? prefix_cstr : "", target_idx, exe_path); + + uint32_t properties = 0; + if (target_arch.IsValid()) + { + strm.Printf ("%sarch=%s", properties++ > 0 ? ", " : " ( ", target_arch.GetTriple().str().c_str()); + properties++; + } + PlatformSP platform_sp (target->GetPlatform()); + if (platform_sp) + strm.Printf ("%splatform=%s", properties++ > 0 ? ", " : " ( ", platform_sp->GetName()); + + ProcessSP process_sp (target->GetProcessSP()); + bool show_process_status = false; + if (process_sp) + { + lldb::pid_t pid = process_sp->GetID(); + StateType state = process_sp->GetState(); + if (show_stopped_process_status) + show_process_status = StateIsStoppedState(state); + const char *state_cstr = StateAsCString (state); + if (pid != LLDB_INVALID_PROCESS_ID) + strm.Printf ("%spid=%i", properties++ > 0 ? ", " : " ( ", pid); + strm.Printf ("%sstate=%s", properties++ > 0 ? ", " : " ( ", state_cstr); + } + if (properties > 0) + strm.PutCString (" )\n"); + else + strm.EOL(); + if (show_process_status) + { + const bool only_threads_with_stop_reason = true; + const uint32_t start_frame = 0; + const uint32_t num_frames = 1; + const uint32_t num_frames_with_source = 1; + process_sp->GetStatus (strm); + process_sp->GetThreadStatus (strm, + only_threads_with_stop_reason, + start_frame, + num_frames, + num_frames_with_source); + + } +} + +static uint32_t +DumpTargetList (TargetList &target_list, bool show_stopped_process_status, Stream &strm) +{ + const uint32_t num_targets = target_list.GetNumTargets(); + if (num_targets) + { + TargetSP selected_target_sp (target_list.GetSelectedTarget()); + strm.PutCString ("Current targets:\n"); + for (uint32_t i=0; iGetArchitecture().GetArchitectureName()); + result.SetStatus (eReturnStatusSuccessFinishNoResult); + } + else + { + result.AppendError(error.AsCString()); + result.SetStatus (eReturnStatusFailed); + } + } + else + { + result.AppendErrorWithFormat("'%s' takes exactly one executable path argument.\n", m_cmd_name.c_str()); + result.SetStatus (eReturnStatusFailed); + } + return result.Succeeded(); + + } + + int + HandleArgumentCompletion (Args &input, + int &cursor_index, + int &cursor_char_position, + OptionElementVector &opt_element_vector, + int match_start_point, + int max_return_elements, + bool &word_complete, + StringList &matches) + { + std::string completion_str (input.GetArgumentAtIndex(cursor_index)); + completion_str.erase (cursor_char_position); + + CommandCompletions::InvokeCommonCompletionCallbacks (m_interpreter, + CommandCompletions::eDiskFileCompletion, + completion_str.c_str(), + match_start_point, + max_return_elements, + NULL, + word_complete, + matches); + return matches.GetSize(); + } +private: + OptionGroupOptions m_option_group; + OptionGroupArchitecture m_file_options; + OptionGroupPlatform m_platform_options; + +}; + +#pragma mark CommandObjectTargetList + +//---------------------------------------------------------------------- +// "target list" +//---------------------------------------------------------------------- + +class CommandObjectTargetList : public CommandObject +{ +public: + CommandObjectTargetList (CommandInterpreter &interpreter) : + CommandObject (interpreter, + "target list", + "List all current targets in the current debug session.", + NULL, + 0) + { + } + + virtual + ~CommandObjectTargetList () + { + } + + virtual bool + Execute (Args& args, CommandReturnObject &result) + { + if (args.GetArgumentCount() == 0) + { + Stream &strm = result.GetOutputStream(); + + bool show_stopped_process_status = false; + if (DumpTargetList (m_interpreter.GetDebugger().GetTargetList(), show_stopped_process_status, strm) == 0) + { + strm.PutCString ("No targets.\n"); + } + } + else + { + result.AppendError ("the 'target list' command takes no arguments\n"); + result.SetStatus (eReturnStatusFailed); + } + return result.Succeeded(); + } +}; + + +#pragma mark CommandObjectTargetSelect + +//---------------------------------------------------------------------- +// "target select" +//---------------------------------------------------------------------- + +class CommandObjectTargetSelect : public CommandObject +{ +public: + CommandObjectTargetSelect (CommandInterpreter &interpreter) : + CommandObject (interpreter, + "target select", + "Select a target as the current target by target index.", + NULL, + 0) + { + } + + virtual + ~CommandObjectTargetSelect () + { + } + + virtual bool + Execute (Args& args, CommandReturnObject &result) + { + if (args.GetArgumentCount() == 1) + { + bool success = false; + const char *target_idx_arg = args.GetArgumentAtIndex(0); + uint32_t target_idx = Args::StringToUInt32 (target_idx_arg, UINT32_MAX, 0, &success); + if (success) + { + TargetList &target_list = m_interpreter.GetDebugger().GetTargetList(); + const uint32_t num_targets = target_list.GetNumTargets(); + if (target_idx < num_targets) + { + TargetSP target_sp (target_list.GetTargetAtIndex (target_idx)); + if (target_sp) + { + Stream &strm = result.GetOutputStream(); + target_list.SetSelectedTarget (target_sp.get()); + bool show_stopped_process_status = false; + DumpTargetList (target_list, show_stopped_process_status, strm); + } + else + { + result.AppendErrorWithFormat ("target #%u is NULL in target list\n", target_idx); + result.SetStatus (eReturnStatusFailed); + } + } + else + { + result.AppendErrorWithFormat ("index %u is out of range, valid target indexes are 0 - %u\n", + target_idx, + num_targets - 1); + result.SetStatus (eReturnStatusFailed); + } + } + else + { + result.AppendErrorWithFormat("invalid index string value '%s'\n", target_idx_arg); + result.SetStatus (eReturnStatusFailed); + } + } + else + { + result.AppendError ("'target select' takes a single argument: a target index\n"); + result.SetStatus (eReturnStatusFailed); + } + return result.Succeeded(); + } +}; + + #pragma mark CommandObjectTargetImageSearchPaths class CommandObjectTargetImageSearchPathsAdd : public CommandObject @@ -77,7 +434,7 @@ uint32_t argc = command.GetArgumentCount(); if (argc & 1) { - result.AppendError ("add requires an even number of arguments"); + result.AppendError ("add requires an even number of arguments\n"); result.SetStatus (eReturnStatusFailed); } else @@ -98,9 +455,9 @@ else { if (from[0]) - result.AppendError (" can't be empty"); + result.AppendError (" can't be empty\n"); else - result.AppendError (" can't be empty"); + result.AppendError (" can't be empty\n"); result.SetStatus (eReturnStatusFailed); } } @@ -108,7 +465,7 @@ } else { - result.AppendError ("invalid target"); + result.AppendError ("invalid target\n"); result.SetStatus (eReturnStatusFailed); } return result.Succeeded(); @@ -144,7 +501,7 @@ } else { - result.AppendError ("invalid target"); + result.AppendError ("invalid target\n"); result.SetStatus (eReturnStatusFailed); } return result.Succeeded(); @@ -241,9 +598,9 @@ else { if (from[0]) - result.AppendError (" can't be empty"); + result.AppendError (" can't be empty\n"); else - result.AppendError (" can't be empty"); + result.AppendError (" can't be empty\n"); result.SetStatus (eReturnStatusFailed); return false; } @@ -251,7 +608,7 @@ } else { - result.AppendError ("insert requires at least three arguments"); + result.AppendError ("insert requires at least three arguments\n"); result.SetStatus (eReturnStatusFailed); return result.Succeeded(); } @@ -259,7 +616,7 @@ } else { - result.AppendError ("invalid target"); + result.AppendError ("invalid target\n"); result.SetStatus (eReturnStatusFailed); } return result.Succeeded(); @@ -291,7 +648,7 @@ { if (command.GetArgumentCount() != 0) { - result.AppendError ("list takes no arguments"); + result.AppendError ("list takes no arguments\n"); result.SetStatus (eReturnStatusFailed); return result.Succeeded(); } @@ -301,7 +658,7 @@ } else { - result.AppendError ("invalid target"); + result.AppendError ("invalid target\n"); result.SetStatus (eReturnStatusFailed); } return result.Succeeded(); @@ -345,7 +702,7 @@ { if (command.GetArgumentCount() != 1) { - result.AppendError ("query requires one argument"); + result.AppendError ("query requires one argument\n"); result.SetStatus (eReturnStatusFailed); return result.Succeeded(); } @@ -361,7 +718,7 @@ } else { - result.AppendError ("invalid target"); + result.AppendError ("invalid target\n"); result.SetStatus (eReturnStatusFailed); } return result.Succeeded(); @@ -790,7 +1147,7 @@ InputReaderSP reader_sp (new InputReader(m_interpreter.GetDebugger())); if (!reader_sp) { - result.AppendError("out of memory"); + result.AppendError("out of memory\n"); result.SetStatus (eReturnStatusFailed); target->RemoveStopHookByID (new_hook_sp->GetID()); return false; @@ -815,7 +1172,7 @@ } else { - result.AppendError ("invalid target"); + result.AppendError ("invalid target\n"); result.SetStatus (eReturnStatusFailed); } @@ -902,14 +1259,14 @@ lldb::user_id_t user_id = Args::StringToUInt32 (command.GetArgumentAtIndex(i), 0, 0, &success); if (!success) { - result.AppendErrorWithFormat ("invalid stop hook id: \"%s\".", command.GetArgumentAtIndex(i)); + result.AppendErrorWithFormat ("invalid stop hook id: \"%s\".\n", command.GetArgumentAtIndex(i)); result.SetStatus(eReturnStatusFailed); return false; } success = target->RemoveStopHookByID (user_id); if (!success) { - result.AppendErrorWithFormat ("unknown stop hook id: \"%s\".", command.GetArgumentAtIndex(i)); + result.AppendErrorWithFormat ("unknown stop hook id: \"%s\".\n", command.GetArgumentAtIndex(i)); result.SetStatus(eReturnStatusFailed); return false; } @@ -919,7 +1276,7 @@ } else { - result.AppendError ("invalid target"); + result.AppendError ("invalid target\n"); result.SetStatus (eReturnStatusFailed); } @@ -971,14 +1328,14 @@ lldb::user_id_t user_id = Args::StringToUInt32 (command.GetArgumentAtIndex(i), 0, 0, &success); if (!success) { - result.AppendErrorWithFormat ("invalid stop hook id: \"%s\".", command.GetArgumentAtIndex(i)); + result.AppendErrorWithFormat ("invalid stop hook id: \"%s\".\n", command.GetArgumentAtIndex(i)); result.SetStatus(eReturnStatusFailed); return false; } success = target->SetStopHookActiveStateByID (user_id, m_enable); if (!success) { - result.AppendErrorWithFormat ("unknown stop hook id: \"%s\".", command.GetArgumentAtIndex(i)); + result.AppendErrorWithFormat ("unknown stop hook id: \"%s\".\n", command.GetArgumentAtIndex(i)); result.SetStatus(eReturnStatusFailed); return false; } @@ -988,7 +1345,7 @@ } else { - result.AppendError ("invalid target"); + result.AppendError ("invalid target\n"); result.SetStatus (eReturnStatusFailed); } return result.Succeeded(); @@ -1032,7 +1389,7 @@ } else { - result.AppendError ("invalid target"); + result.AppendError ("invalid target\n"); result.SetStatus (eReturnStatusFailed); } @@ -1104,11 +1461,16 @@ "A set of commands for operating on debugger targets.", "target []") { - LoadSubCommand ("image-search-paths", CommandObjectSP (new CommandObjectMultiwordImageSearchPaths (interpreter))); + + LoadSubCommand ("create", CommandObjectSP (new CommandObjectTargetCreate (interpreter))); + LoadSubCommand ("list", CommandObjectSP (new CommandObjectTargetList (interpreter))); + LoadSubCommand ("select", CommandObjectSP (new CommandObjectTargetSelect (interpreter))); LoadSubCommand ("stop-hook", CommandObjectSP (new CommandObjectMultiwordTargetStopHooks (interpreter))); + LoadSubCommand ("image-search-paths", CommandObjectSP (new CommandObjectMultiwordImageSearchPaths (interpreter))); } CommandObjectMultiwordTarget::~CommandObjectMultiwordTarget () { } + Modified: lldb/trunk/source/Commands/CommandObjectThread.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectThread.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectThread.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectThread.cpp Mon Apr 18 03:33:37 2011 @@ -38,205 +38,6 @@ using namespace lldb_private; -bool -lldb_private::DisplayThreadInfo -( - CommandInterpreter &interpreter, - Stream &strm, - Thread *thread, - bool only_threads_with_stop_reason, - bool show_source -) -{ - if (thread) - { - if (only_threads_with_stop_reason) - { - if (thread->GetStopInfo() == NULL) - return false; - } - - strm.Indent(); - strm.Printf("%c ", thread->GetProcess().GetThreadList().GetSelectedThread().get() == thread ? '*' : ' '); - - // Show one frame with only the first showing source - if (show_source) - { - bool already_shown = false; - StackFrameSP frame_sp = thread->GetStackFrameAtIndex(0); - SymbolContext frame_sc(frame_sp->GetSymbolContext (eSymbolContextLineEntry)); - if (interpreter.GetDebugger().GetUseExternalEditor() && frame_sc.line_entry.file && frame_sc.line_entry.line != 0) - { - already_shown = Host::OpenFileInExternalEditor (frame_sc.line_entry.file, frame_sc.line_entry.line); - } - - DisplayFramesForExecutionContext (thread, - interpreter, - strm, - 0, // Start at first frame - 1, // Number of frames to show - false,// Don't show the frame info since we already displayed most of it above... - !already_shown, // Show source for the first frame - 3, // lines of source context before - 3); // lines of source context after - } - else - { - thread->DumpUsingSettingsFormat (strm, 0); - } - - return true; - } - return false; -} - -size_t -lldb_private::DisplayThreadsInfo -( - CommandInterpreter &interpreter, - ExecutionContext *exe_ctx, - CommandReturnObject &result, - bool only_threads_with_stop_reason, - bool show_source -) -{ - StreamString strm; - - size_t num_thread_infos_dumped = 0; - - if (!exe_ctx->process) - return 0; - - const size_t num_threads = exe_ctx->process->GetThreadList().GetSize(); - if (num_threads > 0) - { - - for (uint32_t i = 0; i < num_threads; i++) - { - Thread *thread = exe_ctx->process->GetThreadList().GetThreadAtIndex(i).get(); - if (thread) - { - if (DisplayThreadInfo (interpreter, - strm, - thread, - only_threads_with_stop_reason, - show_source)) - ++num_thread_infos_dumped; - } - } - } - - if (num_thread_infos_dumped > 0) - { - if (num_thread_infos_dumped < num_threads) - result.GetOutputStream().Printf("%u of %u threads stopped with reasons:\n", num_thread_infos_dumped, num_threads); - - result.AppendMessage (strm.GetString().c_str()); - result.SetStatus (eReturnStatusSuccessFinishNoResult); - } - return num_thread_infos_dumped; -} - - -size_t -lldb_private::DisplayFramesForExecutionContext -( - Thread *thread, - CommandInterpreter &interpreter, - Stream& strm, - uint32_t first_frame, - uint32_t num_frames, - bool show_frame_info, - uint32_t num_frames_with_source, - uint32_t source_lines_before, - uint32_t source_lines_after -) -{ - if (thread == NULL) - return 0; - - size_t num_frames_displayed = 0; - - if (num_frames == 0) - return 0; - - thread->DumpUsingSettingsFormat (strm, num_frames > 1 ? UINT32_MAX : first_frame); - strm.IndentMore(); - - StackFrameSP frame_sp; - uint32_t frame_idx = 0; - uint32_t last_frame; - - // Don't let the last frame wrap around... - if (num_frames == UINT32_MAX) - last_frame = UINT32_MAX; - else - last_frame = first_frame + num_frames; - - for (frame_idx = first_frame; frame_idx < last_frame; ++frame_idx) - { - frame_sp = thread->GetStackFrameAtIndex (frame_idx); - if (frame_sp.get() == NULL) - break; - - if (DisplayFrameForExecutionContext (thread, - frame_sp.get(), - interpreter, - strm, - show_frame_info, - num_frames_with_source > first_frame - frame_idx, - source_lines_before, - source_lines_after) == false) - break; - - ++num_frames_displayed; - } - - strm.IndentLess(); - return num_frames_displayed; -} - -bool -lldb_private::DisplayFrameForExecutionContext -( - Thread *thread, - StackFrame *frame, - CommandInterpreter &interpreter, - Stream& strm, - bool show_frame_info, - bool show_source, - uint32_t source_lines_before, - uint32_t source_lines_after -) -{ - // thread and frame must be filled in prior to calling this function - if (thread && frame) - { - if (show_frame_info) - { - strm.Indent(); - frame->DumpUsingSettingsFormat (&strm); - } - - SymbolContext sc (frame->GetSymbolContext(eSymbolContextCompUnit | eSymbolContextLineEntry)); - - if (show_source && sc.comp_unit && sc.line_entry.IsValid()) - { - interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers ( - sc.line_entry.file, - sc.line_entry.line, - 3, - 3, - "->", - &strm); - - } - return true; - } - return false; -} - - //------------------------------------------------------------------------- // CommandObjectThreadBacktrace //------------------------------------------------------------------------- @@ -300,7 +101,7 @@ void OptionParsingStarting () { - m_count = -1; + m_count = UINT32_MAX; m_start = 0; } @@ -353,27 +154,21 @@ virtual bool Execute (Args& command, CommandReturnObject &result) - { - - bool show_frame_info = true; - uint32_t num_frames_with_source = 0; // Don't show any frames with source when backtracing - + { result.SetStatus (eReturnStatusSuccessFinishResult); - + Stream &strm = result.GetOutputStream(); + + // Don't show source context when doing backtraces. + const uint32_t num_frames_with_source = 0; if (command.GetArgumentCount() == 0) { ExecutionContext exe_ctx(m_interpreter.GetExecutionContext()); if (exe_ctx.thread) { - if (DisplayFramesForExecutionContext (exe_ctx.thread, - m_interpreter, - result.GetOutputStream(), - m_options.m_start, - m_options.m_count, - show_frame_info, - num_frames_with_source, - 3, - 3)) + if (exe_ctx.thread->GetStatus (strm, + m_options.m_start, + m_options.m_count, + num_frames_with_source)) { result.SetStatus (eReturnStatusSuccessFinishResult); } @@ -391,22 +186,15 @@ for (uint32_t i = 0; i < num_threads; i++) { ThreadSP thread_sp = process->GetThreadList().GetThreadAtIndex(i); - if (!DisplayFramesForExecutionContext (thread_sp.get(), - m_interpreter, - result.GetOutputStream(), - m_options.m_start, - m_options.m_count, - show_frame_info, - num_frames_with_source, - 3, - 3)) + if (thread_sp->GetStatus (strm, + m_options.m_start, + m_options.m_count, + num_frames_with_source)) { result.AppendErrorWithFormat ("error displaying backtrace for thread: \"0x%4.4x\"\n", i); result.SetStatus (eReturnStatusFailed); return false; } - if (i < num_threads - 1) - result.AppendMessage(""); } } else @@ -440,15 +228,10 @@ for (uint32_t i = 0; i < num_args; i++) { - if (!DisplayFramesForExecutionContext (thread_sps[i].get(), - m_interpreter, - result.GetOutputStream(), - m_options.m_start, - m_options.m_count, - show_frame_info, - num_frames_with_source, - 3, - 3)) + if (!thread_sps[i]->GetStatus (strm, + m_options.m_start, + m_options.m_count, + num_frames_with_source)) { result.AppendErrorWithFormat ("error displaying backtrace for thread: \"%s\"\n", command.GetArgumentAtIndex(i)); result.SetStatus (eReturnStatusFailed); @@ -1335,11 +1118,13 @@ process->GetThreadList().SetSelectedThreadByID(new_thread->GetID()); result.SetStatus (eReturnStatusSuccessFinishNoResult); - DisplayThreadInfo (m_interpreter, - result.GetOutputStream(), - new_thread, - false, - true); + const uint32_t start_frame = 0; + const uint32_t num_frames = 1; + const uint32_t num_frames_with_source = 1; + new_thread->GetStatus (result.GetOutputStream(), + start_frame, + num_frames, + num_frames_with_source); return result.Succeeded(); } @@ -1381,41 +1166,16 @@ ExecutionContext exe_ctx(m_interpreter.GetExecutionContext()); if (exe_ctx.process) { - const StateType state = exe_ctx.process->GetState(); - - if (StateIsStoppedState(state)) - { - if (state == eStateExited) - { - int exit_status = exe_ctx.process->GetExitStatus(); - const char *exit_description = exe_ctx.process->GetExitDescription(); - strm.Printf ("Process %d exited with status = %i (0x%8.8x) %s\n", - exe_ctx.process->GetID(), - exit_status, - exit_status, - exit_description ? exit_description : ""); - } - else - { - strm.Printf ("Process %d state is %s\n", exe_ctx.process->GetID(), StateAsCString (state)); - if (exe_ctx.thread == NULL) - exe_ctx.thread = exe_ctx.process->GetThreadList().GetThreadAtIndex(0).get(); - if (exe_ctx.thread != NULL) - { - DisplayThreadsInfo (m_interpreter, &exe_ctx, result, false, false); - } - else - { - result.AppendError ("no valid thread found in current process"); - result.SetStatus (eReturnStatusFailed); - } - } - } - else - { - result.AppendError ("process is currently running"); - result.SetStatus (eReturnStatusFailed); - } + const bool only_threads_with_stop_reason = false; + const uint32_t start_frame = 0; + const uint32_t num_frames = 0; + const uint32_t num_frames_with_source = 0; + exe_ctx.process->GetStatus(strm); + exe_ctx.process->GetThreadStatus (strm, + only_threads_with_stop_reason, + start_frame, + num_frames, + num_frames_with_source); } else { Modified: lldb/trunk/source/Commands/CommandObjectThread.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectThread.h?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectThread.h (original) +++ lldb/trunk/source/Commands/CommandObjectThread.h Mon Apr 18 03:33:37 2011 @@ -29,42 +29,6 @@ }; - -bool -DisplayThreadInfo (CommandInterpreter &interpreter, - Stream &strm, - Thread *thread, - bool only_threads_with_stop_reason, - bool show_source); - -size_t -DisplayThreadsInfo (CommandInterpreter &interpreter, - ExecutionContext *exe_ctx, - CommandReturnObject &result, - bool only_threads_with_stop_reason, - bool show_source); - -size_t -DisplayFramesForExecutionContext (Thread *thread, - CommandInterpreter &interpreter, - Stream& strm, - uint32_t first_frame, - uint32_t num_frames, - bool show_frame_info, - uint32_t num_frames_with_source, - uint32_t source_lines_before, - uint32_t source_lines_after); - -bool -DisplayFrameForExecutionContext (Thread *thread, - StackFrame *frame, - CommandInterpreter &interpreter, - Stream& strm, - bool show_frame_info, - bool show_source, - uint32_t source_lines_before, - uint32_t source_lines_after); - } // namespace lldb_private #endif // liblldb_CommandObjectThread_h_ Modified: lldb/trunk/source/Core/PluginManager.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/PluginManager.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Core/PluginManager.cpp (original) +++ lldb/trunk/source/Core/PluginManager.cpp Mon Apr 18 03:33:37 2011 @@ -1192,7 +1192,7 @@ PlatformInstances::iterator pos, end = instances.end(); for (pos = instances.begin(); pos != end; ++ pos) { - if (name_sref.equals (name)) + if (name_sref.equals (pos->name)) return pos->create_callback; } } @@ -1211,9 +1211,9 @@ PlatformInstances::iterator pos, end = instances.end(); for (pos = instances.begin(); pos != end; ++ pos) { - const char *plugin_name = pos->name.c_str(); - if (name_sref.startswith(plugin_name)) - matches.AppendString (plugin_name); + llvm::StringRef plugin_name (pos->name); + if (plugin_name.startswith(name_sref)) + matches.AppendString (plugin_name.data()); } } return matches.GetSize(); Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original) +++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Mon Apr 18 03:33:37 2011 @@ -19,7 +19,7 @@ //#include "../Commands/CommandObjectCall.h" #include "../Commands/CommandObjectDisassemble.h" #include "../Commands/CommandObjectExpression.h" -#include "../Commands/CommandObjectFile.h" +//#include "../Commands/CommandObjectFile.h" #include "../Commands/CommandObjectFrame.h" #include "../Commands/CommandObjectHelp.h" #include "../Commands/CommandObjectImage.h" @@ -117,6 +117,7 @@ HandleCommand ("command alias po expression -o --", false, result); HandleCommand ("command alias up _regexp-up", false, result); HandleCommand ("command alias down _regexp-down", false, result); + HandleCommand ("command alias file target create", false, result); } @@ -165,7 +166,7 @@ m_command_dict["commands"] = CommandObjectSP (new CommandObjectMultiwordCommands (*this)); m_command_dict["disassemble"] = CommandObjectSP (new CommandObjectDisassemble (*this)); m_command_dict["expression"]= CommandObjectSP (new CommandObjectExpression (*this)); - m_command_dict["file"] = CommandObjectSP (new CommandObjectFile (*this)); +// m_command_dict["file"] = CommandObjectSP (new CommandObjectFile (*this)); m_command_dict["frame"] = CommandObjectSP (new CommandObjectMultiwordFrame (*this)); m_command_dict["help"] = CommandObjectSP (new CommandObjectHelp (*this)); m_command_dict["image"] = CommandObjectSP (new CommandObjectImage (*this)); Added: lldb/trunk/source/Interpreter/OptionGroupArchitecture.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupArchitecture.cpp?rev=129695&view=auto ============================================================================== --- lldb/trunk/source/Interpreter/OptionGroupArchitecture.cpp (added) +++ lldb/trunk/source/Interpreter/OptionGroupArchitecture.cpp Mon Apr 18 03:33:37 2011 @@ -0,0 +1,85 @@ +//===-- OptionGroupArchitecture.cpp -----------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "OptionGroupArchitecture.h" + +// C Includes +// C++ Includes +// Other libraries and framework includes +// Project includes + +using namespace lldb; +using namespace lldb_private; + +OptionGroupArchitecture::OptionGroupArchitecture() : + m_arch_str () +{ +} + +OptionGroupArchitecture::~OptionGroupArchitecture () +{ +} + +OptionDefinition g_file_option_table[] = +{ + { LLDB_OPT_SET_1 , false, "arch" , 'a', required_argument, NULL, 0, eArgTypeArchitecture , "Specify the architecture for the target."}, +}; +const uint32_t k_num_file_options = sizeof(g_file_option_table)/sizeof(OptionDefinition); + +uint32_t +OptionGroupArchitecture::GetNumDefinitions () +{ + return k_num_file_options; +} + +const OptionDefinition * +OptionGroupArchitecture::GetDefinitions () +{ + return g_file_option_table; +} + +bool +OptionGroupArchitecture::GetArchitecture (Platform *platform, ArchSpec &arch) +{ + if (m_arch_str.empty()) + arch.Clear(); + else + arch.SetTriple(m_arch_str.c_str(), platform); + return arch.IsValid(); +} + + +Error +OptionGroupArchitecture::SetOptionValue (CommandInterpreter &interpreter, + uint32_t option_idx, + const char *option_arg) +{ + Error error; + char short_option = (char) g_file_option_table[option_idx].short_option; + + switch (short_option) + { + case 'a': + m_arch_str.assign (option_arg); + break; + + default: + error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option); + break; + } + + return error; +} + +void +OptionGroupArchitecture::OptionParsingStarting (CommandInterpreter &interpreter) +{ + m_arch_str.clear(); +} + Added: lldb/trunk/source/Interpreter/OptionGroupPlatform.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupPlatform.cpp?rev=129695&view=auto ============================================================================== --- lldb/trunk/source/Interpreter/OptionGroupPlatform.cpp (added) +++ lldb/trunk/source/Interpreter/OptionGroupPlatform.cpp Mon Apr 18 03:33:37 2011 @@ -0,0 +1,109 @@ +//===-- OptionGroupPlatform.cpp ---------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "lldb/Interpreter/OptionGroupPlatform.h" + +// C Includes +// C++ Includes +// Other libraries and framework includes +// Project includes +#include "lldb/Interpreter/CommandInterpreter.h" +#include "lldb/Target/Platform.h" + +using namespace lldb; +using namespace lldb_private; + +PlatformSP +OptionGroupPlatform::CreatePlatformWithOptions (CommandInterpreter &interpreter, bool make_selected, Error& error) +{ + PlatformSP platform_sp; + if (!m_platform_name.empty()) + { + platform_sp = Platform::Create (m_platform_name.c_str(), error); + + if (platform_sp) + { + interpreter.GetDebugger().GetPlatformList().Append (platform_sp, make_selected); + if (m_os_version_major != UINT32_MAX) + { + platform_sp->SetOSVersion (m_os_version_major, + m_os_version_minor, + m_os_version_update); + } + } + } + return platform_sp; +} + +void +OptionGroupPlatform::OptionParsingStarting (CommandInterpreter &interpreter) +{ + m_platform_name.clear(); + m_os_version_major = UINT32_MAX; + m_os_version_minor = UINT32_MAX; + m_os_version_update = UINT32_MAX; +} + +static OptionDefinition +g_option_table[] = +{ + { LLDB_OPT_SET_ALL, false, "platform" , 'p', required_argument, NULL, 0, eArgTypePlatform, "Specify name of the platform to use for this target, creating the platform if necessary."}, + { LLDB_OPT_SET_ALL, false, "sdk-version", 'v', required_argument, NULL, 0, eArgTypeNone, "Specify the initial SDK version to use prior to connecting." } +}; + +static const uint32_t k_option_table_size = sizeof(g_option_table)/sizeof (OptionDefinition); + +const OptionDefinition* +OptionGroupPlatform::GetDefinitions () +{ + if (m_include_platform_option) + return g_option_table; + return g_option_table + 1; +} + +uint32_t +OptionGroupPlatform::GetNumDefinitions () +{ + if (m_include_platform_option) + return k_option_table_size; + return k_option_table_size - 1; +} + + +Error +OptionGroupPlatform::SetOptionValue (CommandInterpreter &interpreter, + uint32_t option_idx, + const char *option_arg) +{ + Error error; + if (!m_include_platform_option) + --option_idx; + + char short_option = (char) g_option_table[option_idx].short_option; + + switch (short_option) + { + case 'p': + m_platform_name.assign (option_arg); + break; + + case 'v': + if (Args::StringToVersion (option_arg, + m_os_version_major, + m_os_version_minor, + m_os_version_update) == option_arg) + error.SetErrorStringWithFormat ("invalid version string '%s'", option_arg); + break; + + default: + error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option); + break; + } + return error; +} Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp (original) +++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp Mon Apr 18 03:33:37 2011 @@ -76,9 +76,11 @@ InstructionLLVM::InstructionLLVM (const Address &addr, AddressClass addr_class, - EDDisassemblerRef disassembler) : + EDDisassemblerRef disassembler, + bool force_raw) : Instruction (addr, addr_class), - m_disassembler (disassembler) + m_disassembler (disassembler), + m_force_raw (force_raw) { } @@ -153,6 +155,9 @@ int numTokens = -1; if (!raw) + raw = m_force_raw; + + if (!raw) numTokens = EDNumTokens(m_inst); int currentOpIndex = -1; @@ -471,9 +476,20 @@ if (inst_address_class == eAddressClassCodeAlternateISA) use_thumb = true; } + bool force_raw = false; + switch (m_arch.GetMachine()) + { + case llvm::Triple::arm: + case llvm::Triple::thumb: + force_raw = true; + break; + default: + break; + } InstructionSP inst_sp (new InstructionLLVM (inst_addr, inst_address_class, - use_thumb ? m_disassembler_thumb : m_disassembler)); + use_thumb ? m_disassembler_thumb : m_disassembler, + force_raw)); size_t inst_byte_size = inst_sp->Decode (*this, data, data_offset); Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h (original) +++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h Mon Apr 18 03:33:37 2011 @@ -21,7 +21,8 @@ public: InstructionLLVM (const lldb_private::Address &addr, lldb_private::AddressClass addr_class, - EDDisassemblerRef disassembler); + EDDisassemblerRef disassembler, + bool force_raw); virtual ~InstructionLLVM(); @@ -45,6 +46,7 @@ protected: EDDisassemblerRef m_disassembler; EDInstRef m_inst; + bool m_force_raw; }; Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp (original) +++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp Mon Apr 18 03:33:37 2011 @@ -156,13 +156,6 @@ } } } - else - { - error.SetErrorStringWithFormat ("'%s%s%s' does not exist", - exe_file.GetDirectory().AsCString(""), - exe_file.GetDirectory() ? "/" : "", - exe_file.GetFilename().AsCString("")); - } return error; } Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp (original) +++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp Mon Apr 18 03:33:37 2011 @@ -112,9 +112,9 @@ Platform::GetStatus (strm); const char *sdk_directory = GetDeviceSupportDirectoryForOSVersion(); if (sdk_directory) - strm.Printf ("SDKROOT: \"%s\"\n", sdk_directory); + strm.Printf (" SDK Path: \"%s\"\n", sdk_directory); else - strm.PutCString ("SDKROOT: error: unable to locate SDK\n"); + strm.PutCString (" SDK Path: error: unable to locate SDK\n"); } Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Symbol/ClangASTContext.cpp (original) +++ lldb/trunk/source/Symbol/ClangASTContext.cpp Mon Apr 18 03:33:37 2011 @@ -2318,6 +2318,7 @@ case clang::Type::Builtin: switch (cast(qual_type)->getKind()) { + case clang::BuiltinType::UnknownAny: case clang::BuiltinType::Void: case clang::BuiltinType::NullPtr: return 0; Modified: lldb/trunk/source/Symbol/ClangASTType.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTType.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Symbol/ClangASTType.cpp (original) +++ lldb/trunk/source/Symbol/ClangASTType.cpp Mon Apr 18 03:33:37 2011 @@ -260,6 +260,7 @@ switch (cast(qual_type)->getKind()) { //default: assert(0 && "Unknown builtin type!"); + case clang::BuiltinType::UnknownAny: case clang::BuiltinType::Void: break; Modified: lldb/trunk/source/Target/Process.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Target/Process.cpp (original) +++ lldb/trunk/source/Target/Process.cpp Mon Apr 18 03:33:37 2011 @@ -3867,6 +3867,66 @@ return result_name; } +void +Process::GetStatus (Stream &strm) +{ + const StateType state = GetState(); + if (StateIsStoppedState(state)) + { + if (state == eStateExited) + { + int exit_status = GetExitStatus(); + const char *exit_description = GetExitDescription(); + strm.Printf ("Process %d exited with status = %i (0x%8.8x) %s\n", + GetID(), + exit_status, + exit_status, + exit_description ? exit_description : ""); + } + else + { + if (state == eStateConnected) + strm.Printf ("Connected to remote target.\n"); + else + strm.Printf ("Process %d %s\n", GetID(), StateAsCString (state)); + } + } + else + { + strm.Printf ("Process %d is running.\n", GetID()); + } +} + +size_t +Process::GetThreadStatus (Stream &strm, + bool only_threads_with_stop_reason, + uint32_t start_frame, + uint32_t num_frames, + uint32_t num_frames_with_source) +{ + size_t num_thread_infos_dumped = 0; + + const size_t num_threads = GetThreadList().GetSize(); + for (uint32_t i = 0; i < num_threads; i++) + { + Thread *thread = GetThreadList().GetThreadAtIndex(i).get(); + if (thread) + { + if (only_threads_with_stop_reason) + { + if (thread->GetStopInfo().get() == NULL) + continue; + } + thread->GetStatus (strm, + start_frame, + num_frames, + num_frames_with_source); + ++num_thread_infos_dumped; + } + } + return num_thread_infos_dumped; +} + //-------------------------------------------------------------- // class Process::SettingsController //-------------------------------------------------------------- Modified: lldb/trunk/source/Target/StackFrame.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StackFrame.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Target/StackFrame.cpp (original) +++ lldb/trunk/source/Target/StackFrame.cpp Mon Apr 18 03:33:37 2011 @@ -991,3 +991,38 @@ { return m_thread.GetStackFrameSPForStackFramePtr (this); } + + + +bool +StackFrame::GetStatus (Stream& strm, + bool show_frame_info, + bool show_source, + uint32_t source_lines_before, + uint32_t source_lines_after) +{ + if (show_frame_info) + { + strm.Indent(); + DumpUsingSettingsFormat (&strm); + } + + if (show_source) + { + GetSymbolContext(eSymbolContextCompUnit | eSymbolContextLineEntry); + + if (m_sc.comp_unit && m_sc.line_entry.IsValid()) + { + GetThread().GetProcess().GetTarget().GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers ( + m_sc.line_entry.file, + m_sc.line_entry.line, + 3, + 3, + "->", + &strm); + + } + } + return true; +} + Modified: lldb/trunk/source/Target/StackFrameList.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StackFrameList.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Target/StackFrameList.cpp (original) +++ lldb/trunk/source/Target/StackFrameList.cpp Mon Apr 18 03:33:37 2011 @@ -569,3 +569,46 @@ return ret_sp; } +size_t +StackFrameList::GetStatus (Stream& strm, + uint32_t first_frame, + uint32_t num_frames, + bool show_frame_info, + uint32_t num_frames_with_source, + uint32_t source_lines_before, + uint32_t source_lines_after) +{ + size_t num_frames_displayed = 0; + + if (num_frames == 0) + return 0; + + StackFrameSP frame_sp; + uint32_t frame_idx = 0; + uint32_t last_frame; + + // Don't let the last frame wrap around... + if (num_frames == UINT32_MAX) + last_frame = UINT32_MAX; + else + last_frame = first_frame + num_frames; + + for (frame_idx = first_frame; frame_idx < last_frame; ++frame_idx) + { + frame_sp = GetFrameAtIndex(frame_idx); + if (frame_sp.get() == NULL) + break; + + if (!frame_sp->GetStatus (strm, + show_frame_info, + num_frames_with_source > first_frame - frame_idx, + source_lines_before, + source_lines_after)) + break; + ++num_frames_displayed; + } + + strm.IndentLess(); + return num_frames_displayed; +} + Modified: lldb/trunk/source/Target/Thread.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Thread.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/source/Target/Thread.cpp (original) +++ lldb/trunk/source/Target/Thread.cpp Mon Apr 18 03:33:37 2011 @@ -14,6 +14,7 @@ #include "lldb/Core/Stream.h" #include "lldb/Core/StreamString.h" #include "lldb/Core/RegularExpression.h" +#include "lldb/Host/Host.h" #include "lldb/Target/DynamicLoader.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/ObjCLanguageRuntime.h" @@ -1100,6 +1101,63 @@ return unknown_state_string; } +size_t +Thread::GetStatus (Stream &strm, uint32_t start_frame, uint32_t num_frames, uint32_t num_frames_with_source) +{ + size_t num_frames_shown = 0; + strm.Indent(); + strm.Printf("%c ", GetProcess().GetThreadList().GetSelectedThread().get() == this ? '*' : ' '); + + StackFrameSP frame_sp = GetStackFrameAtIndex(start_frame); + SymbolContext frame_sc(frame_sp->GetSymbolContext (eSymbolContextLineEntry)); + if (frame_sc.line_entry.line != 0 && + frame_sc.line_entry.file && + GetProcess().GetTarget().GetDebugger().GetUseExternalEditor()) + { + Host::OpenFileInExternalEditor (frame_sc.line_entry.file, frame_sc.line_entry.line); + } + + DumpUsingSettingsFormat (strm, start_frame); + + if (num_frames > 0) + { + strm.IndentMore(); + + const bool show_frame_info = true; + const uint32_t source_lines_before = 3; + const uint32_t source_lines_after = 3; + num_frames_shown = GetStackFrameList ().GetStatus (strm, + start_frame, + num_frames, + show_frame_info, + num_frames_with_source, + source_lines_before, + source_lines_after); + strm.IndentLess(); + } + return num_frames_shown; +} + +size_t +Thread::GetStackFrameStatus (Stream& strm, + uint32_t first_frame, + uint32_t num_frames, + bool show_frame_info, + uint32_t num_frames_with_source, + uint32_t source_lines_before, + uint32_t source_lines_after) +{ + return GetStackFrameList().GetStatus (strm, + first_frame, + num_frames, + show_frame_info, + num_frames_with_source, + source_lines_before, + source_lines_after); +} + + + #pragma mark "Thread::SettingsController" //-------------------------------------------------------------- // class Thread::SettingsController Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/abbreviation_tests/TestAbbreviations.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/abbreviation_tests/TestAbbreviations.py (original) +++ lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Mon Apr 18 03:33:37 2011 @@ -23,8 +23,8 @@ self.runCmd("com a alias com al") self.runCmd("alias gurp help") - self.expect("gurp file", - substrs = ['Syntax: file ']) + self.expect("gurp target create", + substrs = ['Syntax: target create ']) self.runCmd("com u gurp") self.expect("gurp", COMMAND_FAILED_AS_EXPECTED, error = True, Modified: lldb/trunk/test/array_types/TestArrayTypes.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/array_types/TestArrayTypes.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/array_types/TestArrayTypes.py (original) +++ lldb/trunk/test/array_types/TestArrayTypes.py Mon Apr 18 03:33:37 2011 @@ -60,7 +60,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. Modified: lldb/trunk/test/bitfields/TestBitfields.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/bitfields/TestBitfields.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/bitfields/TestBitfields.py (original) +++ lldb/trunk/test/bitfields/TestBitfields.py Mon Apr 18 03:33:37 2011 @@ -54,7 +54,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. Modified: lldb/trunk/test/breakpoint_command/TestBreakpointCommand.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/breakpoint_command/TestBreakpointCommand.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/breakpoint_command/TestBreakpointCommand.py (original) +++ lldb/trunk/test/breakpoint_command/TestBreakpointCommand.py Mon Apr 18 03:33:37 2011 @@ -126,7 +126,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 2. Modified: lldb/trunk/test/class_static/TestStaticVariables.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/class_static/TestStaticVariables.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/class_static/TestStaticVariables.py (original) +++ lldb/trunk/test/class_static/TestStaticVariables.py Mon Apr 18 03:33:37 2011 @@ -54,7 +54,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # On Mac OS X, gcc 4.2 emits the wrong debug info for A::g_points. Modified: lldb/trunk/test/class_types/TestClassTypes.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/class_types/TestClassTypes.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/class_types/TestClassTypes.py (original) +++ lldb/trunk/test/class_types/TestClassTypes.py Mon Apr 18 03:33:37 2011 @@ -80,7 +80,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. @@ -168,7 +168,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. Modified: lldb/trunk/test/class_types/TestClassTypesDisassembly.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/class_types/TestClassTypesDisassembly.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/class_types/TestClassTypesDisassembly.py (original) +++ lldb/trunk/test/class_types/TestClassTypesDisassembly.py Mon Apr 18 03:33:37 2011 @@ -56,7 +56,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # We should be stopped on the ctor function of class C. Modified: lldb/trunk/test/conditional_break/TestConditionalBreak.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/conditional_break/TestConditionalBreak.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/conditional_break/TestConditionalBreak.py (original) +++ lldb/trunk/test/conditional_break/TestConditionalBreak.py Mon Apr 18 03:33:37 2011 @@ -109,7 +109,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', 'stop reason = breakpoint']) + substrs = ['stopped', 'stop reason = breakpoint']) # The frame info for frame #0 points to a.out`c and its immediate caller # (frame #1) points to a.out`a. Modified: lldb/trunk/test/dead-strip/TestDeadStrip.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dead-strip/TestDeadStrip.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/dead-strip/TestDeadStrip.py (original) +++ lldb/trunk/test/dead-strip/TestDeadStrip.py Mon Apr 18 03:33:37 2011 @@ -43,7 +43,7 @@ # The stop reason of the thread should be breakpoint (breakpoint #1). self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'a.out`f1', 'stop reason = breakpoint']) @@ -55,7 +55,7 @@ # The stop reason of the thread should be breakpoint (breakpoint #3). self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'a.out`f3', 'stop reason = breakpoint']) Modified: lldb/trunk/test/enum_types/TestEnumTypes.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/enum_types/TestEnumTypes.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/enum_types/TestEnumTypes.py (original) +++ lldb/trunk/test/enum_types/TestEnumTypes.py Mon Apr 18 03:33:37 2011 @@ -43,7 +43,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. Modified: lldb/trunk/test/forward/TestForwardDeclaration.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/forward/TestForwardDeclaration.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/forward/TestForwardDeclaration.py (original) +++ lldb/trunk/test/forward/TestForwardDeclaration.py Mon Apr 18 03:33:37 2011 @@ -37,7 +37,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. Modified: lldb/trunk/test/function_types/TestFunctionTypes.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/function_types/TestFunctionTypes.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/function_types/TestFunctionTypes.py (original) +++ lldb/trunk/test/function_types/TestFunctionTypes.py Mon Apr 18 03:33:37 2011 @@ -41,7 +41,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. Modified: lldb/trunk/test/global_variables/TestGlobalVariables.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/global_variables/TestGlobalVariables.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/global_variables/TestGlobalVariables.py (original) +++ lldb/trunk/test/global_variables/TestGlobalVariables.py Mon Apr 18 03:33:37 2011 @@ -41,7 +41,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. Modified: lldb/trunk/test/inferior-crashing/TestInferiorCrashing.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/inferior-crashing/TestInferiorCrashing.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/inferior-crashing/TestInferiorCrashing.py (original) +++ lldb/trunk/test/inferior-crashing/TestInferiorCrashing.py Mon Apr 18 03:33:37 2011 @@ -41,7 +41,7 @@ # The stop reason of the thread should be a bad access exception. self.expect("thread list", STOPPED_DUE_TO_EXC_BAD_ACCESS, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = EXC_BAD_ACCESS']) # And it should report the correct line number. Modified: lldb/trunk/test/inlined_breakpoints/TestInlinedBreakpoints.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/inlined_breakpoints/TestInlinedBreakpoints.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/inlined_breakpoints/TestInlinedBreakpoints.py (original) +++ lldb/trunk/test/inlined_breakpoints/TestInlinedBreakpoints.py Mon Apr 18 03:33:37 2011 @@ -45,7 +45,7 @@ # The stop reason of the thread should be breakpoint. # And it should break at basic_type.cpp:176. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint', 'basic_type.cpp:%d' % self.line]) Modified: lldb/trunk/test/load_unload/TestLoadUnload.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/load_unload/TestLoadUnload.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/load_unload/TestLoadUnload.py (original) +++ lldb/trunk/test/load_unload/TestLoadUnload.py Mon Apr 18 03:33:37 2011 @@ -179,7 +179,7 @@ # The stop reason of the thread should be breakpoint and at a_function. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'a_function', 'stop reason = breakpoint']) @@ -194,7 +194,7 @@ # rdar://problem/8508987 # The a_function breakpoint should be encountered twice. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'a_function', 'stop reason = breakpoint']) Modified: lldb/trunk/test/namespace/TestNamespace.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/namespace/TestNamespace.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/namespace/TestNamespace.py (original) +++ lldb/trunk/test/namespace/TestNamespace.py Mon Apr 18 03:33:37 2011 @@ -51,7 +51,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # On Mac OS X, gcc 4.2 emits the wrong debug info with respect to types. Modified: lldb/trunk/test/set_values/TestSetValues.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/set_values/TestSetValues.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/set_values/TestSetValues.py (original) +++ lldb/trunk/test/set_values/TestSetValues.py Mon Apr 18 03:33:37 2011 @@ -65,7 +65,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. Modified: lldb/trunk/test/signal/TestSendSignal.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/signal/TestSendSignal.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/signal/TestSendSignal.py (original) +++ lldb/trunk/test/signal/TestSendSignal.py Mon Apr 18 03:33:37 2011 @@ -43,7 +43,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. Modified: lldb/trunk/test/signed_types/TestSignedTypes.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/signed_types/TestSignedTypes.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/signed_types/TestSignedTypes.py (original) +++ lldb/trunk/test/signed_types/TestSignedTypes.py Mon Apr 18 03:33:37 2011 @@ -44,7 +44,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', 'stop reason = breakpoint']) + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, Modified: lldb/trunk/test/source-manager/TestSourceManager.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/source-manager/TestSourceManager.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/source-manager/TestSourceManager.py (original) +++ lldb/trunk/test/source-manager/TestSourceManager.py Mon Apr 18 03:33:37 2011 @@ -85,7 +85,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'main.c', 'stop reason = breakpoint']) Modified: lldb/trunk/test/unique-types/TestUniqueTypes.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/unique-types/TestUniqueTypes.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/unique-types/TestUniqueTypes.py (original) +++ lldb/trunk/test/unique-types/TestUniqueTypes.py Mon Apr 18 03:33:37 2011 @@ -43,7 +43,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', + substrs = ['stopped', 'stop reason = breakpoint']) if self.getCompiler().endswith('clang'): Modified: lldb/trunk/test/unsigned_types/TestUnsignedTypes.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/unsigned_types/TestUnsignedTypes.py?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/test/unsigned_types/TestUnsignedTypes.py (original) +++ lldb/trunk/test/unsigned_types/TestUnsignedTypes.py Mon Apr 18 03:33:37 2011 @@ -44,7 +44,7 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, - substrs = ['state is stopped', 'stop reason = breakpoint']) + substrs = ['stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, Modified: lldb/trunk/tools/driver/Driver.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Driver.cpp?rev=129695&r1=129694&r2=129695&view=diff ============================================================================== --- lldb/trunk/tools/driver/Driver.cpp (original) +++ lldb/trunk/tools/driver/Driver.cpp Mon Apr 18 03:33:37 2011 @@ -1121,13 +1121,13 @@ if (m_debugger.GetDefaultArchitecture (arch_name, sizeof (arch_name))) ::snprintf (command_string, sizeof (command_string), - "file --arch=%s '%s'", + "target create --arch=%s '%s'", arch_name, m_option_data.m_args[0].c_str()); else ::snprintf (command_string, sizeof(command_string), - "file '%s'", + "target create '%s'", m_option_data.m_args[0].c_str()); m_debugger.HandleCommand (command_string); From mminutoli at gmail.com Mon Apr 18 08:20:44 2011 From: mminutoli at gmail.com (Marco Minutoli) Date: Mon, 18 Apr 2011 15:20:44 +0200 Subject: [Lldb-commits] [PATCH 1/4] remove Host::LaunchInNewTerminal Message-ID: <1303132847-12893-1-git-send-email-mminutoli@gmail.com> This method has been removed from the Host interface in r129351 accordingly this patch remove its definition. --- source/Host/common/Host.cpp | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/source/Host/common/Host.cpp b/source/Host/common/Host.cpp index a665472..b699bc8 100644 --- a/source/Host/common/Host.cpp +++ b/source/Host/common/Host.cpp @@ -1173,19 +1173,4 @@ LaunchApplication (const FileSpec &app_file_spec) return LLDB_INVALID_PROCESS_ID; } -lldb::pid_t -Host::LaunchInNewTerminal -( - const char *tty_name, - const char **argv, - const char **envp, - const char *working_dir, - const ArchSpec *arch_spec, - bool stop_at_entry, - bool disable_aslr -) -{ - return LLDB_INVALID_PROCESS_ID; -} - #endif -- 1.7.1 From mminutoli at gmail.com Mon Apr 18 08:20:45 2011 From: mminutoli at gmail.com (Marco Minutoli) Date: Mon, 18 Apr 2011 15:20:45 +0200 Subject: [Lldb-commits] [PATCH 2/4] Host::LaunchProcess in linux In-Reply-To: <1303132847-12893-1-git-send-email-mminutoli@gmail.com> References: <1303132847-12893-1-git-send-email-mminutoli@gmail.com> Message-ID: <1303132847-12893-2-git-send-email-mminutoli@gmail.com> LaunchProcess is declared as a pure virtual and linux is missing its implementation ATM. This patch gives a "fake" implementation (waiting for a real one) to solve the compilation breakage issue due to its lack. --- source/Host/linux/Host.cpp | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/source/Host/linux/Host.cpp b/source/Host/linux/Host.cpp index b0d43e8..3498698 100644 --- a/source/Host/linux/Host.cpp +++ b/source/Host/linux/Host.cpp @@ -14,6 +14,7 @@ // C++ Includes // Other libraries and framework includes // Project includes +#include "lldb/Core/Error.h" #include "lldb/Host/Host.h" using namespace lldb; @@ -33,3 +34,11 @@ Host::GetOSVersion(uint32_t &major, status = sscanf(un.release, "%u.%u.%u", &major, &minor, &update); return status == 3; } + +Error +Host::LaunchProcess (ProcessLaunchInfo &launch_info) +{ + Error error; + assert(!"Not implemented yet!"); + return error; +} -- 1.7.1 From mminutoli at gmail.com Mon Apr 18 08:20:46 2011 From: mminutoli at gmail.com (Marco Minutoli) Date: Mon, 18 Apr 2011 15:20:46 +0200 Subject: [Lldb-commits] [PATCH 3/4] PlatformLinux::Attach and PlatformLinux::GetProcessInfo In-Reply-To: <1303132847-12893-1-git-send-email-mminutoli@gmail.com> References: <1303132847-12893-1-git-send-email-mminutoli@gmail.com> Message-ID: <1303132847-12893-3-git-send-email-mminutoli@gmail.com> The interface of GetProcessInfo has been changed and this fix it accordingly. This patch also add a "fake" implementation of the Attach method this fix the build breakage due to its lack. --- source/Plugins/Platform/Linux/PlatformLinux.cpp | 15 ++++++++++++++- source/Plugins/Platform/Linux/PlatformLinux.h | 9 ++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/source/Plugins/Platform/Linux/PlatformLinux.cpp b/source/Plugins/Platform/Linux/PlatformLinux.cpp index 379a08e..5b3d591 100644 --- a/source/Plugins/Platform/Linux/PlatformLinux.cpp +++ b/source/Plugins/Platform/Linux/PlatformLinux.cpp @@ -192,7 +192,8 @@ PlatformLinux::~PlatformLinux() } bool -PlatformLinux::GetProcessInfo (lldb::pid_t pid, ProcessInfo &process_info) +PlatformLinux::GetProcessInfo (lldb::pid_t pid, + ProcessInstanceInfo &process_info) { return Host::GetProcessInfo (pid, process_info); } @@ -247,3 +248,15 @@ PlatformLinux::GetSoftwareBreakpointTrapOpcode (Target &target, bp_site->SetTrapOpcode(opcode, opcode_size); return opcode_size; } + +lldb::ProcessSP +PlatformLinux::Attach (lldb::pid_t pid, + Debugger &debugger, + Target *target, + Listener &listener, + Error &error) +{ + ProcessSP processSP; + assert(!"Not implemented yet!"); + return processSP; +} diff --git a/source/Plugins/Platform/Linux/PlatformLinux.h b/source/Plugins/Platform/Linux/PlatformLinux.h index bb9f62c..c573b6c 100644 --- a/source/Plugins/Platform/Linux/PlatformLinux.h +++ b/source/Plugins/Platform/Linux/PlatformLinux.h @@ -85,7 +85,7 @@ namespace lldb_private { const UUID* uuid, FileSpec &local_file); virtual bool - GetProcessInfo (lldb::pid_t pid, ProcessInfo &proc_info); + GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &proc_info); virtual bool GetSupportedArchitectureAtIndex (uint32_t idx, ArchSpec &arch); @@ -94,6 +94,13 @@ namespace lldb_private { GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite *bp_site); + virtual lldb::ProcessSP + Attach (lldb::pid_t pid, + Debugger &debugger, + Target *target, + Listener &listener, + Error &error); + protected: -- 1.7.1 From mminutoli at gmail.com Mon Apr 18 08:20:47 2011 From: mminutoli at gmail.com (Marco Minutoli) Date: Mon, 18 Apr 2011 15:20:47 +0200 Subject: [Lldb-commits] [PATCH 4/4] Missing standard header. In-Reply-To: <1303132847-12893-1-git-send-email-mminutoli@gmail.com> References: <1303132847-12893-1-git-send-email-mminutoli@gmail.com> Message-ID: <1303132847-12893-4-git-send-email-mminutoli@gmail.com> --- .../Process/gdb-remote/GDBRemoteCommunication.cpp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp index 93e4166..ac99855 100644 --- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp @@ -11,6 +11,7 @@ #include "GDBRemoteCommunication.h" // C Includes +#include #include // C++ Includes -- 1.7.1 From johnny.chen at apple.com Mon Apr 18 13:32:09 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Mon, 18 Apr 2011 18:32:09 -0000 Subject: [Lldb-commits] [lldb] r129706 - /lldb/trunk/test/lldbutil.py Message-ID: <20110418183209.455852A6C12C@llvm.org> Author: johnny Date: Mon Apr 18 13:32:09 2011 New Revision: 129706 URL: http://llvm.org/viewvc/llvm-project?rev=129706&view=rev Log: Modify some docstrings. Modified: lldb/trunk/test/lldbutil.py Modified: lldb/trunk/test/lldbutil.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbutil.py?rev=129706&r1=129705&r2=129706&view=diff ============================================================================== --- lldb/trunk/test/lldbutil.py (original) +++ lldb/trunk/test/lldbutil.py Mon Apr 18 13:32:09 2011 @@ -385,7 +385,7 @@ return output.getvalue() def GetThreadsStoppedAtBreakpoint (process, bkpt): - """ For a stopped process returns the thread stopped at the breakpoint passed in in bkpt""" + """ For a stopped process returns the thread stopped at the breakpoint passed in bkpt""" stopped_threads = [] threads = [] @@ -403,7 +403,7 @@ return threads def ContinueToBreakpoint (process, bkpt): - """ Continues the process, when it stops, if there is a thread stopped at bkpt, returns that thread""" + """ Continues the process, if it stops, returns the threads stopped at bkpt; otherwise, returns None""" process.Continue() if process.GetState() != lldb.eStateStopped: return None From johnny.chen at apple.com Mon Apr 18 13:34:09 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Mon, 18 Apr 2011 18:34:09 -0000 Subject: [Lldb-commits] [lldb] r129707 - /lldb/trunk/test/lldbutil.py Message-ID: <20110418183409.8ED7F2A6C12C@llvm.org> Author: johnny Date: Mon Apr 18 13:34:09 2011 New Revision: 129707 URL: http://llvm.org/viewvc/llvm-project?rev=129707&view=rev Log: Add docstring. Modified: lldb/trunk/test/lldbutil.py Modified: lldb/trunk/test/lldbutil.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbutil.py?rev=129707&r1=129706&r2=129707&view=diff ============================================================================== --- lldb/trunk/test/lldbutil.py (original) +++ lldb/trunk/test/lldbutil.py Mon Apr 18 13:34:09 2011 @@ -9,8 +9,8 @@ def is_exe(fpath): return os.path.isfile(fpath) and os.access(fpath, os.X_OK) -# Find the full path to a program, or return None. def which(program): + """Find the full path to a program, or return None.""" fpath, fname = os.path.split(program) if fpath: if is_exe(program): From johnny.chen at apple.com Mon Apr 18 13:50:24 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Mon, 18 Apr 2011 18:50:24 -0000 Subject: [Lldb-commits] [lldb] r129710 - /lldb/trunk/test/inferior-crashing/main.c Message-ID: <20110418185024.736662A6C12C@llvm.org> Author: johnny Date: Mon Apr 18 13:50:24 2011 New Revision: 129710 URL: http://llvm.org/viewvc/llvm-project?rev=129710&view=rev Log: Add header comment. Modified: lldb/trunk/test/inferior-crashing/main.c Modified: lldb/trunk/test/inferior-crashing/main.c URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/inferior-crashing/main.c?rev=129710&r1=129709&r2=129710&view=diff ============================================================================== --- lldb/trunk/test/inferior-crashing/main.c (original) +++ lldb/trunk/test/inferior-crashing/main.c Mon Apr 18 13:50:24 2011 @@ -1,3 +1,11 @@ +//===-- main.c --------------------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// #include int main(int argc, const char* argv[]) From johnny.chen at apple.com Mon Apr 18 16:08:05 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Mon, 18 Apr 2011 21:08:05 -0000 Subject: [Lldb-commits] [lldb] r129717 - in /lldb/trunk: source/Commands/CommandObjectTarget.cpp test/lldbtest.py test/make/Makefile.rules test/target/ test/target/Makefile test/target/TestTargetCommand.py test/target/a.c test/target/b.c test/target/c.c Message-ID: <20110418210805.9AFCA2A6C12C@llvm.org> Author: johnny Date: Mon Apr 18 16:08:05 2011 New Revision: 129717 URL: http://llvm.org/viewvc/llvm-project?rev=129717&view=rev Log: Add a test script for exercising the "taregt create", "target list", and "target select" commands. Added: lldb/trunk/test/target/ lldb/trunk/test/target/Makefile lldb/trunk/test/target/TestTargetCommand.py lldb/trunk/test/target/a.c lldb/trunk/test/target/b.c lldb/trunk/test/target/c.c Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp lldb/trunk/test/lldbtest.py lldb/trunk/test/make/Makefile.rules Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectTarget.cpp?rev=129717&r1=129716&r2=129717&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Mon Apr 18 16:08:05 2011 @@ -300,6 +300,7 @@ { strm.PutCString ("No targets.\n"); } + result.SetStatus (eReturnStatusSuccessFinishResult); } else { @@ -355,6 +356,7 @@ target_list.SetSelectedTarget (target_sp.get()); bool show_stopped_process_status = false; DumpTargetList (target_list, show_stopped_process_status, strm); + result.SetStatus (eReturnStatusSuccessFinishResult); } else { Modified: lldb/trunk/test/lldbtest.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=129717&r1=129716&r2=129717&view=diff ============================================================================== --- lldb/trunk/test/lldbtest.py (original) +++ lldb/trunk/test/lldbtest.py Mon Apr 18 16:08:05 2011 @@ -546,6 +546,9 @@ # These are for customized teardown cleanup. self.dict = None self.doTearDownCleanup = False + # And in rare cases where there are multiple teardown cleanups. + self.dicts = [] + self.doTearDownCleanups = False # Create a string buffer to record the session info, to be dumped into a # test case specific file if test failure is encountered. @@ -644,6 +647,11 @@ self.dict = dictionary self.doTearDownCleanup = True + def addTearDownCleanup(self, dictionary): + """Add a cleanup action at tearDown() time with a dictinary""" + self.dicts.append(dictionary) + self.doTearDownCleanups = True + def addTearDownHook(self, hook): """ Add a function to be run during tearDown() time. @@ -686,7 +694,15 @@ if doCleanup and self.doTearDownCleanup: module = __import__(sys.platform) if not module.cleanup(self, dictionary=self.dict): - raise Exception("Don't know how to do cleanup") + raise Exception("Don't know how to do cleanup with dictionary: " + self.dict) + + # In rare cases where there are multiple teardown cleanups added. + if doCleanup and self.doTearDownCleanups: + module = __import__(sys.platform) + if self.dicts: + for dict in reversed(self.dicts): + if not module.cleanup(self, dictionary=dict): + raise Exception("Don't know how to do cleanup with dictionary: " + dict) # Decide whether to dump the session info. self.dumpSessionInfo() Modified: lldb/trunk/test/make/Makefile.rules URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=129717&r1=129716&r2=129717&view=diff ============================================================================== --- lldb/trunk/test/make/Makefile.rules (original) +++ lldb/trunk/test/make/Makefile.rules Mon Apr 18 16:08:05 2011 @@ -38,7 +38,7 @@ LD = $(CC) LDFLAGS ?= $(CFLAGS) OBJECTS = -EXE = a.out +EXE ?= a.out DSYM = $(EXE).dSYM # Function that returns the counterpart C++ compiler, given $(CC) as arg. Added: lldb/trunk/test/target/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/target/Makefile?rev=129717&view=auto ============================================================================== --- lldb/trunk/test/target/Makefile (added) +++ lldb/trunk/test/target/Makefile Mon Apr 18 16:08:05 2011 @@ -0,0 +1,8 @@ +LEVEL = ../make + +# Example: +# +# C_SOURCES := b.c +# EXE := b.out + +include $(LEVEL)/Makefile.rules Added: lldb/trunk/test/target/TestTargetCommand.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/target/TestTargetCommand.py?rev=129717&view=auto ============================================================================== --- lldb/trunk/test/target/TestTargetCommand.py (added) +++ lldb/trunk/test/target/TestTargetCommand.py Mon Apr 18 16:08:05 2011 @@ -0,0 +1,95 @@ +""" +Test some target commands: create, list, select. +""" + +import unittest2 +import lldb +import sys +from lldbtest import * + +class targetCommandTestCase(TestBase): + + mydir = "target" + + def setUp(self): + # Call super's setUp(). + TestBase.setUp(self) + # Find the line numbers for our breakpoints. + self.line_b = line_number('b.c', '// Set break point at this line.') + self.line_c = line_number('c.c', '// Set break point at this line.') + + def test_target_command_with_dwarf(self): + """Test some target commands: create, list, select.""" + da = {'C_SOURCES': 'a.c', 'EXE': 'a.out'} + self.buildDefault(dictionary=da) + self.addTearDownCleanup(dictionary=da) + + db = {'C_SOURCES': 'b.c', 'EXE': 'b.out'} + self.buildDefault(dictionary=db) + self.addTearDownCleanup(dictionary=db) + + dc = {'C_SOURCES': 'c.c', 'EXE': 'c.out'} + self.buildDefault(dictionary=dc) + self.addTearDownCleanup(dictionary=dc) + + self.do_target_command() + + def do_target_command(self): + """Exercise 'target create', 'target list', 'target select' commands.""" + exe_a = os.path.join(os.getcwd(), "a.out") + exe_b = os.path.join(os.getcwd(), "b.out") + exe_c = os.path.join(os.getcwd(), "c.out") + + self.runCmd("target list") + output = self.res.GetOutput() + if output.startswith("No targets"): + # We start from index 0. + base = 0 + else: + # Find the largest index of the existing list. + import re + pattern = re.compile("target #(\d+):") + for line in reversed(output.split(os.linesep)): + match = pattern.search(line) + if match: + # We will start from (index + 1) .... + base = int(match.group(1), 10) + 1 + #print "base is:", base + break; + + self.runCmd("target create " + exe_a, CURRENT_EXECUTABLE_SET) + self.runCmd("run", RUN_SUCCEEDED) + + self.runCmd("target create " + exe_b, CURRENT_EXECUTABLE_SET) + self.runCmd("breakpoint set -f %s -l %d" % ('b.c', self.line_b), + BREAKPOINT_CREATED) + self.runCmd("run", RUN_SUCCEEDED) + + self.runCmd("target create " + exe_c, CURRENT_EXECUTABLE_SET) + self.runCmd("breakpoint set -f %s -l %d" % ('c.c', self.line_c), + BREAKPOINT_CREATED) + self.runCmd("run", RUN_SUCCEEDED) + + self.runCmd("target list") + + self.runCmd("target select %d" % base) + self.runCmd("thread backtrace") + + self.runCmd("target select %d" % (base + 2)) + self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT, + substrs = ['c.c:%d' % self.line_c, + 'stop reason = breakpoint']) + + self.runCmd("target select %d" % (base + 1)) + self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT, + substrs = ['b.c:%d' % self.line_b, + 'stop reason = breakpoint']) + + self.runCmd("target list") + + +if __name__ == '__main__': + import atexit + lldb.SBDebugger.Initialize() + atexit.register(lambda: lldb.SBDebugger.Terminate()) + unittest2.main() Added: lldb/trunk/test/target/a.c URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/target/a.c?rev=129717&view=auto ============================================================================== --- lldb/trunk/test/target/a.c (added) +++ lldb/trunk/test/target/a.c Mon Apr 18 16:08:05 2011 @@ -0,0 +1,16 @@ +//===-- main.c --------------------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +#include + +int main(int argc, const char* argv[]) +{ + int *null_ptr = 0; + printf("Hello, segfault!\n"); + printf("Now crash %d\n", *null_ptr); // Crash here. +} Added: lldb/trunk/test/target/b.c URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/target/b.c?rev=129717&view=auto ============================================================================== --- lldb/trunk/test/target/b.c (added) +++ lldb/trunk/test/target/b.c Mon Apr 18 16:08:05 2011 @@ -0,0 +1,13 @@ +//===-- main.c --------------------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +int main (int argc, char const *argv[]) +{ + return 0; // Set break point at this line. +} Added: lldb/trunk/test/target/c.c URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/target/c.c?rev=129717&view=auto ============================================================================== --- lldb/trunk/test/target/c.c (added) +++ lldb/trunk/test/target/c.c Mon Apr 18 16:08:05 2011 @@ -0,0 +1,29 @@ +//===-- main.c --------------------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +#include + +int main (int argc, char const *argv[]) +{ + enum days { + Monday = 10, + Tuesday, + Wednesday, + Thursday, + Friday, + Saturday, + Sunday, + kNumDays + }; + enum days day; + for (day = Monday - 1; day <= kNumDays + 1; day++) + { + printf("day as int is %i\n", (int)day); + } + return 0; // Set break point at this line. +} From johnny.chen at apple.com Mon Apr 18 17:11:31 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Mon, 18 Apr 2011 22:11:31 -0000 Subject: [Lldb-commits] [lldb] r129724 - /lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp Message-ID: <20110418221131.379042A6C12C@llvm.org> Author: johnny Date: Mon Apr 18 17:11:31 2011 New Revision: 129724 URL: http://llvm.org/viewvc/llvm-project?rev=129724&view=rev Log: Rename some variables, no functionality change. Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp?rev=129724&r1=129723&r2=129724&view=diff ============================================================================== --- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp (original) +++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp Mon Apr 18 17:11:31 2011 @@ -292,8 +292,6 @@ void DWARFDebugAranges::Sort() { - std::vector indices; - size_t end; Timer scoped_timer(__PRETTY_FUNCTION__, "%s this = %p", __PRETTY_FUNCTION__, this); @@ -302,8 +300,9 @@ // Merge all neighbouring ranges into a single range and remember the // indices of all ranges merged. - end = m_aranges.size(); - for (size_t merge, cursor = 1; cursor < end; ++cursor) + const size_t old_size = m_aranges.size(); + std::vector merged; + for (size_t merge, cursor = 1; cursor < old_size; ++cursor) { merge = cursor - 1; Range &r1 = m_aranges[merge]; @@ -312,18 +311,18 @@ if (r1.hi_pc == r2.lo_pc && r1.offset == r2.offset) { r2.lo_pc = r1.lo_pc; - indices.push_back(merge); + merged.push_back(merge); } } - if (indices.empty()) + if (merged.empty()) return; // Remove the merged ranges by shifting down all the keepers... - size_t new_size = m_aranges.size() - indices.size(); + const size_t new_size = old_size - merged.size(); for (size_t i = 0, src = 0, dst = 0; dst < new_size; ++src, ++dst) { - while (src == indices[i]) { + while (src == merged[i]) { ++src; ++i; } From gclayton at apple.com Mon Apr 18 17:34:07 2011 From: gclayton at apple.com (Greg Clayton) Date: Mon, 18 Apr 2011 15:34:07 -0700 Subject: [Lldb-commits] [PATCH] optimize address range coalescing In-Reply-To: <20110415134054.GA4932@fibrous.localdomain> References: <20110415134054.GA4932@fibrous.localdomain> Message-ID: <6386FA8A-6CA7-4D07-BE5B-1A47B4092FF7@apple.com> Nice! On Apr 15, 2011, at 6:40 AM, Stephen Wilson wrote: > > DWARFDebugAranges::Sort() calls std::stable_sort() over a set of address ranges > and then proceeds to collapse neighboring ranges together. > > One problem with the current implementation is that it does an incomplete job. > When a pair of ranges are merged the next pair considered does not include the > just-merged range. IOW, three consecutive ranges are never collapsed into one. > > Another problem is that for each range merged we are calling > std::vector::erase() which "shifts" all remaining elements of the vector by one > position on every merge. The end result (in the worst case) is a quadratic > algorithm -- not good when the input vector is large. > > The following patch merges all consecutive ranges and removes the quadratic > behavior. The implementation uses an auxiliary vector of indices in order to > remember all ranges that can be dropped, then performs the coalescing of ranges > in a single pass. > > Instrumenting DWARFDebugAranges::Sort() with a timer and loading LLDB in LLDB > prior to this patch gives (on my prone-to-overheat 2GHz laptop): > > Current executable set to './lldb' (x86_64). > (lldb) break set -n main > Breakpoint created: 1: name = 'main', locations = 1 > (lldb) log timers enable > (lldb) r > Process 12840 launched: '/home/steve/development/build/llvm-git/Debug+Asserts/bin/lldb' (x86_64) > (lldb) Process 12840 stopped > * thread #1: tid = 0x3228, 0x0000000000411fed lldb`main + 32 at Driver.cpp:1275, stop reason = breakpoint 1.1 > 1272 int > 1273 main (int argc, char const *argv[], const char *envp[]) > 1274 { > -> 1275 SBDebugger::Initialize(); > 1276 > 1277 SBHostOS::ThreadCreated (""); > 1278 > > (lldb) log timers dump > 17.027432000 sec for void DWARFDebugAranges::Sort() > ... > > and after this patch: > > ... > (lldb) log timers dump > ... > 0.154519000 sec for void DWARFDebugAranges::Sort() > ... > > > > diff --git a/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp b/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp > index 8e3461d..2d69926 100644 > --- a/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp > +++ b/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp > @@ -15,6 +15,7 @@ > #include > > #include "lldb/Core/Stream.h" > +#include "lldb/Core/Timer.h" > > #include "SymbolFileDWARF.h" > #include "DWARFDebugInfo.h" > @@ -290,36 +291,46 @@ DWARFDebugAranges::AppendRange (dw_offset_t offset, dw_addr_t low_pc, dw_addr_t > > void > DWARFDebugAranges::Sort() > -{ > - // Sort our address range entries > +{ > + std::vector indices; > + size_t end; > + Timer scoped_timer(__PRETTY_FUNCTION__, "%s this = %p", > + __PRETTY_FUNCTION__, this); > + > + // Sort our address range entries. > std::stable_sort (m_aranges.begin(), m_aranges.end(), RangeLessThan); > > - // Merge any entries that have the same offset and same start/end address > - RangeColl::iterator pos = m_aranges.begin(); > - RangeColl::iterator end = m_aranges.end(); > - while (pos != end) > + // Merge all neighbouring ranges into a single range and remember the > + // indices of all ranges merged. > + end = m_aranges.size(); > + for (size_t merge = 0, cursor = 1; cursor < end; ++cursor) > { > - RangeColl::iterator next_pos = pos + 1; > - if (next_pos != end && > - pos->offset == next_pos->offset && > - pos->hi_pc == next_pos->lo_pc) > + Range &r1 = m_aranges[merge]; > + Range &r2 = m_aranges[cursor]; > + > + if (r1.hi_pc == r2.lo_pc && r1.offset == r2.offset) > { > - // We have found an entry whose end address it he same as the > - // next entry's start address and the offsets are the same so > - // we can merge these two entries. > - pos->hi_pc = next_pos->hi_pc; > - // Erase the next entry that wasn't needed > - pos = m_aranges.erase (next_pos); > - // Now recompute the end of the collection > - end = m_aranges.end(); > + r1.hi_pc = r2.hi_pc; > + indices.push_back(cursor); > } > else > - { > - // Two entries have either different offsets or there are gaps > - // in the address range, move along, nothing to see here. > - pos = next_pos; > - } > + merge = cursor; > } > + > + if (indices.empty()) > + return; > + > + // Remove the merged ranges by shifting down all the keepers... > + indices.push_back(m_aranges.size()); > + end = indices.size(); > + for (size_t target = indices[0], cursor = 1; cursor < end; ++cursor) > + { > + for (size_t i = indices[cursor - 1] + 1; i < indices[cursor]; ++i) > + m_aranges[target++] = m_aranges[i]; > + } > + > + // ...and drop the extra elements. > + m_aranges.resize(m_aranges.size() - end + 1); > } > > //---------------------------------------------------------------------- > > From gclayton at apple.com Mon Apr 18 18:15:17 2011 From: gclayton at apple.com (Greg Clayton) Date: Mon, 18 Apr 2011 23:15:17 -0000 Subject: [Lldb-commits] [lldb] r129731 - /lldb/trunk/source/API/SBDebugger.cpp Message-ID: <20110418231517.B88FE2A6C12C@llvm.org> Author: gclayton Date: Mon Apr 18 18:15:17 2011 New Revision: 129731 URL: http://llvm.org/viewvc/llvm-project?rev=129731&view=rev Log: Fixed an issue where if you specify an architecture from the command line like: $ lldb --arch i386-unknown-unknown a.out It would then create a target with only the "i386" part due to SBDebugger::GetDefaultArchitecture(...) truncating the arch triple due to the way things used to be. Modified: lldb/trunk/source/API/SBDebugger.cpp Modified: lldb/trunk/source/API/SBDebugger.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBDebugger.cpp?rev=129731&r1=129730&r2=129731&view=diff ============================================================================== --- lldb/trunk/source/API/SBDebugger.cpp (original) +++ lldb/trunk/source/API/SBDebugger.cpp Mon Apr 18 18:15:17 2011 @@ -37,7 +37,7 @@ void SBDebugger::Initialize () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger::Initialize ()"); @@ -56,7 +56,7 @@ void SBDebugger::Clear () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::Clear ()", m_opaque_sp.get()); @@ -70,7 +70,7 @@ SBDebugger SBDebugger::Create() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBDebugger debugger; debugger.reset(Debugger::CreateInstance()); @@ -88,7 +88,7 @@ void SBDebugger::Destroy (SBDebugger &debugger) { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { @@ -153,7 +153,7 @@ void SBDebugger::SetInputFileHandle (FILE *fh, bool transfer_ownership) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::SetInputFileHandle (fh=%p, transfer_ownership=%i)", m_opaque_sp.get(), @@ -166,7 +166,7 @@ void SBDebugger::SetOutputFileHandle (FILE *fh, bool transfer_ownership) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) @@ -180,7 +180,7 @@ void SBDebugger::SetErrorFileHandle (FILE *fh, bool transfer_ownership) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) @@ -218,7 +218,7 @@ SBCommandInterpreter SBDebugger::GetCommandInterpreter () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBCommandInterpreter sb_interpreter; if (m_opaque_sp) @@ -271,7 +271,7 @@ SBListener SBDebugger::GetListener () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBListener sb_listener; if (m_opaque_sp) @@ -339,11 +339,15 @@ { if (arch_name && arch_name_len) { - ArchSpec default_arch = lldb_private::Target::GetDefaultArchitecture (); + ArchSpec default_arch = Target::GetDefaultArchitecture (); if (default_arch.IsValid()) { - ::snprintf (arch_name, arch_name_len, "%s", default_arch.GetArchitectureName()); + const std::string &triple_str = default_arch.GetTriple().str(); + if (!triple_str.empty()) + ::snprintf (arch_name, arch_name_len, "%s", triple_str.c_str()); + else + ::snprintf (arch_name, arch_name_len, "%s", default_arch.GetArchitectureName()); return true; } } @@ -361,7 +365,7 @@ ArchSpec arch (arch_name, NULL); if (arch.IsValid()) { - lldb_private::Target::SetDefaultArchitecture (arch); + Target::SetDefaultArchitecture (arch); return true; } } @@ -380,37 +384,37 @@ const char * SBDebugger::GetVersionString () { - return lldb_private::GetVersion(); + return GetVersion(); } const char * -SBDebugger::StateAsCString (lldb::StateType state) +SBDebugger::StateAsCString (StateType state) { - return lldb_private::StateAsCString (state); + return StateAsCString (state); } bool -SBDebugger::StateIsRunningState (lldb::StateType state) +SBDebugger::StateIsRunningState (StateType state) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); - const bool result = lldb_private::StateIsRunningState (state); + const bool result = StateIsRunningState (state); if (log) log->Printf ("SBDebugger::StateIsRunningState (state=%s) => %i", - lldb_private::StateAsCString (state), result); + StateAsCString (state), result); return result; } bool -SBDebugger::StateIsStoppedState (lldb::StateType state) +SBDebugger::StateIsStoppedState (StateType state) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); - const bool result = lldb_private::StateIsStoppedState (state); + const bool result = StateIsStoppedState (state); if (log) log->Printf ("SBDebugger::StateIsStoppedState (state=%s) => %i", - lldb_private::StateAsCString (state), result); + StateAsCString (state), result); return result; } @@ -431,7 +435,7 @@ target.reset (target_sp); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBDebugger(%p)::CreateTargetWithFileAndTargetTriple (filename=\"%s\", triple=%s) => SBTarget(%p)", @@ -444,7 +448,7 @@ SBTarget SBDebugger::CreateTargetWithFileAndArch (const char *filename, const char *arch_cstr) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBTarget target; if (m_opaque_sp) @@ -482,7 +486,7 @@ if (m_opaque_sp) { FileSpec file (filename, true); - ArchSpec arch = lldb_private::Target::GetDefaultArchitecture (); + ArchSpec arch = Target::GetDefaultArchitecture (); TargetSP target_sp; Error error; @@ -494,7 +498,7 @@ target.reset (target_sp); } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBDebugger(%p)::CreateTarget (filename=\"%s\") => SBTarget(%p)", @@ -542,7 +546,7 @@ } SBTarget -SBDebugger::FindTargetWithLLDBProcess (const lldb::ProcessSP &process_sp) +SBDebugger::FindTargetWithLLDBProcess (const ProcessSP &process_sp) { SBTarget sb_target; if (m_opaque_sp) @@ -568,7 +572,7 @@ SBTarget SBDebugger::GetSelectedTarget () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBTarget sb_target; if (m_opaque_sp) @@ -580,7 +584,7 @@ if (log) { SBStream sstr; - sb_target.GetDescription (sstr, lldb::eDescriptionLevelBrief); + sb_target.GetDescription (sstr, eDescriptionLevelBrief); log->Printf ("SBDebugger(%p)::GetSelectedTarget () => SBTarget(%p): %s", m_opaque_sp.get(), sb_target.get(), sstr.GetData()); } @@ -591,7 +595,7 @@ void SBDebugger::DispatchInput (void *baton, const void *data, size_t data_len) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::DispatchInput (baton=%p, data=\"%.*s\", size_t=%zu)", m_opaque_sp.get(), @@ -618,7 +622,7 @@ void SBDebugger::PushInputReader (SBInputReader &reader) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::PushInputReader (SBInputReader(%p))", m_opaque_sp.get(), &reader); @@ -635,7 +639,7 @@ } void -SBDebugger::reset (const lldb::DebuggerSP &debugger_sp) +SBDebugger::reset (const DebuggerSP &debugger_sp) { m_opaque_sp = debugger_sp; } @@ -659,7 +663,7 @@ { // No need to lock, the debugger list is thread safe SBDebugger sb_debugger; - lldb::DebuggerSP debugger_sp = Debugger::FindDebuggerWithID (id); + DebuggerSP debugger_sp = Debugger::FindDebuggerWithID (id); if (debugger_sp) sb_debugger.reset (debugger_sp); return sb_debugger; @@ -677,7 +681,7 @@ SBError SBDebugger::SetInternalVariable (const char *var_name, const char *value, const char *debugger_instance_name) { - lldb::UserSettingsControllerSP root_settings_controller = lldb_private::Debugger::GetSettingsController(); + UserSettingsControllerSP root_settings_controller = Debugger::GetSettingsController(); Error err = root_settings_controller->SetVariable (var_name, value, @@ -690,14 +694,14 @@ return sb_error; } -lldb::SBStringList +SBStringList SBDebugger::GetInternalVariableValue (const char *var_name, const char *debugger_instance_name) { SBStringList ret_value; SettableVariableType var_type; - lldb_private::Error err; + Error err; - lldb::UserSettingsControllerSP root_settings_controller = lldb_private::Debugger::GetSettingsController(); + UserSettingsControllerSP root_settings_controller = Debugger::GetSettingsController(); StringList value = root_settings_controller->GetVariable (var_name, var_type, debugger_instance_name, err); @@ -733,7 +737,7 @@ const char * SBDebugger::GetPrompt() const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::GetPrompt () => \"%s\"", m_opaque_sp.get(), @@ -752,7 +756,7 @@ } -lldb::ScriptLanguage +ScriptLanguage SBDebugger::GetScriptLanguage() const { if (m_opaque_sp) @@ -761,7 +765,7 @@ } void -SBDebugger::SetScriptLanguage (lldb::ScriptLanguage script_lang) +SBDebugger::SetScriptLanguage (ScriptLanguage script_lang) { if (m_opaque_sp) { @@ -791,7 +795,7 @@ if (m_opaque_sp) { const char *name = m_opaque_sp->GetInstanceName().AsCString(); - lldb::user_id_t id = m_opaque_sp->GetID(); + user_id_t id = m_opaque_sp->GetID(); description.Printf ("Debugger (instance: \"%s\", id: %d)", name, id); } else @@ -800,7 +804,7 @@ return true; } -lldb::user_id_t +user_id_t SBDebugger::GetID() { if (m_opaque_sp) From gclayton at apple.com Mon Apr 18 23:19:37 2011 From: gclayton at apple.com (Greg Clayton) Date: Tue, 19 Apr 2011 04:19:37 -0000 Subject: [Lldb-commits] [lldb] r129747 - in /lldb/trunk: include/lldb/Breakpoint/ include/lldb/Core/ include/lldb/Symbol/ lldb.xcodeproj/ source/Commands/ source/Core/ source/Symbol/ Message-ID: <20110419041938.065FE2A6C12C@llvm.org> Author: gclayton Date: Mon Apr 18 23:19:37 2011 New Revision: 129747 URL: http://llvm.org/viewvc/llvm-project?rev=129747&view=rev Log: Added a new option to the "source list" command that allows us to see where line tables specify breakpoints can be set in the source. When dumping the source, the number of breakpoints that can be set on a source line are shown as a prefix: (lldb) source list -f test.c -l1 -c222 -b 1 #include 2 #include 3 #include 4 int 5 sleep_loop (const int num_secs) [2] 6 { 7 int i; [1] 8 for (i=0; i collection; ///< The collection type for the list. Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=129747&r1=129746&r2=129747&view=diff ============================================================================== --- lldb/trunk/lldb.xcodeproj/project.pbxproj (original) +++ lldb/trunk/lldb.xcodeproj/project.pbxproj Mon Apr 18 23:19:37 2011 @@ -377,6 +377,7 @@ 26B1FCBD13381071002886E2 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C74CB6212288704006A8171 /* Carbon.framework */; }; 26B1FCC21338115F002886E2 /* Host.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7EE810F1B88F00F91463 /* Host.mm */; }; 26B42C4D1187ABA50079C8C8 /* LLDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B42C4C1187ABA50079C8C8 /* LLDB.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 26BD407F135D2AE000237D80 /* FileLineResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BD407E135D2ADF00237D80 /* FileLineResolver.cpp */; }; 26C72C94124322890068DC16 /* SBStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C72C93124322890068DC16 /* SBStream.h */; settings = {ATTRIBUTES = (Public, ); }; }; 26C72C961243229A0068DC16 /* SBStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26C72C951243229A0068DC16 /* SBStream.cpp */; }; 26D5E15F135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D5E15E135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp */; }; @@ -965,6 +966,8 @@ 26BC7F3E10F1B90C00F91463 /* ThreadList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadList.cpp; path = source/Target/ThreadList.cpp; sourceTree = ""; }; 26BC7F3F10F1B90C00F91463 /* ThreadPlan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadPlan.cpp; path = source/Target/ThreadPlan.cpp; sourceTree = ""; }; 26BC7F4C10F1BC1A00F91463 /* ObjectFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ObjectFile.cpp; path = source/Symbol/ObjectFile.cpp; sourceTree = ""; }; + 26BD407D135D2AC400237D80 /* FileLineResolver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FileLineResolver.h; path = include/lldb/Core/FileLineResolver.h; sourceTree = ""; }; + 26BD407E135D2ADF00237D80 /* FileLineResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileLineResolver.cpp; path = source/Core/FileLineResolver.cpp; sourceTree = ""; }; 26C5577B132575AD008FD8FE /* PlatformMacOSX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformMacOSX.cpp; sourceTree = ""; }; 26C5577C132575AD008FD8FE /* PlatformMacOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMacOSX.h; sourceTree = ""; }; 26C72C93124322890068DC16 /* SBStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBStream.h; path = include/lldb/API/SBStream.h; sourceTree = ""; }; @@ -1847,6 +1850,8 @@ 26BC7E7810F1B85900F91463 /* Error.cpp */, 26BC7D6110F1B77400F91463 /* Event.h */, 26BC7E7910F1B85900F91463 /* Event.cpp */, + 26BD407D135D2AC400237D80 /* FileLineResolver.h */, + 26BD407E135D2ADF00237D80 /* FileLineResolver.cpp */, 26BC7D6310F1B77400F91463 /* FileSpecList.h */, 26BC7E7B10F1B85900F91463 /* FileSpecList.cpp */, 26BC7D6410F1B77400F91463 /* Flags.h */, @@ -3136,6 +3141,7 @@ 4CD0BD0F134BFADF00CB44D4 /* ValueObjectDynamicValue.cpp in Sources */, 26D5E15F135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp in Sources */, 26D5E163135BB054006EA0A7 /* OptionGroupPlatform.cpp in Sources */, + 26BD407F135D2AE000237D80 /* FileLineResolver.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp?rev=129747&r1=129746&r2=129747&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp Mon Apr 18 23:19:37 2011 @@ -337,13 +337,10 @@ } else { - const SymbolContext &context = cur_frame->GetSymbolContext(true); - if (context.line_entry.file) + const SymbolContext &sc = cur_frame->GetSymbolContext (eSymbolContextLineEntry); + if (sc.line_entry.file) { - file = context.line_entry.file; - } - else if (context.comp_unit != NULL) - { file = context.comp_unit; + file = sc.line_entry.file; } else { Modified: lldb/trunk/source/Commands/CommandObjectSource.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectSource.cpp?rev=129747&r1=129746&r2=129747&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectSource.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectSource.cpp Mon Apr 18 23:19:37 2011 @@ -15,11 +15,12 @@ // Project includes #include "lldb/Interpreter/Args.h" #include "lldb/Core/Debugger.h" +#include "lldb/Core/FileLineResolver.h" +#include "lldb/Core/SourceManager.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Interpreter/CommandReturnObject.h" #include "lldb/Host/FileSpec.h" #include "lldb/Target/Process.h" -#include "lldb/Core/SourceManager.h" #include "lldb/Target/TargetList.h" #include "lldb/Interpreter/CommandCompletions.h" #include "lldb/Interpreter/Options.h" @@ -28,7 +29,7 @@ using namespace lldb_private; //------------------------------------------------------------------------- -// CommandObjectSourceList +// CommandObjectSourceInfo //------------------------------------------------------------------------- class CommandObjectSourceInfo : public CommandObject @@ -177,7 +178,7 @@ error.SetErrorStringWithFormat("Invalid line count: '%s'.\n", option_arg); break; - case 'f': + case 'f': file_name = option_arg; break; @@ -186,7 +187,11 @@ break; case 's': - m_modules.push_back (std::string (option_arg)); + modules.push_back (std::string (option_arg)); + break; + + case 'b': + show_bp_locs = true; break; default: error.SetErrorStringWithFormat("Unrecognized short option '%c'.\n", short_option); @@ -204,7 +209,8 @@ symbol_name.clear(); start_line = 0; num_lines = 10; - m_modules.clear(); + show_bp_locs = false; + modules.clear(); } const OptionDefinition* @@ -220,7 +226,8 @@ std::string symbol_name; uint32_t start_line; uint32_t num_lines; - STLStringArray m_modules; + STLStringArray modules; + bool show_bp_locs; }; public: @@ -291,12 +298,12 @@ bool append = true; size_t num_matches = 0; - if (m_options.m_modules.size() > 0) + if (m_options.modules.size() > 0) { ModuleList matching_modules; - for (unsigned i = 0, e = m_options.m_modules.size(); i != e; i++) + for (unsigned i = 0, e = m_options.modules.size(); i != e; i++) { - FileSpec module_spec(m_options.m_modules[i].c_str(), false); + FileSpec module_spec(m_options.modules[i].c_str(), false); if (module_spec) { matching_modules.Clear(); @@ -408,8 +415,8 @@ m_options.num_lines = end_line - line_no; } - char path_buf[PATH_MAX+1]; - start_file.GetPath(path_buf, PATH_MAX); + char path_buf[PATH_MAX]; + start_file.GetPath(path_buf, sizeof(path_buf)); result.AppendMessageWithFormat("File: %s.\n", path_buf); m_interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers (start_file, line_no, @@ -430,7 +437,8 @@ // more likely because you typed it once, then typed it again if (m_options.start_line == 0) { - if (m_interpreter.GetDebugger().GetSourceManager().DisplayMoreWithLineNumbers (&result.GetOutputStream())) + if (m_interpreter.GetDebugger().GetSourceManager().DisplayMoreWithLineNumbers (&result.GetOutputStream(), + GetBreakpointLocations ())) { result.SetStatus (eReturnStatusSuccessFinishResult); } @@ -442,7 +450,8 @@ 0, // Lines before line to display m_options.num_lines, // Lines after line to display "", // Don't mark "line" - &result.GetOutputStream())) + &result.GetOutputStream(), + GetBreakpointLocations ())) { result.SetStatus (eReturnStatusSuccessFinishResult); } @@ -465,21 +474,21 @@ SymbolContextList sc_list; size_t num_matches = 0; - if (m_options.m_modules.size() > 0) + if (m_options.modules.size() > 0) { ModuleList matching_modules; - for (unsigned i = 0, e = m_options.m_modules.size(); i != e; i++) + for (unsigned i = 0, e = m_options.modules.size(); i != e; i++) { - FileSpec module_spec(m_options.m_modules[i].c_str(), false); + FileSpec module_spec(m_options.modules[i].c_str(), false); if (module_spec) { matching_modules.Clear(); target->GetImages().FindModules (&module_spec, NULL, NULL, NULL, matching_modules); num_matches += matching_modules.ResolveSymbolContextForFilePath (filename, - 0, - check_inlines, - eSymbolContextModule | eSymbolContextCompUnit, - sc_list); + 0, + check_inlines, + eSymbolContextModule | eSymbolContextCompUnit, + sc_list); } } } @@ -535,13 +544,24 @@ { if (sc.comp_unit) { + if (m_options.show_bp_locs && exe_ctx.target) + { + const bool show_inlines = true; + m_breakpoint_locations.Reset (*sc.comp_unit, 0, show_inlines); + SearchFilter target_search_filter (exe_ctx.target->GetSP()); + target_search_filter.Search (m_breakpoint_locations); + } + else + m_breakpoint_locations.Clear(); + m_interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers (sc.comp_unit, m_options.start_line, 0, m_options.num_lines, "", - &result.GetOutputStream()); - + &result.GetOutputStream(), + GetBreakpointLocations ()); + result.SetStatus (eReturnStatusSuccessFinishResult); } else @@ -562,7 +582,15 @@ } protected: + const SymbolContextList * + GetBreakpointLocations () + { + if (m_breakpoint_locations.GetFileLineMatches().GetSize() > 0) + return &m_breakpoint_locations.GetFileLineMatches(); + return NULL; + } CommandOptions m_options; + FileLineResolver m_breakpoint_locations; }; @@ -571,6 +599,7 @@ { { LLDB_OPT_SET_ALL, false, "count", 'c', required_argument, NULL, 0, eArgTypeCount, "The number of source lines to display."}, { LLDB_OPT_SET_ALL, false, "shlib", 's', required_argument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName, "Look up the source file in the given shared library."}, +{ LLDB_OPT_SET_ALL, false, "show-breakpoints", 'b', no_argument, NULL, 0, eArgTypeNone, "Show the line table locations from the debug information that indicate valid places to set source level breakpoints."}, { LLDB_OPT_SET_1, false, "file", 'f', required_argument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename, "The file from which to display source."}, { LLDB_OPT_SET_1, false, "line", 'l', required_argument, NULL, 0, eArgTypeLineNum, "The line number at which to start the display source."}, { LLDB_OPT_SET_2, false, "name", 'n', required_argument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeSymbol, "The name of a function whose source to display."}, Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectTarget.cpp?rev=129747&r1=129746&r2=129747&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Mon Apr 18 23:19:37 2011 @@ -37,7 +37,7 @@ static void DumpTargetInfo (uint32_t target_idx, Target *target, const char *prefix_cstr, bool show_stopped_process_status, Stream &strm) { - ArchSpec &target_arch = target->GetArchitecture(); + const ArchSpec &target_arch = target->GetArchitecture(); ModuleSP exe_module_sp (target->GetExecutableModule ()); char exe_path[PATH_MAX]; Modified: lldb/trunk/source/Core/AddressResolverFileLine.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/AddressResolverFileLine.cpp?rev=129747&r1=129746&r2=129747&view=diff ============================================================================== --- lldb/trunk/source/Core/AddressResolverFileLine.cpp (original) +++ lldb/trunk/source/Core/AddressResolverFileLine.cpp Mon Apr 18 23:19:37 2011 @@ -23,7 +23,7 @@ AddressResolverFileLine::AddressResolverFileLine ( const FileSpec &file_spec, - uint32_t line_no, + uint32_t line_no, bool check_inlines ) : AddressResolver (), @@ -42,7 +42,7 @@ ( SearchFilter &filter, SymbolContext &context, - Address *addr, + Address *addr, bool containing ) { Added: lldb/trunk/source/Core/FileLineResolver.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/FileLineResolver.cpp?rev=129747&view=auto ============================================================================== --- lldb/trunk/source/Core/FileLineResolver.cpp (added) +++ lldb/trunk/source/Core/FileLineResolver.cpp Mon Apr 18 23:19:37 2011 @@ -0,0 +1,118 @@ +//===-- FileLineResolver.cpp ------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "lldb/Core/FileLineResolver.h" + +// Project includes +#include "lldb/lldb-private-log.h" +#include "lldb/Core/Log.h" +#include "lldb/Core/StreamString.h" +#include "lldb/Symbol/LineTable.h" + +using namespace lldb; +using namespace lldb_private; + +//---------------------------------------------------------------------- +// FileLineResolver: +//---------------------------------------------------------------------- +FileLineResolver::FileLineResolver +( + const FileSpec &file_spec, + uint32_t line_no, + bool check_inlines +) : + Searcher (), + m_file_spec (file_spec), + m_line_number (line_no), + m_inlines (check_inlines) +{ +} + +FileLineResolver::~FileLineResolver () +{ +} + +Searcher::CallbackReturn +FileLineResolver::SearchCallback +( + SearchFilter &filter, + SymbolContext &context, + Address *addr, + bool containing +) +{ + CompileUnit *cu = context.comp_unit; + + if (m_inlines || m_file_spec.Compare(*cu, m_file_spec, m_file_spec.GetDirectory())) + { + uint32_t start_file_idx = 0; + uint32_t file_idx = cu->GetSupportFiles().FindFileIndex(start_file_idx, m_file_spec); + if (file_idx != UINT32_MAX) + { + LineTable *line_table = cu->GetLineTable(); + if (line_table) + { + if (m_line_number == 0) + { + // Match all lines in a file... + const bool append = true; + while (file_idx != UINT32_MAX) + { + line_table->FineLineEntriesForFileIndex (file_idx, append, m_sc_list); + // Get the next file index in case we have multiple file + // entries for the same file + file_idx = cu->GetSupportFiles().FindFileIndex(file_idx + 1, m_file_spec); + } + } + else + { + // Match a specific line in a file... + } + } + } + } + return Searcher::eCallbackReturnContinue; +} + +Searcher::Depth +FileLineResolver::GetDepth() +{ + return Searcher::eDepthCompUnit; +} + +void +FileLineResolver::GetDescription (Stream *s) +{ + s->Printf ("File and line resolver for file: \"%s%s%s\" line: %u", + m_file_spec.GetDirectory().GetCString(), + m_file_spec.GetDirectory() ? "/" : "", + m_file_spec.GetFilename().GetCString(), + m_line_number); +} + +void +FileLineResolver::Clear() +{ + m_file_spec.Clear(); + m_line_number = UINT32_MAX; + m_sc_list.Clear(); + m_inlines = true; +} + +void +FileLineResolver::Reset (const FileSpec &file_spec, + uint32_t line, + bool check_inlines) +{ + m_file_spec = file_spec; + m_line_number = line; + m_sc_list.Clear(); + m_inlines = check_inlines; +} + Modified: lldb/trunk/source/Core/SearchFilter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/SearchFilter.cpp?rev=129747&r1=129746&r2=129747&view=diff ============================================================================== --- lldb/trunk/source/Core/SearchFilter.cpp (original) +++ lldb/trunk/source/Core/SearchFilter.cpp Mon Apr 18 23:19:37 2011 @@ -40,7 +40,7 @@ //---------------------------------------------------------------------- // SearchFilter constructor //---------------------------------------------------------------------- -SearchFilter::SearchFilter(lldb::TargetSP &target_sp) : +SearchFilter::SearchFilter(const TargetSP &target_sp) : m_target_sp (target_sp) { } Modified: lldb/trunk/source/Core/SourceManager.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/SourceManager.cpp?rev=129747&r1=129746&r2=129747&view=diff ============================================================================== --- lldb/trunk/source/Core/SourceManager.cpp (original) +++ lldb/trunk/source/Core/SourceManager.cpp Mon Apr 18 23:19:37 2011 @@ -15,6 +15,7 @@ // Project includes #include "lldb/Core/DataBuffer.h" #include "lldb/Core/Stream.h" +#include "lldb/Symbol/SymbolContext.h" using namespace lldb_private; @@ -85,7 +86,8 @@ uint32_t context_before, uint32_t context_after, const char* current_line_cstr, - Stream *s + Stream *s, + const SymbolContextList *bp_locs ) { if (line == 0) @@ -119,7 +121,21 @@ break; } - s->Printf("%2.2s %-4u\t", curr_line == line ? current_line_cstr : "", curr_line); + char prefix[32] = ""; + if (bp_locs) + { + uint32_t bp_count = bp_locs->NumLineEntriesWithLine (curr_line); + + if (bp_count > 0) + ::snprintf (prefix, sizeof (prefix), "[%u] ", bp_count); + else + ::snprintf (prefix, sizeof (prefix), " "); + } + + s->Printf("%s%2.2s %-4u\t", + prefix, + curr_line == line ? current_line_cstr : "", + curr_line); if (m_last_file_sp->DisplaySourceLines (curr_line, 0, 0, s) == 0) { m_last_file_line = UINT32_MAX; @@ -138,7 +154,8 @@ uint32_t context_before, uint32_t context_after, const char* current_line_cstr, - Stream *s + Stream *s, + const SymbolContextList *bp_locs ) { bool same_as_previous = m_last_file_sp && m_last_file_sp->FileSpecMatches (file_spec); @@ -152,17 +169,17 @@ m_last_file_line = 0; } - return DisplaySourceLinesWithLineNumbersUsingLastFile (line, context_before, context_after, current_line_cstr, s); + return DisplaySourceLinesWithLineNumbersUsingLastFile (line, context_before, context_after, current_line_cstr, s, bp_locs); } size_t -SourceManager::DisplayMoreWithLineNumbers (Stream *s) +SourceManager::DisplayMoreWithLineNumbers (Stream *s, const SymbolContextList *bp_locs) { if (m_last_file_sp) { if (m_last_file_line == UINT32_MAX) return 0; - DisplaySourceLinesWithLineNumbersUsingLastFile (0, m_last_file_context_before, m_last_file_context_after, "", s); + DisplaySourceLinesWithLineNumbersUsingLastFile (0, m_last_file_context_before, m_last_file_context_after, "", s, bp_locs); } return 0; } Modified: lldb/trunk/source/Symbol/LineTable.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/LineTable.cpp?rev=129747&r1=129746&r2=129747&view=diff ============================================================================== --- lldb/trunk/source/Symbol/LineTable.cpp (original) +++ lldb/trunk/source/Symbol/LineTable.cpp Mon Apr 18 23:19:37 2011 @@ -378,6 +378,41 @@ return UINT32_MAX; } +size_t +LineTable::FineLineEntriesForFileIndex (uint32_t file_idx, + bool append, + SymbolContextList &sc_list) +{ + + if (!append) + sc_list.Clear(); + + size_t num_added = 0; + const size_t count = m_entries.size(); + if (count > 0) + { + SymbolContext sc (m_comp_unit); + + for (size_t idx = 0; idx < count; ++idx) + { + // Skip line table rows that terminate the previous row (is_terminal_entry is non-zero) + if (m_entries[idx].is_terminal_entry) + continue; + + if (m_entries[idx].file_idx == file_idx) + { + if (ConvertEntryAtIndexToLineEntry (idx, sc.line_entry)) + { + ++num_added; + sc_list.Append(sc); + } + } + } + } + return num_added; +} + + void LineTable::Dump (Stream *s, Target *target, Address::DumpStyle style, Address::DumpStyle fallback_style, bool show_line_ranges) { Modified: lldb/trunk/source/Symbol/SymbolContext.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/SymbolContext.cpp?rev=129747&r1=129746&r2=129747&view=diff ============================================================================== --- lldb/trunk/source/Symbol/SymbolContext.cpp (original) +++ lldb/trunk/source/Symbol/SymbolContext.cpp Mon Apr 18 23:19:37 2011 @@ -842,3 +842,17 @@ { return m_symbol_contexts.size(); } + +uint32_t +SymbolContextList::NumLineEntriesWithLine (uint32_t line) const +{ + uint32_t match_count = 0; + const uint32_t size = m_symbol_contexts.size(); + for (uint32_t idx = 0; idx Author: johnny Date: Tue Apr 19 13:12:47 2011 New Revision: 129776 URL: http://llvm.org/viewvc/llvm-project?rev=129776&view=rev Log: Convert some tests to use the SBProcess.LaunchSimple API requiring only args, envs, and cwd from SBProcess.Launch which takes many more arguments that are useless for the test scenario. Modified: lldb/trunk/test/array_types/TestArrayTypes.py lldb/trunk/test/bitfields/TestBitfields.py lldb/trunk/test/breakpoint_conditions/TestBreakpointConditions.py Modified: lldb/trunk/test/array_types/TestArrayTypes.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/array_types/TestArrayTypes.py?rev=129776&r1=129775&r2=129776&view=diff ============================================================================== --- lldb/trunk/test/array_types/TestArrayTypes.py (original) +++ lldb/trunk/test/array_types/TestArrayTypes.py Tue Apr 19 13:12:47 2011 @@ -110,8 +110,7 @@ substrs = ["resolved = 1"]) # Now launch the process, and do not stop at entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.process = target.GetProcess() self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) Modified: lldb/trunk/test/bitfields/TestBitfields.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/bitfields/TestBitfields.py?rev=129776&r1=129775&r2=129776&view=diff ============================================================================== --- lldb/trunk/test/bitfields/TestBitfields.py (original) +++ lldb/trunk/test/bitfields/TestBitfields.py Tue Apr 19 13:12:47 2011 @@ -94,8 +94,7 @@ breakpoint = target.BreakpointCreateByLocation("main.c", self.line) self.assertTrue(breakpoint.IsValid(), VALID_BREAKPOINT) - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) # The stop reason of the thread should be breakpoint. Modified: lldb/trunk/test/breakpoint_conditions/TestBreakpointConditions.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/breakpoint_conditions/TestBreakpointConditions.py?rev=129776&r1=129775&r2=129776&view=diff ============================================================================== --- lldb/trunk/test/breakpoint_conditions/TestBreakpointConditions.py (original) +++ lldb/trunk/test/breakpoint_conditions/TestBreakpointConditions.py Tue Apr 19 13:12:47 2011 @@ -139,8 +139,7 @@ startstr = 'val == 3') # Now launch the process, and do not stop at entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.process = target.GetProcess() self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) From johnny.chen at apple.com Tue Apr 19 13:17:20 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 18:17:20 -0000 Subject: [Lldb-commits] [lldb] r129778 - /lldb/trunk/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py Message-ID: <20110419181720.433742A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 13:17:20 2011 New Revision: 129778 URL: http://llvm.org/viewvc/llvm-project?rev=129778&view=rev Log: Converted to use SBProcess.LaunchSimple(). Modified: lldb/trunk/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py Modified: lldb/trunk/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py?rev=129778&r1=129777&r2=129778&view=diff ============================================================================== --- lldb/trunk/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py (original) +++ lldb/trunk/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py Tue Apr 19 13:17:20 2011 @@ -101,8 +101,7 @@ "SetIgnoreCount() works correctly") # Now launch the process, and do not stop at entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.process = target.GetProcess() self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) From johnny.chen at apple.com Tue Apr 19 13:23:28 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 18:23:28 -0000 Subject: [Lldb-commits] [lldb] r129779 - /lldb/trunk/test/class_static/TestStaticVariables.py Message-ID: <20110419182328.C4FE02A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 13:23:28 2011 New Revision: 129779 URL: http://llvm.org/viewvc/llvm-project?rev=129779&view=rev Log: Converted to use SBProcess.LaunchSimple(). Modified: lldb/trunk/test/class_static/TestStaticVariables.py Modified: lldb/trunk/test/class_static/TestStaticVariables.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/class_static/TestStaticVariables.py?rev=129779&r1=129778&r2=129779&view=diff ============================================================================== --- lldb/trunk/test/class_static/TestStaticVariables.py (original) +++ lldb/trunk/test/class_static/TestStaticVariables.py Tue Apr 19 13:23:28 2011 @@ -80,8 +80,7 @@ self.assertTrue(breakpoint.IsValid(), VALID_BREAKPOINT) # Now launch the process, and do not stop at entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.process = target.GetProcess() self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) From johnny.chen at apple.com Tue Apr 19 13:38:30 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 18:38:30 -0000 Subject: [Lldb-commits] [lldb] r129780 - /lldb/trunk/test/cpp/dynamic-value/TestDynamicValue.py Message-ID: <20110419183830.BE0D32A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 13:38:30 2011 New Revision: 129780 URL: http://llvm.org/viewvc/llvm-project?rev=129780&view=rev Log: Converted to use SBProcess.LaunchSimple(). Modified: lldb/trunk/test/cpp/dynamic-value/TestDynamicValue.py Modified: lldb/trunk/test/cpp/dynamic-value/TestDynamicValue.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/cpp/dynamic-value/TestDynamicValue.py?rev=129780&r1=129779&r2=129780&view=diff ============================================================================== --- lldb/trunk/test/cpp/dynamic-value/TestDynamicValue.py (original) +++ lldb/trunk/test/cpp/dynamic-value/TestDynamicValue.py Tue Apr 19 13:38:30 2011 @@ -114,9 +114,7 @@ VALID_BREAKPOINT) # Now launch the process, and do not stop at the entry point. - - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple (None, None, os.getcwd()) self.assertTrue(self.process.GetState() == lldb.eStateStopped, PROCESS_STOPPED) From johnny.chen at apple.com Tue Apr 19 13:50:04 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 18:50:04 -0000 Subject: [Lldb-commits] [lldb] r129782 - /lldb/trunk/test/foundation/TestSymbolTable.py Message-ID: <20110419185004.2BF252A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 13:50:04 2011 New Revision: 129782 URL: http://llvm.org/viewvc/llvm-project?rev=129782&view=rev Log: Converted to use SBProcess.LaunchSimple(). Modified: lldb/trunk/test/foundation/TestSymbolTable.py Modified: lldb/trunk/test/foundation/TestSymbolTable.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/foundation/TestSymbolTable.py?rev=129782&r1=129781&r2=129782&view=diff ============================================================================== --- lldb/trunk/test/foundation/TestSymbolTable.py (original) +++ lldb/trunk/test/foundation/TestSymbolTable.py Tue Apr 19 13:50:04 2011 @@ -45,8 +45,7 @@ self.assertTrue(target.IsValid(), VALID_TARGET) # Launch the process, and do not stop at the entry point. - error = lldb.SBError() - process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + process = target.LaunchSimple(None, None, os.getcwd()) # # Exercise Python APIs to access the symbol table entries. From johnny.chen at apple.com Tue Apr 19 13:52:56 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 18:52:56 -0000 Subject: [Lldb-commits] [lldb] r129784 - /lldb/trunk/test/hello_world/TestHelloWorld.py Message-ID: <20110419185257.0069D2A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 13:52:56 2011 New Revision: 129784 URL: http://llvm.org/viewvc/llvm-project?rev=129784&view=rev Log: Converted to use SBProcess.LaunchSimple(). Modified: lldb/trunk/test/hello_world/TestHelloWorld.py Modified: lldb/trunk/test/hello_world/TestHelloWorld.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/hello_world/TestHelloWorld.py?rev=129784&r1=129783&r2=129784&view=diff ============================================================================== --- lldb/trunk/test/hello_world/TestHelloWorld.py (original) +++ lldb/trunk/test/hello_world/TestHelloWorld.py Tue Apr 19 13:52:56 2011 @@ -52,8 +52,7 @@ # SBTarget.Launch() issue (or is there some race condition)? if useLaunchAPI: - error = lldb.SBError() - process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + process = target.LaunchSimple(None, None, os.getcwd()) # The following isn't needed anymore, rdar://8364687 is fixed. # # Apply some dances after LaunchProcess() in order to break at "main". From johnny.chen at apple.com Tue Apr 19 14:04:38 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 19:04:38 -0000 Subject: [Lldb-commits] [lldb] r129785 - in /lldb/trunk/test: inferior-crashing/TestInferiorCrashing.py lldbtest.py Message-ID: <20110419190439.157D32A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 14:04:38 2011 New Revision: 129785 URL: http://llvm.org/viewvc/llvm-project?rev=129785&view=rev Log: Add a TraceOn(self) method to the base test class, which returns True if we are currently in trace mode (-t to dotest.py), i.e., tracing the lldb command execution. Change TestInferiorCrashing.inferior_crashing_python(self) to check this flag in order to print the stack trace of the inferior thread. Modified: lldb/trunk/test/inferior-crashing/TestInferiorCrashing.py lldb/trunk/test/lldbtest.py Modified: lldb/trunk/test/inferior-crashing/TestInferiorCrashing.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/inferior-crashing/TestInferiorCrashing.py?rev=129785&r1=129784&r2=129785&view=diff ============================================================================== --- lldb/trunk/test/inferior-crashing/TestInferiorCrashing.py (original) +++ lldb/trunk/test/inferior-crashing/TestInferiorCrashing.py Tue Apr 19 14:04:38 2011 @@ -70,7 +70,8 @@ if not thread: self.fail("Fail to stop the thread upon bad access exception") - lldbutil.PrintStackTrace(thread) + if self.TraceOn(): + lldbutil.PrintStackTrace(thread) if __name__ == '__main__': import atexit Modified: lldb/trunk/test/lldbtest.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=129785&r1=129784&r2=129785&view=diff ============================================================================== --- lldb/trunk/test/lldbtest.py (original) +++ lldb/trunk/test/lldbtest.py Tue Apr 19 14:04:38 2011 @@ -951,3 +951,7 @@ return print child + + def TraceOn(self): + """Returns True if we are in trace mode (i.e., verbose output).""" + return traceAlways From johnny.chen at apple.com Tue Apr 19 14:12:24 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 19:12:24 -0000 Subject: [Lldb-commits] [lldb] r129786 - /lldb/trunk/test/lldbtest.py Message-ID: <20110419191224.A4CA72A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 14:12:24 2011 New Revision: 129786 URL: http://llvm.org/viewvc/llvm-project?rev=129786&view=rev Log: Modify docstring. Modified: lldb/trunk/test/lldbtest.py Modified: lldb/trunk/test/lldbtest.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=129786&r1=129785&r2=129786&view=diff ============================================================================== --- lldb/trunk/test/lldbtest.py (original) +++ lldb/trunk/test/lldbtest.py Tue Apr 19 14:12:24 2011 @@ -953,5 +953,5 @@ print child def TraceOn(self): - """Returns True if we are in trace mode (i.e., verbose output).""" + """Returns True if we are in trace mode (i.e., tracing lldb command execution).""" return traceAlways From johnny.chen at apple.com Tue Apr 19 14:14:12 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 19:14:12 -0000 Subject: [Lldb-commits] [lldb] r129787 - /lldb/trunk/test/objc-stepping/TestObjCStepping.py Message-ID: <20110419191412.31D922A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 14:14:12 2011 New Revision: 129787 URL: http://llvm.org/viewvc/llvm-project?rev=129787&view=rev Log: Converted to use SBProcess.LaunchSimple(). Modified: lldb/trunk/test/objc-stepping/TestObjCStepping.py Modified: lldb/trunk/test/objc-stepping/TestObjCStepping.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/objc-stepping/TestObjCStepping.py?rev=129787&r1=129786&r2=129787&view=diff ============================================================================== --- lldb/trunk/test/objc-stepping/TestObjCStepping.py (original) +++ lldb/trunk/test/objc-stepping/TestObjCStepping.py Tue Apr 19 14:14:12 2011 @@ -64,8 +64,7 @@ self.assertTrue(break_returnStruct_call_super.IsValid(), VALID_BREAKPOINT) # Now launch the process, and do not stop at entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple (None, None, os.getcwd()) self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) From johnny.chen at apple.com Tue Apr 19 14:21:19 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 19:21:19 -0000 Subject: [Lldb-commits] [lldb] r129788 - /lldb/trunk/test/process_launch/TestProcessLaunch.py Message-ID: <20110419192119.34B412A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 14:21:19 2011 New Revision: 129788 URL: http://llvm.org/viewvc/llvm-project?rev=129788&view=rev Log: Only print more debug out when self.TraceOn() returns True. Modified: lldb/trunk/test/process_launch/TestProcessLaunch.py Modified: lldb/trunk/test/process_launch/TestProcessLaunch.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/process_launch/TestProcessLaunch.py?rev=129788&r1=129787&r2=129788&view=diff ============================================================================== --- lldb/trunk/test/process_launch/TestProcessLaunch.py (original) +++ lldb/trunk/test/process_launch/TestProcessLaunch.py Tue Apr 19 14:21:19 2011 @@ -150,7 +150,8 @@ else: # Check to see if the 'stdout' file contains the right output line = out_f.readline(); - print "line:", line + if self.TraceOn(): + print "line:", line if not re.search(mywd, line): success = False err_msg = err_msg + "The current working directory was not set correctly.\n" From johnny.chen at apple.com Tue Apr 19 14:25:38 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 19:25:38 -0000 Subject: [Lldb-commits] [lldb] r129789 - /lldb/trunk/test/python_api/event/TestEvents.py Message-ID: <20110419192538.D5D2F2A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 14:25:37 2011 New Revision: 129789 URL: http://llvm.org/viewvc/llvm-project?rev=129789&view=rev Log: Converted to use SBProcess.LaunchSimple(). Modified: lldb/trunk/test/python_api/event/TestEvents.py Modified: lldb/trunk/test/python_api/event/TestEvents.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/event/TestEvents.py?rev=129789&r1=129788&r2=129789&view=diff ============================================================================== --- lldb/trunk/test/python_api/event/TestEvents.py (original) +++ lldb/trunk/test/python_api/event/TestEvents.py Tue Apr 19 14:25:37 2011 @@ -122,8 +122,7 @@ VALID_BREAKPOINT) # Now launch the process, and do not stop at the entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.process = target.GetProcess() self.assertTrue(self.process.GetState() == lldb.eStateStopped, From johnny.chen at apple.com Tue Apr 19 14:34:41 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 19:34:41 -0000 Subject: [Lldb-commits] [lldb] r129790 - /lldb/trunk/test/python_api/frame/TestFrames.py Message-ID: <20110419193441.375192A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 14:34:41 2011 New Revision: 129790 URL: http://llvm.org/viewvc/llvm-project?rev=129790&view=rev Log: Converted to use SBProcess.LaunchSimple(). And use self.TraceOn() API. Modified: lldb/trunk/test/python_api/frame/TestFrames.py Modified: lldb/trunk/test/python_api/frame/TestFrames.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/frame/TestFrames.py?rev=129790&r1=129789&r2=129790&view=diff ============================================================================== --- lldb/trunk/test/python_api/frame/TestFrames.py (original) +++ lldb/trunk/test/python_api/frame/TestFrames.py Tue Apr 19 14:34:41 2011 @@ -44,8 +44,7 @@ # Note that we don't assign the process to self.process as in other test # cases. We want the inferior to run till it exits and there's no need # for the testing framework to kill the inferior upon tearDown(). - error = lldb.SBError() - process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + process = target.LaunchSimple(None, None, os.getcwd()) process = target.GetProcess() self.assertTrue(process.GetState() == lldb.eStateStopped, @@ -63,7 +62,8 @@ numFrames = min(3, thread.GetNumFrames()) for i in range(numFrames): frame = thread.GetFrameAtIndex(i) - print "frame:", frame + if self.TraceOn(): + print "frame:", frame #print "frame.FindValue('val', lldb.eValueTypeVariableArgument)", frame.FindValue('val', lldb.eValueTypeVariableArgument).GetValue(frame) #print "frame.FindValue('ch', lldb.eValueTypeVariableArgument)", frame.FindValue('ch', lldb.eValueTypeVariableArgument).GetValue(frame) #print "frame.EvaluateExpression('val'):", frame.EvaluateExpression('val').GetValue(frame) @@ -112,8 +112,9 @@ # By design, the 'a' call frame has the following arg vals: # o a((int)val=1, (char)ch='A') # o a((int)val=3, (char)ch='A') - print "Full stack traces when stopped on the breakpoint 'c':" - print session.getvalue() + if self.TraceOn(): + print "Full stack traces when stopped on the breakpoint 'c':" + print session.getvalue() self.expect(session.getvalue(), "Argugment values displayed correctly", exe=False, substrs = ["a((int)val=1, (char)ch='A')", From johnny.chen at apple.com Tue Apr 19 14:44:26 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 19:44:26 -0000 Subject: [Lldb-commits] [lldb] r129791 - in /lldb/trunk/test/python_api/function_symbol: TestDisasmAPI.py TestSymbolAPI.py Message-ID: <20110419194426.E58412A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 14:44:26 2011 New Revision: 129791 URL: http://llvm.org/viewvc/llvm-project?rev=129791&view=rev Log: Converted to use SBProcess.LaunchSimple() API. And use self.TraceOn() in order to print more debug output. Modified: lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py lldb/trunk/test/python_api/function_symbol/TestSymbolAPI.py Modified: lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py?rev=129791&r1=129790&r2=129791&view=diff ============================================================================== --- lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py (original) +++ lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py Tue Apr 19 14:44:26 2011 @@ -53,8 +53,7 @@ VALID_BREAKPOINT) # Now launch the process, and do not stop at entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.process = target.GetProcess() self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) @@ -74,7 +73,8 @@ context1 = target.ResolveSymbolContextForAddress(address1, lldb.eSymbolContextEverything) self.assertTrue(context1.IsValid()) - print "context1:", context1 + if self.TraceOn(): + print "context1:", context1 # Continue the inferior, the breakpoint 2 should be hit. self.process.Continue() @@ -90,11 +90,15 @@ function = frame0.GetFunction() self.assertTrue(symbol.IsValid() and function.IsValid()) - print "symbol:", symbol - print "disassembly=>\n", lldbutil.disassemble(target, symbol) - - print "function:", function - print "disassembly=>\n", lldbutil.disassemble(target, function) + disasm_output = lldbutil.disassemble(target, symbol) + if self.TraceOn(): + print "symbol:", symbol + print "disassembly=>\n", disasm_output + + disasm_output = lldbutil.disassemble(target, function) + if self.TraceOn(): + print "function:", function + print "disassembly=>\n", disasm_output sa1 = symbol.GetStartAddress() #print "sa1:", sa1 Modified: lldb/trunk/test/python_api/function_symbol/TestSymbolAPI.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/function_symbol/TestSymbolAPI.py?rev=129791&r1=129790&r2=129791&view=diff ============================================================================== --- lldb/trunk/test/python_api/function_symbol/TestSymbolAPI.py (original) +++ lldb/trunk/test/python_api/function_symbol/TestSymbolAPI.py Tue Apr 19 14:44:26 2011 @@ -53,8 +53,7 @@ VALID_BREAKPOINT) # Now launch the process, and do not stop at entry point. - error = lldb.SBError() - self.process = target.LaunchSimple (None, None, os.getcwd()) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.process = target.GetProcess() self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) @@ -85,7 +84,8 @@ self.assertTrue(addr_line2.GetSectionType() == lldb.eSectionTypeCode) # Now verify that both addresses point to the same module. - print "UUID:", addr_line1.GetModule().GetUUIDString() + if self.TraceOn(): + print "UUID:", addr_line1.GetModule().GetUUIDString() self.assertTrue(addr_line1.GetModule().GetUUIDString() == addr_line2.GetModule().GetUUIDString()) From johnny.chen at apple.com Tue Apr 19 14:49:09 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 19:49:09 -0000 Subject: [Lldb-commits] [lldb] r129792 - /lldb/trunk/test/python_api/process/TestProcessAPI.py Message-ID: <20110419194909.B03FC2A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 14:49:09 2011 New Revision: 129792 URL: http://llvm.org/viewvc/llvm-project?rev=129792&view=rev Log: Use self.TraceOn() API. Modified: lldb/trunk/test/python_api/process/TestProcessAPI.py Modified: lldb/trunk/test/python_api/process/TestProcessAPI.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/process/TestProcessAPI.py?rev=129792&r1=129791&r2=129792&view=diff ============================================================================== --- lldb/trunk/test/python_api/process/TestProcessAPI.py (original) +++ lldb/trunk/test/python_api/process/TestProcessAPI.py Tue Apr 19 14:49:09 2011 @@ -98,7 +98,8 @@ content = self.process.ReadMemory(location, 1, error) if not error.Success(): self.fail("SBProcess.ReadMemory() failed") - print "memory content:", content + if self.TraceOn(): + print "memory content:", content self.expect(content, "Result from SBProcess.ReadMemory() matches our expected output: 'x'", exe=False, @@ -148,7 +149,8 @@ content = self.process.ReadMemory(location, 1, error) if not error.Success(): self.fail("SBProcess.ReadMemory() failed") - print "memory content:", content + if self.TraceOn(): + print "memory content:", content self.expect(content, "Result from SBProcess.ReadMemory() matches our expected output: 'a'", exe=False, @@ -239,8 +241,9 @@ self.fail("Memory content read from 'my_int' does not match (int)256") # Dump the memory content.... - for i in new_bytes: - print "byte:", i + if self.TraceOn(): + for i in new_bytes: + print "byte:", i def remote_launch_should_fail(self): """Test SBProcess.RemoteLaunch() API with a process not in eStateConnected, and it should fail.""" @@ -254,7 +257,8 @@ error = lldb.SBError() process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) - print "process state:", StateTypeString(process.GetState()) + if self.TraceOn(): + print "process state:", StateTypeString(process.GetState()) self.assertTrue(process.GetState() != lldb.eStateConnected) success = process.RemoteLaunch(None, None, None, None, None, None, 0, False, error) From johnny.chen at apple.com Tue Apr 19 14:50:43 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 19:50:43 -0000 Subject: [Lldb-commits] [lldb] r129793 - /lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py Message-ID: <20110419195043.EB80D2A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 14:50:43 2011 New Revision: 129793 URL: http://llvm.org/viewvc/llvm-project?rev=129793&view=rev Log: Converted to use SBProcess.LaunchSimple(). Modified: lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py Modified: lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py?rev=129793&r1=129792&r2=129793&view=diff ============================================================================== --- lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py (original) +++ lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py Tue Apr 19 14:50:43 2011 @@ -47,8 +47,7 @@ VALID_BREAKPOINT) # Now launch the process, and do not stop at entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.process = target.GetProcess() self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) From johnny.chen at apple.com Tue Apr 19 14:54:06 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 19:54:06 -0000 Subject: [Lldb-commits] [lldb] r129795 - /lldb/trunk/test/python_api/target/TestTargetAPI.py Message-ID: <20110419195406.962722A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 14:54:06 2011 New Revision: 129795 URL: http://llvm.org/viewvc/llvm-project?rev=129795&view=rev Log: Converted to use SBProcess.LaunchSimple(). Modified: lldb/trunk/test/python_api/target/TestTargetAPI.py Modified: lldb/trunk/test/python_api/target/TestTargetAPI.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/target/TestTargetAPI.py?rev=129795&r1=129794&r2=129795&view=diff ============================================================================== --- lldb/trunk/test/python_api/target/TestTargetAPI.py (original) +++ lldb/trunk/test/python_api/target/TestTargetAPI.py Tue Apr 19 14:54:06 2011 @@ -106,8 +106,7 @@ VALID_BREAKPOINT) # Now launch the process, and do not stop at entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.process = target.GetProcess() self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) From johnny.chen at apple.com Tue Apr 19 15:11:58 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 20:11:58 -0000 Subject: [Lldb-commits] [lldb] r129797 - /lldb/trunk/test/python_api/thread/TestThreadAPI.py Message-ID: <20110419201158.C1F282A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 15:11:58 2011 New Revision: 129797 URL: http://llvm.org/viewvc/llvm-project?rev=129797&view=rev Log: Converted to use SBProcess.LaunchSimple(). And use self.TraceOn() API. Modified: lldb/trunk/test/python_api/thread/TestThreadAPI.py Modified: lldb/trunk/test/python_api/thread/TestThreadAPI.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/thread/TestThreadAPI.py?rev=129797&r1=129796&r2=129797&view=diff ============================================================================== --- lldb/trunk/test/python_api/thread/TestThreadAPI.py (original) +++ lldb/trunk/test/python_api/thread/TestThreadAPI.py Tue Apr 19 15:11:58 2011 @@ -107,7 +107,6 @@ def get_process(self): """Test Python SBThread.GetProcess() API.""" exe = os.path.join(os.getcwd(), "a.out") - self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) target = self.dbg.CreateTarget(exe) self.assertTrue(target.IsValid(), VALID_TARGET) @@ -117,8 +116,7 @@ self.runCmd("breakpoint list") # Launch the process, and do not stop at the entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) thread = get_stopped_thread(self.process, lldb.eStopReasonBreakpoint) self.assertTrue(thread != None, "There should be a thread stopped due to breakpoint") @@ -131,7 +129,6 @@ def get_stop_description(self): """Test Python SBThread.GetStopDescription() API.""" exe = os.path.join(os.getcwd(), "a.out") - self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) target = self.dbg.CreateTarget(exe) self.assertTrue(target.IsValid(), VALID_TARGET) @@ -141,8 +138,7 @@ #self.runCmd("breakpoint list") # Launch the process, and do not stop at the entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) thread = get_stopped_thread(self.process, lldb.eStopReasonBreakpoint) self.assertTrue(thread != None, "There should be a thread stopped due to breakpoint") @@ -158,7 +154,6 @@ def step_out_of_malloc_into_function_b(self): """Test Python SBThread.StepOut() API to step out of a malloc call where the call site is at function b().""" exe = os.path.join(os.getcwd(), "a.out") - self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) target = self.dbg.CreateTarget(exe) self.assertTrue(target.IsValid(), VALID_TARGET) @@ -168,8 +163,7 @@ self.runCmd("breakpoint list") # Launch the process, and do not stop at the entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) while True: thread = get_stopped_thread(self.process, lldb.eStopReasonBreakpoint) @@ -193,7 +187,6 @@ def step_over_3_times(self): """Test Python SBThread.StepOver() API.""" exe = os.path.join(os.getcwd(), "a.out") - self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) target = self.dbg.CreateTarget(exe) self.assertTrue(target.IsValid(), VALID_TARGET) @@ -203,8 +196,7 @@ self.runCmd("breakpoint list") # Launch the process, and do not stop at the entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) @@ -236,7 +228,6 @@ self.setTearDownCleanup(dictionary=d) exe = os.path.join(os.getcwd(), "a.out") - self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) target = self.dbg.CreateTarget(exe) self.assertTrue(target.IsValid(), VALID_TARGET) @@ -246,8 +237,7 @@ self.runCmd("breakpoint list") # Launch the process, and do not stop at the entry point. - error = lldb.SBError() - self.process = target.Launch (self.dbg.GetListener(), None, None, os.ctermid(), os.ctermid(), os.ctermid(), None, 0, False, error) + self.process = target.LaunchSimple(None, None, os.getcwd()) self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) @@ -262,9 +252,10 @@ # Get the start/end addresses for this line entry. start_addr = lineEntry.GetStartAddress().GetLoadAddress(target) - print "start addr:", hex(start_addr) end_addr = lineEntry.GetEndAddress().GetLoadAddress(target) - print "end addr:", hex(end_addr) + if self.TraceOn(): + print "start addr:", hex(start_addr) + print "end addr:", hex(end_addr) # Disable the breakpoint. self.assertTrue(target.DisableAllBreakpoints()) From johnny.chen at apple.com Tue Apr 19 17:11:24 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 22:11:24 -0000 Subject: [Lldb-commits] [lldb] r129825 - /lldb/trunk/test/source-manager/TestSourceManager.py Message-ID: <20110419221124.26AA72A6C12D@llvm.org> Author: johnny Date: Tue Apr 19 17:11:23 2011 New Revision: 129825 URL: http://llvm.org/viewvc/llvm-project?rev=129825&view=rev Log: Use self.TraceOn() API. Modified: lldb/trunk/test/source-manager/TestSourceManager.py Modified: lldb/trunk/test/source-manager/TestSourceManager.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/source-manager/TestSourceManager.py?rev=129825&r1=129824&r2=129825&view=diff ============================================================================== --- lldb/trunk/test/source-manager/TestSourceManager.py (original) +++ lldb/trunk/test/source-manager/TestSourceManager.py Tue Apr 19 17:11:23 2011 @@ -96,7 +96,8 @@ # Read the main.c file content. with open('main.c', 'r') as f: original_content = f.read() - print "original content:", original_content + if self.TraceOn(): + print "original content:", original_content # Modify the in-memory copy of the original source code. new_content = original_content.replace('Hello world', 'Hello lldb', 1) @@ -107,11 +108,13 @@ time.sleep(1) with open('main.c', 'w') as f: f.write(original_content) - with open('main.c', 'r') as f: - print "content restored to:", f.read() + if self.TraceOn(): + with open('main.c', 'r') as f: + print "content restored to:", f.read() # Touch the file just to be sure. os.utime('main.c', None) - print "os.path.getmtime() after restore:", os.path.getmtime('main.c') + if self.TraceOn(): + print "os.path.getmtime() after restore:", os.path.getmtime('main.c') @@ -119,8 +122,9 @@ with open('main.c', 'w') as f: time.sleep(1) f.write(new_content) - print "new content:", new_content - print "os.path.getmtime() after writing new content:", os.path.getmtime('main.c') + if self.TraceOn(): + print "new content:", new_content + print "os.path.getmtime() after writing new content:", os.path.getmtime('main.c') # Add teardown hook to restore the file to the original content. self.addTearDownHook(restore_file) From gclayton at apple.com Tue Apr 19 17:32:36 2011 From: gclayton at apple.com (Greg Clayton) Date: Tue, 19 Apr 2011 22:32:36 -0000 Subject: [Lldb-commits] [lldb] r129826 - in /lldb/trunk: include/lldb/Core/UserSettingsController.h source/Commands/CommandObjectApropos.cpp source/Commands/CommandObjectSettings.cpp source/Core/UserSettingsController.cpp source/Target/Target.cpp test/abbreviation_tests/TestAbbreviations.py test/settings/TestSettings.py Message-ID: <20110419223236.B27142A6C12C@llvm.org> Author: gclayton Date: Tue Apr 19 17:32:36 2011 New Revision: 129826 URL: http://llvm.org/viewvc/llvm-project?rev=129826&view=rev Log: General cleanup on the UserSettingsController stuff. There were 5 different places that were dumping values for the settings. Centralized all of the value dumping into a single place. When dumping values that aren't strings we no longer surround the value with single quotes. When dumping values that are strings, surround the string value with double quotes. When dumping array values, assume they are always string values, and don't put quotes around dictionary values. Modified: lldb/trunk/include/lldb/Core/UserSettingsController.h lldb/trunk/source/Commands/CommandObjectApropos.cpp lldb/trunk/source/Commands/CommandObjectSettings.cpp lldb/trunk/source/Core/UserSettingsController.cpp lldb/trunk/source/Target/Target.cpp lldb/trunk/test/abbreviation_tests/TestAbbreviations.py lldb/trunk/test/settings/TestSettings.py Modified: lldb/trunk/include/lldb/Core/UserSettingsController.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/UserSettingsController.h?rev=129826&r1=129825&r2=129826&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/UserSettingsController.h (original) +++ lldb/trunk/include/lldb/Core/UserSettingsController.h Tue Apr 19 17:32:36 2011 @@ -135,41 +135,53 @@ static void FindAllSettingsDescriptions (CommandInterpreter &interpreter, - lldb::UserSettingsControllerSP root, - std::string ¤t_prefix, + const lldb::UserSettingsControllerSP& usc_sp, + const const char *current_prefix, Stream &result_stream, Error &err); static void FindSettingsDescriptions (CommandInterpreter &interpreter, - lldb::UserSettingsControllerSP root, - std::string ¤t_prefix, + const lldb::UserSettingsControllerSP& usc_sp, + const char *current_prefix, const char *search_name, Stream &result_stream, Error &err); static void SearchAllSettingsDescriptions (CommandInterpreter &interpreter, - lldb::UserSettingsControllerSP root, - std::string ¤t_prefix, + const lldb::UserSettingsControllerSP& usc_sp, + const char *current_prefix, const char *search_word, Stream &result_stream); static void GetAllVariableValues (CommandInterpreter &interpreter, - lldb::UserSettingsControllerSP root, - std::string ¤t_prefix, + const lldb::UserSettingsControllerSP& usc_sp, + const char *current_prefix, Stream &result_stream, Error &err); + static bool + DumpValue (CommandInterpreter &interpreter, + const lldb::UserSettingsControllerSP& usc_sp, + const char *variable_dot_name, + Stream &strm); + + static bool + DumpValue (const char *variable_dot_name, + SettableVariableType var_type, + const StringList &variable_value, + Stream &strm); + static int - CompleteSettingsNames (lldb::UserSettingsControllerSP root_settings, + CompleteSettingsNames (const lldb::UserSettingsControllerSP& usc_sp, Args &partial_setting_name_pieces, bool &word_complete, StringList &matches); static int - CompleteSettingsValue (lldb::UserSettingsControllerSP root_settings, + CompleteSettingsValue (const lldb::UserSettingsControllerSP& usc_sp, const char *full_dot_name, const char *partial_value, bool &word_complete, @@ -341,10 +353,12 @@ private: UserSettingDefinition m_settings; + + typedef std::map InstanceSettingsMap; std::vector m_children; std::map m_pending_settings; - std::map m_live_settings; // live settings should never be NULL (hence 'live') + InstanceSettingsMap m_live_settings; // live settings should never be NULL (hence 'live') mutable Mutex m_children_mutex; mutable Mutex m_pending_settings_mutex; mutable Mutex m_live_settings_mutex; Modified: lldb/trunk/source/Commands/CommandObjectApropos.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectApropos.cpp?rev=129826&r1=129825&r2=129826&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectApropos.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectApropos.cpp Tue Apr 19 17:32:36 2011 @@ -99,9 +99,12 @@ StreamString settings_search_results; lldb::UserSettingsControllerSP root = Debugger::GetSettingsController (); - std::string settings_prefix = root->GetLevelName().AsCString(); + const char *settings_prefix = root->GetLevelName().GetCString(); - UserSettingsController::SearchAllSettingsDescriptions (m_interpreter, root, settings_prefix, search_word, + UserSettingsController::SearchAllSettingsDescriptions (m_interpreter, + root, + settings_prefix, + search_word, settings_search_results); if (settings_search_results.GetSize() > 0) Modified: lldb/trunk/source/Commands/CommandObjectSettings.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectSettings.cpp?rev=129826&r1=129825&r2=129826&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectSettings.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectSettings.cpp Tue Apr 19 17:32:36 2011 @@ -30,27 +30,15 @@ "A set of commands for manipulating internal settable debugger variables.", "settings []") { - bool status; - - CommandObjectSP set_command_object (new CommandObjectSettingsSet (interpreter)); - CommandObjectSP show_command_object (new CommandObjectSettingsShow (interpreter)); - CommandObjectSP list_command_object (new CommandObjectSettingsList (interpreter)); - CommandObjectSP remove_command_object (new CommandObjectSettingsRemove (interpreter)); - CommandObjectSP replace_command_object (new CommandObjectSettingsReplace (interpreter)); - CommandObjectSP insert_before_command_object (new CommandObjectSettingsInsertBefore (interpreter)); - CommandObjectSP insert_after_command_object (new CommandObjectSettingsInsertAfter(interpreter)); - CommandObjectSP append_command_object (new CommandObjectSettingsAppend(interpreter)); - CommandObjectSP clear_command_object (new CommandObjectSettingsClear(interpreter)); - - status = LoadSubCommand ("set", set_command_object); - status = LoadSubCommand ("show", show_command_object); - status = LoadSubCommand ("list", list_command_object); - status = LoadSubCommand ("remove", remove_command_object); - status = LoadSubCommand ("replace", replace_command_object); - status = LoadSubCommand ("insert-before", insert_before_command_object); - status = LoadSubCommand ("insert-after", insert_after_command_object); - status = LoadSubCommand ("append", append_command_object); - status = LoadSubCommand ("clear", clear_command_object); + LoadSubCommand ("set", CommandObjectSP (new CommandObjectSettingsSet (interpreter))); + LoadSubCommand ("show", CommandObjectSP (new CommandObjectSettingsShow (interpreter))); + LoadSubCommand ("list", CommandObjectSP (new CommandObjectSettingsList (interpreter))); + LoadSubCommand ("remove", CommandObjectSP (new CommandObjectSettingsRemove (interpreter))); + LoadSubCommand ("replace", CommandObjectSP (new CommandObjectSettingsReplace (interpreter))); + LoadSubCommand ("insert-before", CommandObjectSP (new CommandObjectSettingsInsertBefore (interpreter))); + LoadSubCommand ("insert-after", CommandObjectSP (new CommandObjectSettingsInsertAfter (interpreter))); + LoadSubCommand ("append", CommandObjectSP (new CommandObjectSettingsAppend (interpreter))); + LoadSubCommand ("clear", CommandObjectSP (new CommandObjectSettingsClear (interpreter))); } CommandObjectMultiwordSettings::~CommandObjectMultiwordSettings () @@ -123,7 +111,7 @@ bool CommandObjectSettingsSet::Execute (Args& command, CommandReturnObject &result) { - UserSettingsControllerSP root_settings = Debugger::GetSettingsController (); + UserSettingsControllerSP usc_sp (Debugger::GetSettingsController ()); const int argc = command.GetArgumentCount (); @@ -161,11 +149,11 @@ } else { - Error err = root_settings->SetVariable (var_name_string.c_str(), - var_value, - eVarSetOperationAssign, - m_options.m_override, - m_interpreter.GetDebugger().GetInstanceName().AsCString()); + Error err = usc_sp->SetVariable (var_name_string.c_str(), + var_value, + eVarSetOperationAssign, + m_options.m_override, + m_interpreter.GetDebugger().GetInstanceName().AsCString()); if (err.Fail ()) { result.AppendError (err.AsCString()); @@ -209,11 +197,11 @@ && completion_str.compare (matches.GetStringAtIndex(0)) == 0)) { matches.Clear(); - UserSettingsControllerSP root_settings = Debugger::GetSettingsController(); + UserSettingsControllerSP usc_sp = Debugger::GetSettingsController(); if (cursor_index == 1) { // The user is at the end of the variable name, which is complete and valid. - UserSettingsController::CompleteSettingsValue (root_settings, + UserSettingsController::CompleteSettingsValue (usc_sp, input.GetArgumentAtIndex (1), // variable name NULL, // empty value string word_complete, @@ -222,7 +210,7 @@ else { // The user is partly into the variable value. - UserSettingsController::CompleteSettingsValue (root_settings, + UserSettingsController::CompleteSettingsValue (usc_sp, input.GetArgumentAtIndex (1), // variable name completion_str.c_str(), // partial value string word_complete, @@ -328,11 +316,10 @@ bool -CommandObjectSettingsShow::Execute (Args& command, - CommandReturnObject &result) +CommandObjectSettingsShow::Execute (Args& command, CommandReturnObject &result) { - UserSettingsControllerSP root_settings = Debugger::GetSettingsController (); - std::string current_prefix = root_settings->GetLevelName().AsCString(); + UserSettingsControllerSP usc_sp (Debugger::GetSettingsController ()); + const char *current_prefix = usc_sp->GetLevelName().GetCString(); Error err; @@ -341,48 +328,27 @@ // The user requested to see the value of a particular variable. SettableVariableType var_type; const char *variable_name = command.GetArgumentAtIndex (0); - StringList value = root_settings->GetVariable (variable_name, var_type, - m_interpreter.GetDebugger().GetInstanceName().AsCString(), - err); + StringList value = usc_sp->GetVariable (variable_name, + var_type, + m_interpreter.GetDebugger().GetInstanceName().AsCString(), + err); if (err.Fail ()) { result.AppendError (err.AsCString()); result.SetStatus (eReturnStatusFailed); - } + } else { - StreamString tmp_str; - char *type_name = (char *) ""; - if (var_type != eSetVarTypeNone) - { - tmp_str.Printf (" (%s)", UserSettingsController::GetTypeString (var_type)); - type_name = (char *) tmp_str.GetData(); - } - - if (value.GetSize() == 0) - result.AppendMessageWithFormat ("%s%s = ''\n", variable_name, type_name); - else if ((var_type != eSetVarTypeArray) && (var_type != eSetVarTypeDictionary)) - result.AppendMessageWithFormat ("%s%s = '%s'\n", variable_name, type_name, value.GetStringAtIndex (0)); - else - { - result.AppendMessageWithFormat ("%s%s:\n", variable_name, type_name); - for (unsigned i = 0, e = value.GetSize(); i != e; ++i) - { - if (var_type == eSetVarTypeArray) - result.AppendMessageWithFormat (" [%d]: '%s'\n", i, value.GetStringAtIndex (i)); - else if (var_type == eSetVarTypeDictionary) - result.AppendMessageWithFormat (" '%s'\n", value.GetStringAtIndex (i)); - } - } - result.SetStatus (eReturnStatusSuccessFinishNoResult); + UserSettingsController::DumpValue(m_interpreter, usc_sp, variable_name, result.GetOutputStream()); + result.SetStatus (eReturnStatusSuccessFinishResult); } } else { UserSettingsController::GetAllVariableValues (m_interpreter, - root_settings, + usc_sp, current_prefix, result.GetOutputStream(), err); @@ -459,18 +425,17 @@ bool -CommandObjectSettingsList::Execute ( Args& command, - CommandReturnObject &result) +CommandObjectSettingsList::Execute (Args& command, CommandReturnObject &result) { - UserSettingsControllerSP root_settings = Debugger::GetSettingsController (); - std::string current_prefix = root_settings->GetLevelName().AsCString(); + UserSettingsControllerSP usc_sp (Debugger::GetSettingsController ()); + const char *current_prefix = usc_sp->GetLevelName().GetCString(); Error err; if (command.GetArgumentCount() == 0) { UserSettingsController::FindAllSettingsDescriptions (m_interpreter, - root_settings, + usc_sp, current_prefix, result.GetOutputStream(), err); @@ -479,7 +444,7 @@ { const char *search_name = command.GetArgumentAtIndex (0); UserSettingsController::FindSettingsDescriptions (m_interpreter, - root_settings, + usc_sp, current_prefix, search_name, result.GetOutputStream(), @@ -574,10 +539,9 @@ } bool -CommandObjectSettingsRemove::Execute ( Args& command, - CommandReturnObject &result) +CommandObjectSettingsRemove::Execute (Args& command, CommandReturnObject &result) { - UserSettingsControllerSP root_settings = Debugger::GetSettingsController (); + UserSettingsControllerSP usc_sp (Debugger::GetSettingsController ()); const int argc = command.GetArgumentCount (); @@ -611,12 +575,12 @@ index_value_string = index_value; - Error err = root_settings->SetVariable (var_name_string.c_str(), - NULL, - eVarSetOperationRemove, - true, - m_interpreter.GetDebugger().GetInstanceName().AsCString(), - index_value_string.c_str()); + Error err = usc_sp->SetVariable (var_name_string.c_str(), + NULL, + eVarSetOperationRemove, + true, + m_interpreter.GetDebugger().GetInstanceName().AsCString(), + index_value_string.c_str()); if (err.Fail ()) { result.AppendError (err.AsCString()); @@ -710,10 +674,9 @@ } bool -CommandObjectSettingsReplace::Execute ( Args& command, - CommandReturnObject &result) +CommandObjectSettingsReplace::Execute (Args& command, CommandReturnObject &result) { - UserSettingsControllerSP root_settings = Debugger::GetSettingsController (); + UserSettingsControllerSP usc_sp (Debugger::GetSettingsController ()); const int argc = command.GetArgumentCount (); @@ -761,12 +724,12 @@ } else { - Error err = root_settings->SetVariable (var_name_string.c_str(), - var_value, - eVarSetOperationReplace, - true, - m_interpreter.GetDebugger().GetInstanceName().AsCString(), - index_value_string.c_str()); + Error err = usc_sp->SetVariable (var_name_string.c_str(), + var_value, + eVarSetOperationReplace, + true, + m_interpreter.GetDebugger().GetInstanceName().AsCString(), + index_value_string.c_str()); if (err.Fail ()) { result.AppendError (err.AsCString()); @@ -855,10 +818,9 @@ } bool -CommandObjectSettingsInsertBefore::Execute ( Args& command, - CommandReturnObject &result) +CommandObjectSettingsInsertBefore::Execute (Args& command, CommandReturnObject &result) { - UserSettingsControllerSP root_settings = Debugger::GetSettingsController (); + UserSettingsControllerSP usc_sp (Debugger::GetSettingsController ()); const int argc = command.GetArgumentCount (); @@ -907,12 +869,12 @@ } else { - Error err = root_settings->SetVariable (var_name_string.c_str(), - var_value, - eVarSetOperationInsertBefore, - true, - m_interpreter.GetDebugger().GetInstanceName().AsCString(), - index_value_string.c_str()); + Error err = usc_sp->SetVariable (var_name_string.c_str(), + var_value, + eVarSetOperationInsertBefore, + true, + m_interpreter.GetDebugger().GetInstanceName().AsCString(), + index_value_string.c_str()); if (err.Fail ()) { result.AppendError (err.AsCString()); @@ -1002,10 +964,9 @@ } bool -CommandObjectSettingsInsertAfter::Execute ( Args& command, - CommandReturnObject &result) +CommandObjectSettingsInsertAfter::Execute (Args& command, CommandReturnObject &result) { - UserSettingsControllerSP root_settings = Debugger::GetSettingsController (); + UserSettingsControllerSP usc_sp (Debugger::GetSettingsController ()); const int argc = command.GetArgumentCount (); @@ -1054,12 +1015,12 @@ } else { - Error err = root_settings->SetVariable (var_name_string.c_str(), - var_value, - eVarSetOperationInsertAfter, - true, - m_interpreter.GetDebugger().GetInstanceName().AsCString(), - index_value_string.c_str()); + Error err = usc_sp->SetVariable (var_name_string.c_str(), + var_value, + eVarSetOperationInsertAfter, + true, + m_interpreter.GetDebugger().GetInstanceName().AsCString(), + index_value_string.c_str()); if (err.Fail ()) { result.AppendError (err.AsCString()); @@ -1139,10 +1100,9 @@ } bool -CommandObjectSettingsAppend::Execute (Args& command, - CommandReturnObject &result) +CommandObjectSettingsAppend::Execute (Args& command, CommandReturnObject &result) { - UserSettingsControllerSP root_settings = Debugger::GetSettingsController (); + UserSettingsControllerSP usc_sp (Debugger::GetSettingsController ()); const int argc = command.GetArgumentCount (); @@ -1179,11 +1139,11 @@ } else { - Error err = root_settings->SetVariable (var_name_string.c_str(), - var_value, - eVarSetOperationAppend, - true, - m_interpreter.GetDebugger().GetInstanceName().AsCString()); + Error err = usc_sp->SetVariable (var_name_string.c_str(), + var_value, + eVarSetOperationAppend, + true, + m_interpreter.GetDebugger().GetInstanceName().AsCString()); if (err.Fail ()) { result.AppendError (err.AsCString()); @@ -1253,10 +1213,9 @@ } bool -CommandObjectSettingsClear::Execute ( Args& command, - CommandReturnObject &result) +CommandObjectSettingsClear::Execute (Args& command, CommandReturnObject &result) { - UserSettingsControllerSP root_settings = Debugger::GetSettingsController (); + UserSettingsControllerSP usc_sp (Debugger::GetSettingsController ()); const int argc = command.GetArgumentCount (); @@ -1275,11 +1234,11 @@ return false; } - Error err = root_settings->SetVariable (var_name, - NULL, - eVarSetOperationClear, - false, - m_interpreter.GetDebugger().GetInstanceName().AsCString()); + Error err = usc_sp->SetVariable (var_name, + NULL, + eVarSetOperationClear, + false, + m_interpreter.GetDebugger().GetInstanceName().AsCString()); if (err.Fail ()) { Modified: lldb/trunk/source/Core/UserSettingsController.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/UserSettingsController.cpp?rev=129826&r1=129825&r2=129826&view=diff ============================================================================== --- lldb/trunk/source/Core/UserSettingsController.cpp (original) +++ lldb/trunk/source/Core/UserSettingsController.cpp Tue Apr 19 17:32:36 2011 @@ -22,7 +22,7 @@ static void DumpSettingEntry (CommandInterpreter &interpreter, - Stream &result_stream, + Stream &strm, const uint32_t max_len, const SettingEntry &entry) { @@ -34,7 +34,7 @@ if (entry.default_value && entry.default_value[0]) description.Printf (" (default: %s)", entry.default_value); - interpreter.OutputFormattedHelpText (result_stream, + interpreter.OutputFormattedHelpText (strm, entry.var_name, "--", description.GetData(), @@ -42,7 +42,7 @@ if (entry.enum_values && entry.enum_values[0].string_value) { - interpreter.OutputFormattedHelpText (result_stream, + interpreter.OutputFormattedHelpText (strm, "", " ", "Enumeration values:", @@ -56,7 +56,7 @@ entry.enum_values[enum_idx].usage); else description.Printf ("%s", entry.enum_values[enum_idx].string_value); - interpreter.OutputFormattedHelpText (result_stream, + interpreter.OutputFormattedHelpText (strm, "", " ", description.GetData(), @@ -82,6 +82,7 @@ UserSettingsController::~UserSettingsController () { + Mutex::Locker locker (m_live_settings_mutex); m_live_settings.clear(); } @@ -141,7 +142,7 @@ UserSettingsController::InitializeGlobalVariables () { int num_entries; - const char *prefix = GetLevelName().AsCString(); + const char *prefix = GetLevelName().GetCString(); num_entries = m_settings.global_settings.size(); for (int i = 0; i < num_entries; ++i) @@ -247,7 +248,7 @@ if (parent_prefix.length() > 0) parent_prefix.append ("."); } - parent_prefix.append (GetLevelName().AsCString()); + parent_prefix.append (GetLevelName().GetCString()); } void @@ -337,7 +338,7 @@ if (entry == NULL) { err.SetErrorStringWithFormat ("Unable to find variable '%s.%s'; cannot assign value.\n", - prefix.AsCString(), const_var_name.AsCString()); + prefix.GetCString(), const_var_name.GetCString()); return err; } else @@ -424,7 +425,7 @@ if (entry == NULL) { err.SetErrorStringWithFormat ("Unknown instance variable '%s'; cannot assign value.\n", - const_var_name.AsCString()); + const_var_name.GetCString()); return err; } @@ -465,7 +466,7 @@ { // Scope for mutex. Mutex::Locker locker (m_pending_settings_mutex); - m_pending_settings[instance_name.AsCString()] = current_settings_sp; + m_pending_settings[instance_name.GetCString()] = current_settings_sp; } if (override) @@ -522,7 +523,7 @@ else { err.SetErrorStringWithFormat ("'%s' is not a valid level name; was expecting '%s'. Cannot assign value.\n", - prefix.AsCString(), m_settings.level_name.AsCString()); + prefix.GetCString(), m_settings.level_name.GetCString()); } return err; @@ -604,7 +605,7 @@ { // Look for instance name setting in pending settings. - std::string inst_name_str = instance_name.AsCString(); + std::string inst_name_str = instance_name.GetCString(); std::map::iterator pos; pos = m_pending_settings.find (inst_name_str); @@ -684,10 +685,10 @@ // Add surrounding brackets to instance name if not already present. - if (instance_name.AsCString()[0] != '[') - tmp_name.Printf ("[%s]", instance_name.AsCString()); + if (instance_name.GetCString()[0] != '[') + tmp_name.Printf ("[%s]", instance_name.GetCString()); else - tmp_name.Printf ("%s", instance_name.AsCString()); + tmp_name.Printf ("%s", instance_name.GetCString()); std::string instance_name_str (tmp_name.GetData()); std::map::iterator pos; @@ -704,10 +705,10 @@ // Add surrounding brackets to instance name if not already present. - if (instance_name.AsCString()[0] != '[') - tmp_name.Printf ("[%s]", instance_name.AsCString()); + if (instance_name.GetCString()[0] != '[') + tmp_name.Printf ("[%s]", instance_name.GetCString()); else - tmp_name.Printf ("%s", instance_name.AsCString()); + tmp_name.Printf ("%s", instance_name.GetCString()); std::string instance_name_str (tmp_name.GetData()); // Need std::string for std::map look-up @@ -776,7 +777,7 @@ InstanceSettingsSP UserSettingsController::PendingSettingsForInstance (const ConstString &instance_name) { - std::string name_str (instance_name.AsCString()); + std::string name_str (instance_name.GetCString()); std::map::iterator pos; Mutex::Locker locker (m_pending_settings_mutex); @@ -788,7 +789,7 @@ } else { - InstanceSettingsSP new_settings_sp = CreateInstanceSettings (instance_name.AsCString()); + InstanceSettingsSP new_settings_sp = CreateInstanceSettings (instance_name.GetCString()); CopyDefaultSettings (new_settings_sp, instance_name, true); m_pending_settings[name_str] = new_settings_sp; return new_settings_sp; @@ -802,50 +803,30 @@ } void -UserSettingsController::GetAllDefaultSettingValues (Stream &result_stream) +UserSettingsController::GetAllDefaultSettingValues (Stream &strm) { std::string parent_prefix; BuildParentPrefix (parent_prefix); - const char *prefix = parent_prefix.c_str(); for (int i = 0; i < m_settings.instance_settings.size(); ++i) { SettingEntry &entry = m_settings.instance_settings[i]; ConstString var_name (entry.var_name); - StringList tmp_value; - m_default_settings->GetInstanceSettingsValue (entry, var_name, tmp_value, NULL); - - StreamString value_string; - bool multi_value = false; - - if (tmp_value.GetSize() == 1) - value_string.Printf ("%s", tmp_value.GetStringAtIndex (0)); - else - { - for (int j = 0; j < tmp_value.GetSize(); ++j) - { - if (entry.var_type == eSetVarTypeArray) - value_string.Printf ("\n [%d]: '%s'", j, tmp_value.GetStringAtIndex (j)); - else if (entry.var_type == eSetVarTypeDictionary) - value_string.Printf ("\n '%s'", tmp_value.GetStringAtIndex (j)); - } - multi_value = true; - } - - if (! parent_prefix.empty()) - { - if (multi_value) - result_stream.Printf ("%s.%s (%s):%s\n", prefix, var_name.AsCString(), - UserSettingsController::GetTypeString (entry.var_type), value_string.GetData()); - else - result_stream.Printf ("%s.%s (%s) = '%s'\n", prefix, var_name.AsCString(), - UserSettingsController::GetTypeString (entry.var_type), value_string.GetData()); - } + StringList value; + m_default_settings->GetInstanceSettingsValue (entry, var_name, value, NULL); + + if (!parent_prefix.empty()) + strm.Printf ("%s.", parent_prefix.c_str()); + + DumpValue (var_name.GetCString(), + entry.var_type, + value, + strm); } } void -UserSettingsController::GetAllPendingSettingValues (Stream &result_stream) +UserSettingsController::GetAllPendingSettingValues (Stream &strm) { std::map::iterator pos; @@ -881,13 +862,13 @@ if (parent_prefix.length() > 0) { - result_stream.Printf ("%s.%s.%s (%s) = '%s' [pending]\n", prefix, instance_name.AsCString(), - var_name.AsCString(), UserSettingsController::GetTypeString (entry.var_type), + strm.Printf ("%s.%s.%s (%s) = '%s' [pending]\n", prefix, instance_name.GetCString(), + var_name.GetCString(), UserSettingsController::GetTypeString (entry.var_type), value_str.GetData()); } else { - result_stream.Printf ("%s (%s) = '%s' [pending]\n", var_name.AsCString(), + strm.Printf ("%s (%s) = '%s' [pending]\n", var_name.GetCString(), UserSettingsController::GetTypeString (entry.var_type), value_str.GetData()); } @@ -898,30 +879,24 @@ InstanceSettings * UserSettingsController::FindSettingsForInstance (const ConstString &instance_name) { - std::string instance_name_str (instance_name.AsCString()); - std::map::iterator pos; - - pos = m_live_settings.find (instance_name_str); + std::string instance_name_str (instance_name.GetCString()); + Mutex::Locker locker (m_live_settings_mutex); + InstanceSettingsMap::iterator pos = m_live_settings.find (instance_name_str); if (pos != m_live_settings.end ()) - { - InstanceSettings *settings = pos->second; - return settings; - } - + return pos->second; return NULL; } void UserSettingsController::GetAllInstanceVariableValues (CommandInterpreter &interpreter, - Stream &result_stream) + Stream &strm) { - std::map::iterator pos; std::string parent_prefix; BuildParentPrefix (parent_prefix); - const char *prefix = parent_prefix.c_str(); StreamString description; - for (pos = m_live_settings.begin(); pos != m_live_settings.end(); ++pos) + Mutex::Locker locker (m_live_settings_mutex); + for (InstanceSettingsMap::iterator pos = m_live_settings.begin(); pos != m_live_settings.end(); ++pos) { std::string instance_name = pos->first; InstanceSettings *settings = pos->second; @@ -932,31 +907,11 @@ const ConstString var_name (entry.var_name); StringList tmp_value; settings->GetInstanceSettingsValue (entry, var_name, tmp_value, NULL); - StreamString tmp_value_str; - - if (tmp_value.GetSize() == 0) - tmp_value_str.Printf (""); - else if (tmp_value.GetSize() == 1) - tmp_value_str.Printf ("%s", tmp_value.GetStringAtIndex (0)); - else - { - for (int j = 0; j < tmp_value.GetSize(); ++j) - tmp_value_str.Printf ("%s ",tmp_value.GetStringAtIndex (j)); - } - description.Clear(); - if (parent_prefix.length() > 0) - { - description.Printf ("%s.%s.%s (%s) = '%s'", prefix, instance_name.c_str(), var_name.AsCString(), - UserSettingsController::GetTypeString (entry.var_type), - tmp_value_str.GetData()); - } - else - { - description.Printf ("%s (%s) = '%s'", var_name.AsCString(), - UserSettingsController::GetTypeString (entry.var_type), tmp_value_str.GetData()); - } - result_stream.Printf ("%s\n", description.GetData()); + if (!parent_prefix.empty()) + strm.Printf ("%s.", parent_prefix.c_str()); + + DumpValue(var_name.GetCString(), entry.var_type, tmp_value, strm); } } } @@ -968,14 +923,14 @@ const char *index_value, Error &err) { - std::map::iterator pos; StreamString description; - for (pos = m_live_settings.begin(); pos != m_live_settings.end(); ++pos) + Mutex::Locker locker (m_live_settings_mutex); + for (InstanceSettingsMap::iterator pos = m_live_settings.begin(); pos != m_live_settings.end(); ++pos) { InstanceSettings *settings = pos->second; StreamString tmp_name; - tmp_name.Printf ("[%s]", settings->GetInstanceName().AsCString()); + tmp_name.Printf ("[%s]", settings->GetInstanceName().GetCString()); const ConstString instance_name (tmp_name.GetData()); const SettingEntry *entry = GetInstanceEntry (var_name); settings->UpdateInstanceSettingsVariable (var_name, index_value, value, instance_name, *entry, op, err, false); @@ -988,10 +943,10 @@ { Mutex::Locker locker (m_live_settings_mutex); StreamString tmp_name; - tmp_name.Printf ("[%s]", instance_settings->GetInstanceName().AsCString()); + tmp_name.Printf ("[%s]", instance_settings->GetInstanceName().GetCString()); const ConstString instance_name (tmp_name.GetData()); - std::string instance_name_str (instance_name.AsCString()); - if (instance_name_str.compare (InstanceSettings::GetDefaultName().AsCString()) != 0) + std::string instance_name_str (instance_name.GetCString()); + if (instance_name_str.compare (InstanceSettings::GetDefaultName().GetCString()) != 0) m_live_settings[instance_name_str] = instance_settings; } @@ -1000,12 +955,10 @@ { Mutex::Locker locker (m_live_settings_mutex); StreamString tmp_name; - tmp_name.Printf ("[%s]", instance->GetInstanceName().AsCString()); + tmp_name.Printf ("[%s]", instance->GetInstanceName().GetCString()); std::string instance_name (tmp_name.GetData()); - std::map ::iterator pos; - - pos = m_live_settings.find (instance_name); + InstanceSettingsMap::iterator pos = m_live_settings.find (instance_name); if (pos != m_live_settings.end()) m_live_settings.erase (pos); } @@ -1022,7 +975,7 @@ SettingEntry new_entry; new_entry = table_entry; - new_entry.var_name = const_var_name.AsCString(); + new_entry.var_name = const_var_name.GetCString(); if (global) m_settings.global_settings.push_back (new_entry); @@ -1090,73 +1043,80 @@ void UserSettingsController::FindAllSettingsDescriptions (CommandInterpreter &interpreter, - UserSettingsControllerSP root, - std::string ¤t_prefix, - Stream &result_stream, + const UserSettingsControllerSP& usc_sp, + const char *current_prefix, + Stream &strm, Error &err) { // Write out current prefix line. StreamString prefix_line; StreamString description; - uint32_t max_len = FindMaxNameLength (root->m_settings.global_settings); - int num_entries = root->m_settings.global_settings.size(); + uint32_t max_len = FindMaxNameLength (usc_sp->m_settings.global_settings); + int num_entries = usc_sp->m_settings.global_settings.size(); - if (! current_prefix.empty()) - result_stream.Printf ("\n'%s' variables:\n\n", current_prefix.c_str()); + if (current_prefix && current_prefix[0]) + strm.Printf ("\n'%s' variables:\n\n", current_prefix); else - result_stream.Printf ("\nTop level variables:\n\n"); + strm.Printf ("\nTop level variables:\n\n"); if (num_entries > 0) { // Write out all "global" variables. for (int i = 0; i < num_entries; ++i) { - DumpSettingEntry (interpreter, result_stream, max_len, root->m_settings.global_settings[i]); + DumpSettingEntry (interpreter, strm, max_len, usc_sp->m_settings.global_settings[i]); } } - num_entries = root->m_settings.instance_settings.size(); - max_len = FindMaxNameLength (root->m_settings.instance_settings); + num_entries = usc_sp->m_settings.instance_settings.size(); + max_len = FindMaxNameLength (usc_sp->m_settings.instance_settings); if (num_entries > 0) { // Write out all instance variables. for (int i = 0; i < num_entries; ++i) { - DumpSettingEntry (interpreter, result_stream, max_len, root->m_settings.instance_settings[i]); + DumpSettingEntry (interpreter, strm, max_len, usc_sp->m_settings.instance_settings[i]); } } // Now, recurse across all children. - int num_children = root->GetNumChildren(); + int num_children = usc_sp->GetNumChildren(); for (int i = 0; i < num_children; ++i) { - UserSettingsControllerSP child = root->GetChildAtIndex (i); + UserSettingsControllerSP child = usc_sp->GetChildAtIndex (i); if (child) { ConstString child_prefix = child->GetLevelName(); - StreamString new_prefix; - if (! current_prefix.empty()) - new_prefix.Printf ("%s.%s", current_prefix.c_str(), child_prefix.AsCString()); + if (current_prefix && current_prefix[0]) + { + StreamString new_prefix; + new_prefix.Printf ("%s.%s", current_prefix, child_prefix.GetCString()); + UserSettingsController::FindAllSettingsDescriptions (interpreter, + child, + new_prefix.GetData(), + strm, + err); + } else - new_prefix.Printf ("%s", child_prefix.AsCString()); - std::string new_prefix_str = new_prefix.GetData(); - UserSettingsController::FindAllSettingsDescriptions (interpreter, - child, - new_prefix_str, - result_stream, - err); + { + UserSettingsController::FindAllSettingsDescriptions (interpreter, + child, + child_prefix.GetCString(), + strm, + err); + } } } } void UserSettingsController::FindSettingsDescriptions (CommandInterpreter &interpreter, - UserSettingsControllerSP root, - std::string ¤t_prefix, + const UserSettingsControllerSP& usc_sp, + const char *current_prefix, const char *search_name, - Stream &result_stream, + Stream &strm, Error &err) { Args names = UserSettingsController::BreakNameIntoPieces (search_name); @@ -1165,15 +1125,15 @@ if (num_pieces == 0) return; - if (root->GetLevelName().GetLength() > 0) + if (usc_sp->GetLevelName().GetLength() > 0) { ConstString prefix (names.GetArgumentAtIndex (0)); - if (prefix != root->GetLevelName()) + if (prefix != usc_sp->GetLevelName()) { std::string parent_prefix; - root->BuildParentPrefix (parent_prefix); + usc_sp->BuildParentPrefix (parent_prefix); err.SetErrorStringWithFormat ("Cannot find match for '%s.%s'\n", parent_prefix.c_str(), - prefix.AsCString()); + prefix.GetCString()); return; } else @@ -1189,30 +1149,30 @@ StreamString prefix_line; StreamString description; uint32_t max_len; - int num_entries = root->m_settings.global_settings.size(); + int num_entries = usc_sp->m_settings.global_settings.size(); - max_len = FindMaxNameLength (root->m_settings.global_settings); + max_len = FindMaxNameLength (usc_sp->m_settings.global_settings); - result_stream.Printf ("\n'%s' variables:\n\n", search_name); + strm.Printf ("\n'%s' variables:\n\n", search_name); if (num_entries > 0) { // Write out all "global" variables. for (int i = 0; i < num_entries; ++i) { - DumpSettingEntry (interpreter, result_stream, max_len, root->m_settings.global_settings[i]); + DumpSettingEntry (interpreter, strm, max_len, usc_sp->m_settings.global_settings[i]); } } - num_entries = root->m_settings.instance_settings.size(); - max_len = FindMaxNameLength (root->m_settings.instance_settings); + num_entries = usc_sp->m_settings.instance_settings.size(); + max_len = FindMaxNameLength (usc_sp->m_settings.instance_settings); if (num_entries > 0) { // Write out all instance variables. for (int i = 0; i < num_entries; ++i) { - DumpSettingEntry (interpreter, result_stream, max_len, root->m_settings.instance_settings[i]); + DumpSettingEntry (interpreter, strm, max_len, usc_sp->m_settings.instance_settings[i]); } } } @@ -1221,26 +1181,26 @@ ConstString var_name (names.GetArgumentAtIndex (0)); bool is_global = false; - const SettingEntry *setting_entry = root->GetGlobalEntry (var_name); + const SettingEntry *setting_entry = usc_sp->GetGlobalEntry (var_name); if (setting_entry == NULL) - setting_entry = root->GetInstanceEntry (var_name); + setting_entry = usc_sp->GetInstanceEntry (var_name); else is_global = true; // Check to see if it is a global or instance variable name. if (setting_entry != NULL) { - DumpSettingEntry (interpreter, result_stream, var_name.GetLength(), *setting_entry); + DumpSettingEntry (interpreter, strm, var_name.GetLength(), *setting_entry); } else { // It must be a child name. - int num_children = root->GetNumChildren(); + int num_children = usc_sp->GetNumChildren(); bool found = false; for (int i = 0; i < num_children && !found; ++i) { - UserSettingsControllerSP child = root->GetChildAtIndex (i); + UserSettingsControllerSP child = usc_sp->GetChildAtIndex (i); if (child) { ConstString child_prefix = child->GetLevelName(); @@ -1250,8 +1210,8 @@ UserSettingsController::FindSettingsDescriptions (interpreter, child, current_prefix, - var_name.AsCString(), - result_stream, + var_name.GetCString(), + strm, err); } } @@ -1259,7 +1219,7 @@ if (!found) { std::string parent_prefix; - root->BuildParentPrefix (parent_prefix); + usc_sp->BuildParentPrefix (parent_prefix); err.SetErrorStringWithFormat ("Cannot find match for '%s.%s'\n", parent_prefix.c_str(), search_name); return; } @@ -1278,11 +1238,11 @@ rest_of_search_name.Printf ("."); } - int num_children = root->GetNumChildren(); + int num_children = usc_sp->GetNumChildren(); bool found = false; for (int i = 0; i < num_children && !found; ++i) { - UserSettingsControllerSP child = root->GetChildAtIndex (i); + UserSettingsControllerSP child = usc_sp->GetChildAtIndex (i); if (child) { ConstString child_prefix = child->GetLevelName(); @@ -1290,7 +1250,7 @@ { found = true; UserSettingsController::FindSettingsDescriptions (interpreter, child, current_prefix, - rest_of_search_name.GetData(), result_stream, + rest_of_search_name.GetData(), strm, err); } } @@ -1298,7 +1258,7 @@ if (!found) { std::string parent_prefix; - root->BuildParentPrefix (parent_prefix); + usc_sp->BuildParentPrefix (parent_prefix); err.SetErrorStringWithFormat ("Cannot find match for '%s.%s'\n", parent_prefix.c_str(), search_name); return; } @@ -1307,135 +1267,212 @@ void UserSettingsController::SearchAllSettingsDescriptions (CommandInterpreter &interpreter, - UserSettingsControllerSP root, - std::string ¤t_prefix, + const UserSettingsControllerSP& usc_sp, + const char *current_prefix, const char *search_word, - Stream &result_stream) + Stream &strm) { if ((search_word == NULL) || (strlen (search_word) == 0)) return; - int num_entries = root->m_settings.global_settings.size(); + int num_entries = usc_sp->m_settings.global_settings.size(); if (num_entries > 0) { for (int i = 0; i < num_entries; ++i) { - const SettingEntry &entry = root->m_settings.global_settings[i]; + const SettingEntry &entry = usc_sp->m_settings.global_settings[i]; if (strcasestr (entry.description, search_word) != NULL) { StreamString var_name; - if (current_prefix.size() > 0) - var_name.Printf ("%s.%s", current_prefix.c_str(), entry.var_name); + if (current_prefix && current_prefix[0]) + var_name.Printf ("%s.%s", current_prefix, entry.var_name); else var_name.Printf ("%s", entry.var_name); - interpreter.OutputFormattedHelpText (result_stream, var_name.GetData(), "--", entry.description, + interpreter.OutputFormattedHelpText (strm, var_name.GetData(), "--", entry.description, var_name.GetSize()); } } } - num_entries = root->m_settings.instance_settings.size(); + num_entries = usc_sp->m_settings.instance_settings.size(); if (num_entries > 0) { for (int i = 0; i < num_entries; ++i) { - SettingEntry &entry = root->m_settings.instance_settings[i]; + SettingEntry &entry = usc_sp->m_settings.instance_settings[i]; if (strcasestr (entry.description, search_word) != NULL) { StreamString var_name; - if (current_prefix.size() > 0) - var_name.Printf ("%s.%s", current_prefix.c_str(), entry.var_name); + if (current_prefix && current_prefix[0]) + var_name.Printf ("%s.%s", current_prefix, entry.var_name); else var_name.Printf ("%s", entry.var_name); - interpreter.OutputFormattedHelpText (result_stream, var_name.GetData(), "--", entry.description, + interpreter.OutputFormattedHelpText (strm, + var_name.GetData(), + "--", + entry.description, var_name.GetSize()); } } } - int num_children = root->GetNumChildren (); + int num_children = usc_sp->GetNumChildren (); for (int i = 0; i < num_children; ++i) { - UserSettingsControllerSP child = root->GetChildAtIndex (i); + UserSettingsControllerSP child = usc_sp->GetChildAtIndex (i); if (child) { ConstString child_prefix = child->GetLevelName(); - StreamString new_prefix; - if (! current_prefix.empty()) - new_prefix.Printf ("%s.%s", current_prefix.c_str(), child_prefix.AsCString()); + if (current_prefix && current_prefix[0]) + { + StreamString new_prefix; + new_prefix.Printf ("%s.%s", current_prefix, child_prefix.GetCString()); + UserSettingsController::SearchAllSettingsDescriptions (interpreter, + child, + new_prefix.GetData(), + search_word, + strm); + } else - new_prefix.Printf ("%s", child_prefix.AsCString()); - std::string new_prefix_str = new_prefix.GetData(); - UserSettingsController::SearchAllSettingsDescriptions (interpreter, child, new_prefix_str, search_word, - result_stream); + { + UserSettingsController::SearchAllSettingsDescriptions (interpreter, + child, + child_prefix.GetCString(), + search_word, + strm); + } + } + } +} + +bool +UserSettingsController::DumpValue (CommandInterpreter &interpreter, + const UserSettingsControllerSP& usc_sp, + const char *variable_dot_name, + Stream &strm) +{ + SettableVariableType var_type; + Error err; + StringList value = usc_sp->GetVariable (variable_dot_name, + var_type, + interpreter.GetDebugger().GetInstanceName().GetCString(), + err); + + if (err.Success()) + return DumpValue (variable_dot_name, var_type, value, strm); + return false; +} + + +bool +UserSettingsController::DumpValue (const char *variable_dot_name, + SettableVariableType var_type, + const StringList &value, + Stream &strm) +{ + const char *type_name = UserSettingsController::GetTypeString (var_type); + + strm.Printf ("%s (%s) = ", variable_dot_name, type_name); + if (value.GetSize() == 0) + { + strm.EOL(); + } + else + { + switch (var_type) + { + case eSetVarTypeNone: + case eSetVarTypeEnum: + case eSetVarTypeInt: + case eSetVarTypeBoolean: + strm.Printf ("%s\n", value.GetStringAtIndex (0)); + break; + + case eSetVarTypeString: + strm.Printf ("\"%s\"\n", value.GetStringAtIndex (0)); + break; + + case eSetVarTypeArray: + { + strm.EOL(); + for (unsigned i = 0, e = value.GetSize(); i != e; ++i) + strm.Printf (" [%u]: \"%s\"\n", i, value.GetStringAtIndex (i)); + } + break; + + case eSetVarTypeDictionary: + { + strm.EOL(); + for (unsigned i = 0, e = value.GetSize(); i != e; ++i) + strm.Printf (" %s\n", value.GetStringAtIndex (i)); + } + break; + + default: + return false; } } + return true; } void UserSettingsController::GetAllVariableValues (CommandInterpreter &interpreter, - UserSettingsControllerSP root, - std::string ¤t_prefix, - Stream &result_stream, + const UserSettingsControllerSP& usc_sp, + const char *current_prefix, + Stream &strm, Error &err) { StreamString description; - int num_entries = root->m_settings.global_settings.size(); - SettableVariableType var_type; - + int num_entries = usc_sp->m_settings.global_settings.size(); for (int i = 0; i < num_entries; ++i) { StreamString full_var_name; - const SettingEntry &entry = root->m_settings.global_settings[i]; - if (! current_prefix.empty()) - full_var_name.Printf ("%s.%s", current_prefix.c_str(), entry.var_name); + const SettingEntry &entry = usc_sp->m_settings.global_settings[i]; + + if (current_prefix && current_prefix[0]) + full_var_name.Printf ("%s.%s", current_prefix, entry.var_name); else full_var_name.Printf ("%s", entry.var_name); - StringList value = root->GetVariable (full_var_name.GetData(), var_type, - interpreter.GetDebugger().GetInstanceName().AsCString(), err); - description.Clear(); - if (value.GetSize() == 1) - description.Printf ("%s (%s) = '%s'", full_var_name.GetData(), GetTypeString (entry.var_type), - value.GetStringAtIndex (0)); - else - { - description.Printf ("%s (%s):\n", full_var_name.GetData(), GetTypeString (entry.var_type)); - for (int j = 0; j < value.GetSize(); ++j) - if (entry.var_type == eSetVarTypeArray) - description.Printf (" [%d]: '%s'\n", j, value.GetStringAtIndex (j)); - else if (entry.var_type == eSetVarTypeDictionary) - description.Printf (" '%s'\n", value.GetStringAtIndex (j)); - } - - result_stream.Printf ("%s\n", description.GetData()); + + DumpValue (interpreter, usc_sp, full_var_name.GetData(), strm); } - root->GetAllInstanceVariableValues (interpreter, result_stream); - root->GetAllPendingSettingValues (result_stream); - if (root->GetLevelName().GetLength() > 0) // Don't bother with default values for Debugger level. - root->GetAllDefaultSettingValues (result_stream); + usc_sp->GetAllInstanceVariableValues (interpreter, strm); + usc_sp->GetAllPendingSettingValues (strm); + if (usc_sp->GetLevelName().GetLength() > 0) // Don't bother with default values for Debugger level. + usc_sp->GetAllDefaultSettingValues (strm); // Now, recurse across all children. - int num_children = root->GetNumChildren(); + int num_children = usc_sp->GetNumChildren(); for (int i = 0; i < num_children; ++i) { - UserSettingsControllerSP child = root->GetChildAtIndex (i); + UserSettingsControllerSP child = usc_sp->GetChildAtIndex (i); if (child) { ConstString child_prefix = child->GetLevelName(); - StreamString new_prefix; - if (! current_prefix.empty()) - new_prefix.Printf ("%s.%s", current_prefix.c_str(), child_prefix.AsCString()); + if (current_prefix && current_prefix[0]) + { + StreamString new_prefix; + new_prefix.Printf ("%s.%s", current_prefix, child_prefix.GetCString()); + UserSettingsController::GetAllVariableValues (interpreter, + child, + new_prefix.GetData(), + strm, + err); + } else - new_prefix.Printf ("%s", child_prefix.AsCString()); - std::string new_prefix_str = new_prefix.GetData(); - UserSettingsController::GetAllVariableValues (interpreter, child, new_prefix_str, result_stream, - err); + { + UserSettingsController::GetAllVariableValues (interpreter, + child, + child_prefix.GetCString(), + strm, + err); + } } } @@ -1468,9 +1505,8 @@ bool UserSettingsController::IsLiveInstance (const std::string &instance_name) { - std::map::iterator pos; - - pos = m_live_settings.find (instance_name); + Mutex::Locker locker (m_live_settings_mutex); + InstanceSettingsMap::iterator pos = m_live_settings.find (instance_name); if (pos != m_live_settings.end()) return true; @@ -1478,7 +1514,7 @@ } int -UserSettingsController::CompleteSettingsValue (UserSettingsControllerSP root_settings, +UserSettingsController::CompleteSettingsValue (const UserSettingsControllerSP& usc_sp, const char *full_dot_name, const char *partial_value, bool &word_complete, @@ -1488,7 +1524,7 @@ int num_pieces = names.GetArgumentCount(); word_complete = true; - ConstString root_level = root_settings->GetLevelName(); + ConstString root_level = usc_sp->GetLevelName(); int num_extra_levels = num_pieces - 2; if ((num_extra_levels > 0) && root_level.GetLength() > 0) @@ -1507,13 +1543,14 @@ { ConstString child_level (names.GetArgumentAtIndex (0)); bool found = false; - int num_children = root_settings->GetNumChildren(); + int num_children = usc_sp->GetNumChildren(); + UserSettingsControllerSP child_usc_sp = usc_sp; for (int j = 0; j < num_children && !found; ++j) { - if (root_settings->GetChildAtIndex (j)->GetLevelName() == child_level) + if (child_usc_sp->GetChildAtIndex (j)->GetLevelName() == child_level) { found = true; - root_settings = root_settings->GetChildAtIndex (j); + child_usc_sp = child_usc_sp->GetChildAtIndex (j); names.Shift(); } } @@ -1536,14 +1573,15 @@ { // 'next_name' is child name. bool found = false; - int num_children = root_settings->GetNumChildren(); + int num_children = usc_sp->GetNumChildren(); ConstString child_level (next_name.c_str()); + UserSettingsControllerSP child_usc_sp = usc_sp; for (int j = 0; j < num_children && !found; ++j) { - if (root_settings->GetChildAtIndex (j)->GetLevelName() == child_level) + if (child_usc_sp->GetChildAtIndex (j)->GetLevelName() == child_level) { found = true; - root_settings = root_settings->GetChildAtIndex (j); + child_usc_sp = child_usc_sp->GetChildAtIndex (j); } } if (!found) @@ -1551,9 +1589,9 @@ } ConstString var_name (names.GetArgumentAtIndex(0)); - const SettingEntry *entry = root_settings->GetGlobalEntry (var_name); + const SettingEntry *entry = usc_sp->GetGlobalEntry (var_name); if (entry == NULL) - entry = root_settings->GetInstanceEntry (var_name); + entry = usc_sp->GetInstanceEntry (var_name); if (entry == NULL) return 0; @@ -1629,7 +1667,7 @@ } int -UserSettingsController::CompleteSettingsNames (UserSettingsControllerSP root_settings, +UserSettingsController::CompleteSettingsNames (const UserSettingsControllerSP& usc_sp, Args &partial_setting_name_pieces, bool &word_complete, StringList &matches) @@ -1646,7 +1684,7 @@ // Deal with current level first. - ConstString root_level = root_settings->GetLevelName(); + ConstString root_level = usc_sp->GetLevelName(); if ((num_extra_levels > 0) && (root_level.GetLength() > 0)) { @@ -1665,13 +1703,15 @@ { ConstString child_level (partial_setting_name_pieces.GetArgumentAtIndex (0)); bool found = false; - int num_children = root_settings->GetNumChildren(); + int num_children = usc_sp->GetNumChildren(); + UserSettingsControllerSP child_usc_sp = usc_sp; + for (int j = 0; j < num_children && !found; ++j) { - if (root_settings->GetChildAtIndex (j)->GetLevelName() == child_level) + if (child_usc_sp->GetChildAtIndex (j)->GetLevelName() == child_level) { found = true; - root_settings = root_settings->GetChildAtIndex (j); + child_usc_sp = child_usc_sp->GetChildAtIndex (j); partial_setting_name_pieces.Shift(); } } @@ -1695,12 +1735,12 @@ // 'next_name' is an instance name. The last name piece must be a non-empty partial match against an // instance_name, assuming 'next_name' is valid. - if (root_settings->IsLiveInstance (next_name)) + if (usc_sp->IsLiveInstance (next_name)) { std::string complete_prefix; - root_settings->BuildParentPrefix (complete_prefix); + usc_sp->BuildParentPrefix (complete_prefix); - num_matches = root_settings->InstanceVariableMatches(partial_setting_name_pieces.GetArgumentAtIndex(0), + num_matches = usc_sp->InstanceVariableMatches(partial_setting_name_pieces.GetArgumentAtIndex(0), complete_prefix, next_name.c_str(), matches); @@ -1717,14 +1757,14 @@ { // 'next_name' must be a child name. Find the correct child and pass the remaining piece to be resolved. bool found = false; - int num_children = root_settings->GetNumChildren(); + int num_children = usc_sp->GetNumChildren(); ConstString child_level (next_name.c_str()); for (int i = 0; i < num_children; ++i) { - if (root_settings->GetChildAtIndex (i)->GetLevelName() == child_level) + if (usc_sp->GetChildAtIndex (i)->GetLevelName() == child_level) { found = true; - return UserSettingsController::CompleteSettingsNames (root_settings->GetChildAtIndex (i), + return UserSettingsController::CompleteSettingsNames (usc_sp->GetChildAtIndex (i), partial_setting_name_pieces, word_complete, matches); } @@ -1736,7 +1776,7 @@ else if (num_name_pieces == 1) { std::string complete_prefix; - root_settings->BuildParentPrefix (complete_prefix); + usc_sp->BuildParentPrefix (complete_prefix); word_complete = true; std::string name (partial_setting_name_pieces.GetArgumentAtIndex (0)); @@ -1745,15 +1785,15 @@ { // It's a partial instance name. - num_matches = root_settings->LiveInstanceMatches (name.c_str(), complete_prefix, word_complete, matches); + num_matches = usc_sp->LiveInstanceMatches (name.c_str(), complete_prefix, word_complete, matches); } else { // It could be anything *except* an instance name... - num_matches = root_settings->GlobalVariableMatches (name.c_str(), complete_prefix, matches); - num_matches += root_settings->InstanceVariableMatches (name.c_str(), complete_prefix, NULL, matches); - num_matches += root_settings->ChildMatches (name.c_str(), complete_prefix, word_complete, matches); + num_matches = usc_sp->GlobalVariableMatches (name.c_str(), complete_prefix, matches); + num_matches += usc_sp->InstanceVariableMatches (name.c_str(), complete_prefix, NULL, matches); + num_matches += usc_sp->ChildMatches (name.c_str(), complete_prefix, word_complete, matches); } if (num_matches > 1) @@ -1766,11 +1806,11 @@ // We have a user settings controller with a blank partial string. Return everything possible at this level. std::string complete_prefix; - root_settings->BuildParentPrefix (complete_prefix); - num_matches = root_settings->GlobalVariableMatches (NULL, complete_prefix, matches); - num_matches += root_settings->InstanceVariableMatches (NULL, complete_prefix, NULL, matches); - num_matches += root_settings->LiveInstanceMatches (NULL, complete_prefix, word_complete, matches); - num_matches += root_settings->ChildMatches (NULL, complete_prefix, word_complete, matches); + usc_sp->BuildParentPrefix (complete_prefix); + num_matches = usc_sp->GlobalVariableMatches (NULL, complete_prefix, matches); + num_matches += usc_sp->InstanceVariableMatches (NULL, complete_prefix, NULL, matches); + num_matches += usc_sp->LiveInstanceMatches (NULL, complete_prefix, word_complete, matches); + num_matches += usc_sp->ChildMatches (NULL, complete_prefix, word_complete, matches); word_complete = false; return num_matches; } @@ -1860,7 +1900,8 @@ int partial_len = (partial_name != NULL) ? strlen (partial_name) : 0; int num_matches = 0; - std::map::iterator pos; + InstanceSettingsMap::iterator pos; + Mutex::Locker locker (m_live_settings_mutex); for (pos = m_live_settings.begin(); pos != m_live_settings.end(); ++pos) { std::string instance_name = pos->first; @@ -1895,7 +1936,7 @@ int num_matches = 0; for (int i = 0; i < num_children; ++i) { - std::string child_name (GetChildAtIndex(i)->GetLevelName().AsCString()); + std::string child_name (GetChildAtIndex(i)->GetLevelName().GetCString()); StreamString match_name; if ((partial_len == 0) || ((partial_len <= child_name.length()) @@ -2239,7 +2280,7 @@ size_t len = new_name_key.length(); std::string stripped_new_name = new_name_key.substr (1, len-2); // new name without the '[ ]' - std::map::iterator pos; + InstanceSettingsMap::iterator pos; pos = m_live_settings.find (old_name_key); if (pos != m_live_settings.end()) Modified: lldb/trunk/source/Target/Target.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=129826&r1=129825&r2=129826&view=diff ============================================================================== --- lldb/trunk/source/Target/Target.cpp (original) +++ lldb/trunk/source/Target/Target.cpp Tue Apr 19 17:32:36 2011 @@ -1289,9 +1289,6 @@ #define TSC_DEFAULT_ARCH "default-arch" #define TSC_EXPR_PREFIX "expr-prefix" -#define TSC_EXEC_LEVEL "execution-level" -#define TSC_EXEC_MODE "execution-mode" -#define TSC_EXEC_OS_TYPE "execution-os-type" #define TSC_PREFER_DYNAMIC "prefer-dynamic-value" @@ -1311,27 +1308,6 @@ } static const ConstString & -GetSettingNameForExecutionLevel () -{ - static ConstString g_const_string (TSC_EXEC_LEVEL); - return g_const_string; -} - -static const ConstString & -GetSettingNameForExecutionMode () -{ - static ConstString g_const_string (TSC_EXEC_MODE); - return g_const_string; -} - -static const ConstString & -GetSettingNameForExecutionOSType () -{ - static ConstString g_const_string (TSC_EXEC_OS_TYPE); - return g_const_string; -} - -static const ConstString & GetSettingNameForPreferDynamicValue () { static ConstString g_const_string (TSC_PREFER_DYNAMIC); Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/abbreviation_tests/TestAbbreviations.py?rev=129826&r1=129825&r2=129826&view=diff ============================================================================== --- lldb/trunk/test/abbreviation_tests/TestAbbreviations.py (original) +++ lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Tue Apr 19 17:32:36 2011 @@ -38,12 +38,12 @@ patterns = ["Executing commands in '.*change_prompt.lldb'"]) self.expect("settings show prompt", - startstr = "prompt (string) = '[old-oak]'") + startstr = 'prompt (string) = "[old-oak]"') self.runCmd("settings set -r prompt") self.expect("settings show prompt", - startstr = "prompt (string) = '(lldb) '") + startstr = 'prompt (string) = "(lldb) "') self.expect("lo li", @@ -51,11 +51,11 @@ self.runCmd("se se prompt Sycamore> ") self.expect("se sh prompt", - startstr = "prompt (string) = 'Sycamore>'") + startstr = 'prompt (string) = "Sycamore>"') self.runCmd("se se -r prompt") self.expect("set sh prompt", - startstr = "prompt (string) = '(lldb) '") + startstr = 'prompt (string) = "(lldb) "') self.runCmd (r'''sc print "\n\n\tHello!\n"''') Modified: lldb/trunk/test/settings/TestSettings.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/settings/TestSettings.py?rev=129826&r1=129825&r2=129826&view=diff ============================================================================== --- lldb/trunk/test/settings/TestSettings.py (original) +++ lldb/trunk/test/settings/TestSettings.py Tue Apr 19 17:32:36 2011 @@ -35,11 +35,11 @@ # Immediately test the setting. self.expect("settings show prompt", SETTING_MSG("prompt"), - startstr = "prompt (string) = 'lldb2'") + startstr = 'prompt (string) = "lldb2"') # The overall display should also reflect the new setting. self.expect("settings show", SETTING_MSG("prompt"), - substrs = ["prompt (string) = 'lldb2'"]) + substrs = ['prompt (string) = "lldb2"']) # Use '-r' option to reset to the original default prompt. self.runCmd("settings set -r prompt") @@ -51,11 +51,11 @@ # Immediately test the setting. self.expect("settings show term-width", SETTING_MSG("term-width"), - startstr = "term-width (int) = '70'") + startstr = "term-width (int) = 70") # The overall display should also reflect the new setting. self.expect("settings show", SETTING_MSG("term-width"), - substrs = ["term-width (int) = '70'"]) + substrs = ["term-width (int) = 70"]) def test_set_auto_confirm(self): """Test that after 'set auto-confirm true', manual confirmation should not kick in.""" @@ -68,7 +68,7 @@ # Immediately test the setting. self.expect("settings show auto-confirm", SETTING_MSG("auto-confirm"), - startstr = "auto-confirm (boolean) = 'true'") + startstr = "auto-confirm (boolean) = true") # Now 'breakpoint delete' should just work fine without confirmation # prompt from the command interpreter. @@ -79,7 +79,7 @@ # Restore the original setting of auto-confirm. self.runCmd("settings set -r auto-confirm") self.expect("settings show auto-confirm", SETTING_MSG("auto-confirm"), - startstr = "auto-confirm (boolean) = 'false'") + startstr = "auto-confirm (boolean) = false") @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") def test_run_args_and_env_vars_with_dsym(self): @@ -127,7 +127,7 @@ # By default, inherit-env is 'true'. self.expect('settings show target.process.inherit-env', "Default inherit-env is 'true'", - startstr = "target.process.inherit-env (boolean) = 'true'") + startstr = "target.process.inherit-env (boolean) = true") # Set some host environment variables now. os.environ["MY_HOST_ENV_VAR1"] = "VAR1" @@ -167,11 +167,11 @@ self.expect("settings show target.process.error-path", SETTING_MSG("target.process.error-path"), - startstr = "target.process.error-path (string) = 'stderr.txt'") + startstr = 'target.process.error-path (string) = "stderr.txt"') self.expect("settings show target.process.output-path", SETTING_MSG("target.process.output-path"), - startstr = "target.process.output-path (string) = 'stdout.txt'") + startstr = 'target.process.output-path (string) = "stdout.txt"') self.runCmd("run", RUN_SUCCEEDED) @@ -201,31 +201,31 @@ self.runCmd ("settings set -r target.process.env-vars") self.runCmd ("settings set target.process.env-vars [\"MY_VAR\"]=some-value") self.expect ("settings show target.process.env-vars", - substrs = [ "'MY_VAR=some-value'" ]) + substrs = [ "MY_VAR=some-value" ]) self.runCmd ("settings set -r target.process.env-vars") def test_print_array_setting(self): self.runCmd ("settings set -r target.process.run-args") self.runCmd ("settings set target.process.run-args gobbledy-gook") self.expect ("settings show target.process.run-args", - substrs = [ "[0]: 'gobbledy-gook'" ]) + substrs = [ '[0]: "gobbledy-gook"' ]) self.runCmd ("settings set -r target.process.run-args") def test_settings_with_quotes (self): self.runCmd ("settings set -r target.process.run-args") self.runCmd ("settings set target.process.run-args a b c") self.expect ("settings show target.process.run-args", - substrs = [ "[0]: 'a'", - "[1]: 'b'", - "[2]: 'c'" ]) + substrs = [ '[0]: "a"', + '[1]: "b"', + '[2]: "c"' ]) self.runCmd ("settings set target.process.run-args 'a b c'") self.expect ("settings show target.process.run-args", - substrs = [ "[0]: 'a b c'" ]) + substrs = [ '[0]: "a b c"' ]) self.runCmd ("settings set -r target.process.run-args") self.runCmd ("settings set -r target.process.env-vars") - self.runCmd ("settings set target.process.env-vars [\"MY_FILE\"]='this is a file name with spaces.txt'") + self.runCmd ('settings set target.process.env-vars ["MY_FILE"]="this is a file name with spaces.txt"') self.expect ("settings show target.process.env-vars", - substrs = [ "'MY_FILE=this is a file name with spaces.txt'" ]) + substrs = [ 'MY_FILE=this is a file name with spaces.txt' ]) self.runCmd ("settings set -r target.process.env-vars") @@ -238,18 +238,18 @@ "thread-format (string) = ", "use-external-editor (boolean) = ", "auto-confirm (boolean) = ", - "target.default-arch (string):", + "target.default-arch (string) =", "target.expr-prefix (string) = ", - "target.process.run-args (array):", - "target.process.env-vars (dictionary):", + "target.process.run-args (array) =", + "target.process.env-vars (dictionary) =", "target.process.inherit-env (boolean) = ", "target.process.input-path (string) = ", "target.process.output-path (string) = ", "target.process.error-path (string) = ", - "target.process.plugin (enum):", + "target.process.plugin (enum) =", "target.process.disable-aslr (boolean) = ", "target.process.disable-stdio (boolean) = ", - "target.process.thread.step-avoid-regexp (string):", + "target.process.thread.step-avoid-regexp (string) =", "target.process.thread.trace-thread (boolean) =" ]) From johnny.chen at apple.com Tue Apr 19 17:32:57 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 22:32:57 -0000 Subject: [Lldb-commits] [lldb] r129827 - /lldb/trunk/test/stl/TestStdCXXDisassembly.py Message-ID: <20110419223257.35DC82A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 17:32:57 2011 New Revision: 129827 URL: http://llvm.org/viewvc/llvm-project?rev=129827&view=rev Log: Use self.TraceOn() API. Modified: lldb/trunk/test/stl/TestStdCXXDisassembly.py Modified: lldb/trunk/test/stl/TestStdCXXDisassembly.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/stl/TestStdCXXDisassembly.py?rev=129827&r1=129826&r2=129827&view=diff ============================================================================== --- lldb/trunk/test/stl/TestStdCXXDisassembly.py (original) +++ lldb/trunk/test/stl/TestStdCXXDisassembly.py Tue Apr 19 17:32:57 2011 @@ -94,11 +94,13 @@ match = codeRE.search(line) if match: LA = match.group(1) - print "line:", line - print "load address:", LA - print "SA:", SA + if self.TraceOn(): + print "line:", line + print "load address:", LA + print "SA:", SA if SA and LA: - self.runCmd("disassemble -s %s -e %s" % (SA, LA)) + if int(LA, 16) > int(SA, 16): + self.runCmd("disassemble -s %s -e %s" % (SA, LA)) SA = LA else: # This entry is not a Code entry. Reset SA = None. From johnny.chen at apple.com Tue Apr 19 17:44:20 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Tue, 19 Apr 2011 22:44:20 -0000 Subject: [Lldb-commits] [lldb] r129828 - in /lldb/trunk/test: python_api/lldbutil/ python_api/lldbutil/Makefile python_api/lldbutil/TestPrintStackTraces.py threads/ Message-ID: <20110419224420.8A45C2A6C12C@llvm.org> Author: johnny Date: Tue Apr 19 17:44:20 2011 New Revision: 129828 URL: http://llvm.org/viewvc/llvm-project?rev=129828&view=rev Log: Rename test/threads to python_api/lldbutil; it uses lldbutil functions to print stack traces. Added: lldb/trunk/test/python_api/lldbutil/ - copied from r129765, lldb/trunk/test/threads/ Removed: lldb/trunk/test/threads/ Modified: lldb/trunk/test/python_api/lldbutil/Makefile lldb/trunk/test/python_api/lldbutil/TestPrintStackTraces.py Modified: lldb/trunk/test/python_api/lldbutil/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/lldbutil/Makefile?rev=129828&r1=129765&r2=129828&view=diff ============================================================================== --- lldb/trunk/test/python_api/lldbutil/Makefile (original) +++ lldb/trunk/test/python_api/lldbutil/Makefile Tue Apr 19 17:44:20 2011 @@ -1,4 +1,4 @@ -LEVEL = ../make +LEVEL = ../../make CXX_SOURCES := main.cpp MAKE_DSYM :=NO Modified: lldb/trunk/test/python_api/lldbutil/TestPrintStackTraces.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/lldbutil/TestPrintStackTraces.py?rev=129828&r1=129765&r2=129828&view=diff ============================================================================== --- lldb/trunk/test/python_api/lldbutil/TestPrintStackTraces.py (original) +++ lldb/trunk/test/python_api/lldbutil/TestPrintStackTraces.py Tue Apr 19 17:44:20 2011 @@ -1,5 +1,5 @@ """ -Test SBprocess and SBThread APIs with printing of the stack traces. +Test SBprocess and SBThread APIs with printing of the stack traces using lldbutil. """ import os, time @@ -10,7 +10,7 @@ class ThreadsStackTracesTestCase(TestBase): - mydir = "threads" + mydir = "python_api/lldbutil" def setUp(self): # Call super's setUp(). @@ -46,7 +46,8 @@ "instead the actual state is: '%s'" % lldbutil.StateTypeString(self.process.GetState())) - lldbutil.PrintStackTraces(self.process) + if self.TraceOn(): + lldbutil.PrintStackTraces(self.process) if __name__ == '__main__': From ctice at apple.com Tue Apr 19 18:30:04 2011 From: ctice at apple.com (Caroline Tice) Date: Tue, 19 Apr 2011 23:30:04 -0000 Subject: [Lldb-commits] [lldb] r129832 - in /lldb/trunk: include/lldb/API/ include/lldb/Core/ lldb.xcodeproj/ source/API/ source/Core/ source/Plugins/Disassembler/llvm/ source/Plugins/Instruction/ARM/ test/arm_emulation/ test/arm_emulation/test-files/ Message-ID: <20110419233005.E79D02A6C12C@llvm.org> Author: ctice Date: Tue Apr 19 18:30:03 2011 New Revision: 129832 URL: http://llvm.org/viewvc/llvm-project?rev=129832&view=rev Log: Add the infrastructure to test instruction emulations automatically. The idea is that the instruction to be emulated is actually executed on the hardware to be emulated, with the before and after state of the hardware being captured and 'freeze-dried' into .dat files. The emulation testing code then loads the before & after state from the .dat file, emulates the instruction using the before state, and compares the resulting state to the 'after' state. If they match, the emulation is accurate, otherwise there is a problem. The final format of the .dat files needs a bit more work; the plan is to generalize them a bit and to convert the plain values to key-value pairs. But I wanted to get this first pass committed. This commit adds arm instruction emulation testing to the testsuite, along with many initial .dat files. It also fixes a bug in the llvm disassembler, where 32-bit thumb opcodes were getting their upper & lower 16-bits reversed. There is a new Instruction sub-class, that is intended to be loaded from a .dat file rather than read from an executable. There is also a new EmulationStateARM class, for handling the before & after states. EmulationStates for other architetures can be added later when we emulate their instructions. Added: lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.cpp lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.h lldb/trunk/test/arm_emulation/ lldb/trunk/test/arm_emulation/TestEmulations.py lldb/trunk/test/arm_emulation/test-files/ lldb/trunk/test/arm_emulation/test-files/test-add-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-add-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-10-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-11-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-12-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-add-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-3-arm.dat lldb/trunk/test/arm_emulation/test-files/test-add-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-4-arm.dat lldb/trunk/test/arm_emulation/test-files/test-add-4-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-5-arm.dat lldb/trunk/test/arm_emulation/test-files/test-add-5-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-6-arm.dat lldb/trunk/test/arm_emulation/test-files/test-add-6-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-7-arm.dat lldb/trunk/test/arm_emulation/test-files/test-add-7-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-8-arm.dat lldb/trunk/test/arm_emulation/test-files/test-add-8-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-add-9-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-bic-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-bic-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldmia-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldmia-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldmia-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldmia-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldmia-3-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldmia-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-10-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-11-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-12-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-3-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-4-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-4-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-5-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-5-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-6-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-6-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-7-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-7-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-8-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-8-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldr-9-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldrd-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldrd-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldrd-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldrh-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-ldrsh-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-ldrsh-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mov-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mov-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-10-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-11-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-12-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-13-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-14-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-15-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-16-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-17-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-18-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-19-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mov-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-20-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-21-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-22-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-23-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-24-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-25-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-26-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-27-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-28-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-29-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-3-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mov-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-30-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-31-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-4-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mov-4-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-5-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mov-5-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-6-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mov-6-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-7-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-8-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mov-9-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-moveq-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-movs-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mvn-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mvn-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mvn-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mvn-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mvn-3-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mvn-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-mvn-4-arm.dat lldb/trunk/test/arm_emulation/test-files/test-mvn-4-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-pop-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-pop-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-pop-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-pop-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-pop-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-push-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-push-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-push-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-push-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-push-3-arm.dat lldb/trunk/test/arm_emulation/test-files/test-push-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-str-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-str-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-str-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-str-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-str-3-arm.dat lldb/trunk/test/arm_emulation/test-files/test-str-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-str-4-arm.dat lldb/trunk/test/arm_emulation/test-files/test-str-4-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-str-5-arm.dat lldb/trunk/test/arm_emulation/test-files/test-strb-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-strb-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-strbt-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-strd-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-strt-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-sub-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-sub-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-sub-10-arm.dat lldb/trunk/test/arm_emulation/test-files/test-sub-2-arm.dat lldb/trunk/test/arm_emulation/test-files/test-sub-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-sub-3-arm.dat lldb/trunk/test/arm_emulation/test-files/test-sub-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-sub-4-arm.dat lldb/trunk/test/arm_emulation/test-files/test-sub-4-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-sub-5-arm.dat lldb/trunk/test/arm_emulation/test-files/test-sub-5-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-sub-6-arm.dat lldb/trunk/test/arm_emulation/test-files/test-sub-6-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-sub-8-arm.dat lldb/trunk/test/arm_emulation/test-files/test-sub-9-arm.dat lldb/trunk/test/arm_emulation/test-files/test-subs-1-arm.dat lldb/trunk/test/arm_emulation/test-files/test-subs-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-subs-10-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-subs-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-subs-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-subs-4-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-subs-5-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-subs-6-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-subs-8-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-subs-9-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-vpop-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-vpop-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-vpop-3-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-vpush-1-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-vpush-2-thumb.dat lldb/trunk/test/arm_emulation/test-files/test-vpush-3-thumb.dat Modified: lldb/trunk/include/lldb/API/SBInstruction.h lldb/trunk/include/lldb/Core/Disassembler.h lldb/trunk/include/lldb/Core/EmulateInstruction.h lldb/trunk/lldb.xcodeproj/project.pbxproj lldb/trunk/source/API/SBInstruction.cpp lldb/trunk/source/Core/Disassembler.cpp lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h Modified: lldb/trunk/include/lldb/API/SBInstruction.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBInstruction.h?rev=129832&r1=129831&r2=129832&view=diff ============================================================================== --- lldb/trunk/include/lldb/API/SBInstruction.h (original) +++ lldb/trunk/include/lldb/API/SBInstruction.h Tue Apr 19 18:30:03 2011 @@ -57,6 +57,9 @@ bool DumpEmulation (const char * triple); // triple is to specify the architecture, e.g. 'armv6' or 'arm-apple-darwin' + + bool + TestEmulation (lldb::SBStream &output_stream, const char *test_file); protected: friend class SBInstructionList; Modified: lldb/trunk/include/lldb/Core/Disassembler.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Disassembler.h?rev=129832&r1=129831&r2=129832&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/Disassembler.h (original) +++ lldb/trunk/include/lldb/Core/Disassembler.h Tue Apr 19 18:30:03 2011 @@ -68,9 +68,15 @@ const DataExtractor& data, uint32_t data_offset) = 0; + virtual void + SetDescription (const char *) {}; // May be overridden in sub-classes that have descriptions. + bool DumpEmulation (const ArchSpec &arch); + virtual bool + TestEmulation (Stream *stream, const char *test_file_name); + bool Emulate (const ArchSpec &arch, bool auto_advance_pc, @@ -128,6 +134,44 @@ collection m_instructions; }; +class PseudoInstruction : + public lldb_private::Instruction +{ +public: + + PseudoInstruction (); + + virtual + ~PseudoInstruction (); + + virtual void + Dump (lldb_private::Stream *s, + uint32_t max_opcode_byte_size, + bool show_address, + bool show_bytes, + const lldb_private::ExecutionContext* exe_ctx, + bool raw); + + virtual bool + DoesBranch () const; + + virtual size_t + Decode (const lldb_private::Disassembler &disassembler, + const lldb_private::DataExtractor &data, + uint32_t data_offset); + + void + SetOpcode (size_t opcode_size, void *opcode_data); + + virtual void + SetDescription (const char *description); + +protected: + std::string m_description; + + DISALLOW_COPY_AND_ASSIGN (PseudoInstruction); +}; + class Disassembler : public PluginInterface { Modified: lldb/trunk/include/lldb/Core/EmulateInstruction.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/EmulateInstruction.h?rev=129832&r1=129831&r2=129832&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/EmulateInstruction.h (original) +++ lldb/trunk/include/lldb/Core/EmulateInstruction.h Tue Apr 19 18:30:03 2011 @@ -111,7 +111,9 @@ // Add or subtract a value from a base address register (other than SP) eContextAdjustBaseRegister, + // Add or subtract a value from the PC or store a value to the PC. eContextAdjustPC, + // Used in WriteRegister callbacks to indicate where the eContextRegisterPlusOffset, @@ -415,6 +417,9 @@ virtual bool EvaluateInstruction () = 0; + virtual bool + TestEmulation (Stream *out_stream, FILE *test_file, ArchSpec &arch) = 0; + bool GetAdvancePC () { return m_advance_pc; } Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=129832&r1=129831&r2=129832&view=diff ============================================================================== --- lldb/trunk/lldb.xcodeproj/project.pbxproj (original) +++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Apr 19 18:30:03 2011 @@ -63,6 +63,9 @@ 26680337116005F1008E1FE4 /* SBBreakpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AF16A9C11402D5B007A7B3F /* SBBreakpoint.cpp */; }; 2668035C11601108008E1FE4 /* LLDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26680207115FD0ED008E1FE4 /* LLDB.framework */; }; 266E8C6A13528ABC000C2042 /* lldb-platform in Resources */ = {isa = PBXBuildFile; fileRef = 26DC6A101337FE6900FF7998 /* lldb-platform */; }; + 26700BD4133D1262009921FB /* ARMDisassembler.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26700BD2133D1256009921FB /* ARMDisassembler.framework */; }; + 26700BD5133D1266009921FB /* ARMDisassembler.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26700BD2133D1256009921FB /* ARMDisassembler.framework */; }; + 26700BD6133D1267009921FB /* ARMDisassembler.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26700BD2133D1256009921FB /* ARMDisassembler.framework */; }; 2671A0CE134825F6003A87BB /* ConnectionMachPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 2671A0CD134825F6003A87BB /* ConnectionMachPort.h */; }; 2671A0D013482601003A87BB /* ConnectionMachPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2671A0CF13482601003A87BB /* ConnectionMachPort.cpp */; }; 26744EF11338317700EF765A /* GDBRemoteCommunicationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26744EED1338317700EF765A /* GDBRemoteCommunicationClient.cpp */; }; @@ -210,7 +213,6 @@ 2689008C13353E4200698AC0 /* DisassemblerLLVM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260C897410F57C5600BB2B04 /* DisassemblerLLVM.cpp */; }; 2689008D13353E4200698AC0 /* DynamicLoaderMacOSXDYLD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260C897A10F57C5600BB2B04 /* DynamicLoaderMacOSXDYLD.cpp */; }; 2689008E13353E4200698AC0 /* DynamicLoaderStatic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 268A683D1321B53B000E3FB8 /* DynamicLoaderStatic.cpp */; }; - 2689008F13353E4200698AC0 /* EmulateInstructionARM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D9FDCC12F7853F0003F2EE /* EmulateInstructionARM.cpp */; }; 2689009013353E4200698AC0 /* ItaniumABILanguageRuntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CB4436A124944B000C13DC2 /* ItaniumABILanguageRuntime.cpp */; }; 2689009113353E4200698AC0 /* AppleObjCRuntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C61978812823D4300FAFFCC /* AppleObjCRuntime.cpp */; }; 2689009213353E4200698AC0 /* AppleObjCRuntimeV1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C61978A12823D4300FAFFCC /* AppleObjCRuntimeV1.cpp */; }; @@ -416,12 +418,15 @@ 4CD0BD0F134BFADF00CB44D4 /* ValueObjectDynamicValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CD0BD0E134BFADF00CB44D4 /* ValueObjectDynamicValue.cpp */; }; 9A19A6AF1163BBB200E0D453 /* SBValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A19A6A51163BB7E00E0D453 /* SBValue.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9A19A6B01163BBB300E0D453 /* SBValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A19A6AD1163BB9800E0D453 /* SBValue.cpp */; }; + 9A22A161135E30370024DDC3 /* EmulateInstructionARM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A22A15D135E30370024DDC3 /* EmulateInstructionARM.cpp */; }; + 9A22A163135E30370024DDC3 /* EmulationStateARM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A22A15F135E30370024DDC3 /* EmulationStateARM.cpp */; }; 9A357583116CFDEE00E8ED2F /* SBValueList.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A357582116CFDEE00E8ED2F /* SBValueList.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9A35758E116CFE0F00E8ED2F /* SBValueList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A35758D116CFE0F00E8ED2F /* SBValueList.cpp */; }; 9A357671116E7B5200E8ED2F /* SBStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A357670116E7B5200E8ED2F /* SBStringList.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9A357673116E7B6400E8ED2F /* SBStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A357672116E7B6400E8ED2F /* SBStringList.cpp */; }; 9A3576A8116E9AB700E8ED2F /* SBHostOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A3576A7116E9AB700E8ED2F /* SBHostOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9A3576AA116E9AC700E8ED2F /* SBHostOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A3576A9116E9AC700E8ED2F /* SBHostOS.cpp */; }; + 9AA20A84133D278400E2E4A7 /* DisassemblerShark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AA20A82133D278400E2E4A7 /* DisassemblerShark.cpp */; }; 9AA69DA61188F52100D753A0 /* PseudoTerminal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2682F16A115EDA0D00CCFF99 /* PseudoTerminal.cpp */; }; 9AA69DAF118A023300D753A0 /* SBInputReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AA69DAE118A023300D753A0 /* SBInputReader.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9AA69DB1118A024600D753A0 /* SBInputReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AA69DB0118A024600D753A0 /* SBInputReader.cpp */; }; @@ -669,6 +674,7 @@ 266A42D5128E3FFB0090CF7C /* ClangNamespaceDecl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClangNamespaceDecl.cpp; path = source/Symbol/ClangNamespaceDecl.cpp; sourceTree = ""; }; 266A42D7128E40040090CF7C /* ClangNamespaceDecl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClangNamespaceDecl.h; path = include/lldb/Symbol/ClangNamespaceDecl.h; sourceTree = ""; }; 266F5CBB12FC846200DFCE33 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Config.h; path = include/lldb/Host/Config.h; sourceTree = ""; }; + 26700BD2133D1256009921FB /* ARMDisassembler.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ARMDisassembler.framework; path = /System/Library/PrivateFrameworks/ARMDisassembler.framework; sourceTree = ""; }; 2671A0CD134825F6003A87BB /* ConnectionMachPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConnectionMachPort.h; path = include/lldb/Core/ConnectionMachPort.h; sourceTree = ""; }; 2671A0CF13482601003A87BB /* ConnectionMachPort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConnectionMachPort.cpp; path = source/Core/ConnectionMachPort.cpp; sourceTree = ""; }; 2672D8461189055500FF4019 /* CommandObjectFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectFrame.cpp; path = source/Commands/CommandObjectFrame.cpp; sourceTree = ""; }; @@ -988,8 +994,6 @@ 26D5E162135BB054006EA0A7 /* OptionGroupPlatform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OptionGroupPlatform.cpp; path = source/Interpreter/OptionGroupPlatform.cpp; sourceTree = ""; }; 26D9FDC612F784E60003F2EE /* EmulateInstruction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmulateInstruction.h; path = include/lldb/Core/EmulateInstruction.h; sourceTree = ""; }; 26D9FDC812F784FD0003F2EE /* EmulateInstruction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmulateInstruction.cpp; path = source/Core/EmulateInstruction.cpp; sourceTree = ""; }; - 26D9FDCC12F7853F0003F2EE /* EmulateInstructionARM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmulateInstructionARM.cpp; path = Instruction/ARM/EmulateInstructionARM.cpp; sourceTree = ""; }; - 26D9FDCD12F7853F0003F2EE /* EmulateInstructionARM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmulateInstructionARM.h; path = Instruction/ARM/EmulateInstructionARM.h; sourceTree = ""; }; 26DAFD9711529BC7005A394E /* ExecutionContextScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExecutionContextScope.h; path = include/lldb/Target/ExecutionContextScope.h; sourceTree = ""; }; 26DC6A101337FE6900FF7998 /* lldb-platform */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "lldb-platform"; sourceTree = BUILT_PRODUCTS_DIR; }; 26DC6A1C1337FECA00FF7998 /* lldb-platform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "lldb-platform.cpp"; path = "tools/lldb-platform/lldb-platform.cpp"; sourceTree = ""; }; @@ -1149,6 +1153,10 @@ 96A6D9C81249D98800250B38 /* ArchVolatileRegs-x86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ArchVolatileRegs-x86.h"; path = "Utility/ArchVolatileRegs-x86.h"; sourceTree = ""; }; 9A19A6A51163BB7E00E0D453 /* SBValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBValue.h; path = include/lldb/API/SBValue.h; sourceTree = ""; }; 9A19A6AD1163BB9800E0D453 /* SBValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBValue.cpp; path = source/API/SBValue.cpp; sourceTree = ""; }; + 9A22A15D135E30370024DDC3 /* EmulateInstructionARM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmulateInstructionARM.cpp; sourceTree = ""; }; + 9A22A15E135E30370024DDC3 /* EmulateInstructionARM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmulateInstructionARM.h; sourceTree = ""; }; + 9A22A15F135E30370024DDC3 /* EmulationStateARM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmulationStateARM.cpp; sourceTree = ""; }; + 9A22A160135E30370024DDC3 /* EmulationStateARM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmulationStateARM.h; sourceTree = ""; }; 9A2771FB1135A35C00E6ADB6 /* ScriptInterpreterNone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScriptInterpreterNone.h; path = include/lldb/Interpreter/ScriptInterpreterNone.h; sourceTree = ""; }; 9A2771FC1135A37500E6ADB6 /* ScriptInterpreterNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScriptInterpreterNone.cpp; path = source/Interpreter/ScriptInterpreterNone.cpp; sourceTree = ""; }; 9A357582116CFDEE00E8ED2F /* SBValueList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBValueList.h; path = include/lldb/API/SBValueList.h; sourceTree = ""; }; @@ -1188,6 +1196,8 @@ 9A9831081125FC5800A56CB0 /* SBTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBTarget.h; path = include/lldb/API/SBTarget.h; sourceTree = ""; }; 9A9831091125FC5800A56CB0 /* SBThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBThread.cpp; path = source/API/SBThread.cpp; sourceTree = ""; }; 9A98310A1125FC5800A56CB0 /* SBThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBThread.h; path = include/lldb/API/SBThread.h; sourceTree = ""; }; + 9AA20A82133D278400E2E4A7 /* DisassemblerShark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DisassemblerShark.cpp; sourceTree = ""; }; + 9AA20A83133D278400E2E4A7 /* DisassemblerShark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisassemblerShark.h; sourceTree = ""; }; 9AA69DAE118A023300D753A0 /* SBInputReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBInputReader.h; path = include/lldb/API/SBInputReader.h; sourceTree = ""; }; 9AA69DB0118A024600D753A0 /* SBInputReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBInputReader.cpp; path = source/API/SBInputReader.cpp; sourceTree = ""; }; 9AA69DB5118A027A00D753A0 /* InputReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InputReader.cpp; path = source/Core/InputReader.cpp; sourceTree = ""; }; @@ -1237,6 +1247,7 @@ 26680232115FD1A4008E1FE4 /* libpython.dylib in Frameworks */, 26680233115FD1A7008E1FE4 /* libobjc.dylib in Frameworks */, 4C74CB6312288704006A8171 /* Carbon.framework in Frameworks */, + 26700BD4133D1262009921FB /* ARMDisassembler.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1244,6 +1255,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 26700BD5133D1266009921FB /* ARMDisassembler.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1258,6 +1270,7 @@ 26B1FCBB13381071002886E2 /* libpython.dylib in Frameworks */, 26B1FCBC13381071002886E2 /* libobjc.dylib in Frameworks */, 26B1FCBD13381071002886E2 /* Carbon.framework in Frameworks */, + 26700BD6133D1267009921FB /* ARMDisassembler.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1353,6 +1366,7 @@ isa = PBXGroup; children = ( 260C897310F57C5600BB2B04 /* llvm */, + 9AA20A81133D278400E2E4A7 /* shark */, ); path = Disassembler; sourceTree = ""; @@ -2316,16 +2330,18 @@ children = ( 26D9FDCB12F785270003F2EE /* ARM */, ); - name = Instruction; + path = Instruction; sourceTree = ""; }; 26D9FDCB12F785270003F2EE /* ARM */ = { isa = PBXGroup; children = ( - 26D9FDCD12F7853F0003F2EE /* EmulateInstructionARM.h */, - 26D9FDCC12F7853F0003F2EE /* EmulateInstructionARM.cpp */, + 9A22A15D135E30370024DDC3 /* EmulateInstructionARM.cpp */, + 9A22A15E135E30370024DDC3 /* EmulateInstructionARM.h */, + 9A22A15F135E30370024DDC3 /* EmulationStateARM.cpp */, + 9A22A160135E30370024DDC3 /* EmulationStateARM.h */, ); - name = ARM; + path = ARM; sourceTree = ""; }; 26DC6A1B1337FEA400FF7998 /* lldb-platform */ = { @@ -2363,6 +2379,7 @@ 26F5C32810F3DF7D009D5894 /* Libraries */ = { isa = PBXGroup; children = ( + 26700BD2133D1256009921FB /* ARMDisassembler.framework */, 26F5C39010F3FA26009D5894 /* CoreFoundation.framework */, 265ABF6210F42EE900531910 /* DebugSymbols.framework */, 260C876910F538E700BB2B04 /* Foundation.framework */, @@ -2492,6 +2509,15 @@ path = source/Host/common; sourceTree = ""; }; + 9AA20A81133D278400E2E4A7 /* shark */ = { + isa = PBXGroup; + children = ( + 9AA20A82133D278400E2E4A7 /* DisassemblerShark.cpp */, + 9AA20A83133D278400E2E4A7 /* DisassemblerShark.h */, + ); + path = shark; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -2996,7 +3022,6 @@ 2689008C13353E4200698AC0 /* DisassemblerLLVM.cpp in Sources */, 2689008D13353E4200698AC0 /* DynamicLoaderMacOSXDYLD.cpp in Sources */, 2689008E13353E4200698AC0 /* DynamicLoaderStatic.cpp in Sources */, - 2689008F13353E4200698AC0 /* EmulateInstructionARM.cpp in Sources */, 2689009013353E4200698AC0 /* ItaniumABILanguageRuntime.cpp in Sources */, 2689009113353E4200698AC0 /* AppleObjCRuntime.cpp in Sources */, 2689009213353E4200698AC0 /* AppleObjCRuntimeV1.cpp in Sources */, @@ -3135,6 +3160,7 @@ 264A97BF133918BC0017F0BE /* PlatformRemoteGDBServer.cpp in Sources */, 2697A54D133A6305004E4240 /* PlatformDarwin.cpp in Sources */, 26651A18133BF9E0005B64B7 /* Opcode.cpp in Sources */, + 9AA20A84133D278400E2E4A7 /* DisassemblerShark.cpp in Sources */, 266603CA1345B5A8004DA8B6 /* ConnectionSharedMemory.cpp in Sources */, 2671A0D013482601003A87BB /* ConnectionMachPort.cpp in Sources */, 4CABA9E0134A8BCD00539BDD /* ValueObjectMemory.cpp in Sources */, @@ -3142,6 +3168,8 @@ 26D5E15F135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp in Sources */, 26D5E163135BB054006EA0A7 /* OptionGroupPlatform.cpp in Sources */, 26BD407F135D2AE000237D80 /* FileLineResolver.cpp in Sources */, + 9A22A161135E30370024DDC3 /* EmulateInstructionARM.cpp in Sources */, + 9A22A163135E30370024DDC3 /* EmulationStateARM.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3277,6 +3305,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; + FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; INSTALL_PATH = /Developer/usr/bin; @@ -3291,6 +3320,8 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks; + GCC_ENABLE_FIX_AND_CONTINUE = NO; INSTALL_PATH = /Developer/usr/bin; ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "darwin-debug"; @@ -3302,6 +3333,8 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks; + GCC_ENABLE_FIX_AND_CONTINUE = YES; INSTALL_PATH = /Developer/usr/bin; ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "darwin-debug"; @@ -3339,6 +3372,8 @@ "$(inherited)", "$(LLVM_BUILD_DIR)", ); + LLVM_BUILD_DIR = "$(SRCROOT)/llvm"; + LLVM_CONFIGURATION = "Debug+Asserts"; OTHER_CFLAGS = "-Wparentheses"; OTHER_CPLUSPLUSFLAGS = ( "-fno-rtti", @@ -3388,6 +3423,8 @@ "$(inherited)", "$(LLVM_BUILD_DIR)", ); + LLVM_BUILD_DIR = "$(SRCROOT)/llvm"; + LLVM_CONFIGURATION = "Debug+Asserts"; OTHER_CFLAGS = "-Wparentheses"; OTHER_CPLUSPLUSFLAGS = ( "-fno-rtti", @@ -3429,6 +3466,8 @@ "$(inherited)", "$(LLVM_BUILD_DIR)", ); + LLVM_BUILD_DIR = "$(SRCROOT)/llvm"; + LLVM_CONFIGURATION = "Debug+Asserts"; MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = "-Wparentheses"; @@ -3469,6 +3508,8 @@ "$(inherited)", "$(LLVM_BUILD_DIR)", ); + LLVM_BUILD_DIR = "$(SRCROOT)/llvm"; + LLVM_CONFIGURATION = "Debug+Asserts"; MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = "-Wparentheses"; Modified: lldb/trunk/source/API/SBInstruction.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBInstruction.cpp?rev=129832&r1=129831&r2=129832&view=diff ============================================================================== --- lldb/trunk/source/API/SBInstruction.cpp (original) +++ lldb/trunk/source/API/SBInstruction.cpp Tue Apr 19 18:30:03 2011 @@ -149,3 +149,14 @@ return false; } +bool +SBInstruction::TestEmulation (lldb::SBStream &output_stream, const char *test_file) +{ + if (!m_opaque_sp.get()) + m_opaque_sp.reset (new PseudoInstruction()); + + bool success = m_opaque_sp->TestEmulation (output_stream.get(), test_file); + if (output_stream.GetSize() > 0) + fprintf (stdout, "%s", output_stream.GetData()); + return success; +} \ No newline at end of file Modified: lldb/trunk/source/Core/Disassembler.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Disassembler.cpp?rev=129832&r1=129831&r2=129832&view=diff ============================================================================== --- lldb/trunk/source/Core/Disassembler.cpp (original) +++ lldb/trunk/source/Core/Disassembler.cpp Tue Apr 19 18:30:03 2011 @@ -503,6 +503,60 @@ } bool +Instruction::TestEmulation (Stream *out_stream, const char *file_name) +{ + if (!out_stream) + return false; + + if (!file_name) + { + out_stream->Printf ("Instruction::TestEmulation: Missing file_name.\n"); + return false; + } + + FILE *test_file = fopen (file_name, "r"); + if (!test_file) + { + out_stream->Printf ("Instruction::TestEmulation: Attempt to open test file failed.\n"); + return false; + } + + ArchSpec arch; + char buffer[256]; + if (!fgets (buffer,255, test_file)) // Read/skip first line of file, which should be a comment line (description). + { + out_stream->Printf ("Instruction::TestEmulation: Read comment line failed.\n"); + fclose (test_file); + return false; + } + SetDescription (buffer); + + if (fscanf (test_file, "%s", buffer) != 1) // Read the arch or arch-triple from the file + { + out_stream->Printf ("Instruction::TestEmulation: Read arch failed.\n"); + fclose (test_file); + return false; + } + + const char *cptr = buffer; + arch.SetTriple (llvm::Triple (cptr)); + + bool success = false; + std::auto_ptr insn_emulator_ap (EmulateInstruction::FindPlugin (arch, NULL)); + if (insn_emulator_ap.get()) + success = insn_emulator_ap->TestEmulation (out_stream, test_file, arch); + + fclose (test_file); + + if (success) + out_stream->Printf ("Emulation test succeeded.\n"); + else + out_stream->Printf ("Emulation test failed.\n"); + + return success; +} + +bool Instruction::Emulate (const ArchSpec &arch, bool auto_advance_pc, void *baton, @@ -692,3 +746,97 @@ { return m_instruction_list; } + +//---------------------------------------------------------------------- +// Class PseudoInstruction +//---------------------------------------------------------------------- +PseudoInstruction::PseudoInstruction () : + Instruction (Address(), eAddressClassUnknown), + m_description () +{ +} + +PseudoInstruction::~PseudoInstruction () +{ +} + +void +PseudoInstruction::Dump (lldb_private::Stream *s, + uint32_t max_opcode_byte_size, + bool show_address, + bool show_bytes, + const lldb_private::ExecutionContext* exe_ctx, + bool raw) +{ + if (!s) + return; + + if (show_bytes) + m_opcode.Dump (s, max_opcode_byte_size); + + if (m_description.size() > 0) + s->Printf ("%s", m_description.c_str()); + else + s->Printf (""); + +} + +bool +PseudoInstruction::DoesBranch () const +{ + // This is NOT a valid question for a pseudo instruction. + return false; +} + +size_t +PseudoInstruction::Decode (const lldb_private::Disassembler &disassembler, + const lldb_private::DataExtractor &data, + uint32_t data_offset) +{ + return m_opcode.GetByteSize(); +} + + +void +PseudoInstruction::SetOpcode (size_t opcode_size, void *opcode_data) +{ + if (!opcode_data) + return; + + switch (opcode_size) + { + case 8: + { + uint8_t value8 = *((uint8_t *) opcode_data); + m_opcode.SetOpcode8 (value8); + break; + } + case 16: + { + uint16_t value16 = *((uint16_t *) opcode_data); + m_opcode.SetOpcode16 (value16); + break; + } + case 32: + { + uint32_t value32 = *((uint32_t *) opcode_data); + m_opcode.SetOpcode32 (value32); + break; + } + case 64: + { + uint64_t value64 = *((uint64_t *) opcode_data); + m_opcode.SetOpcode64 (value64); + break; + } + default: + break; + } +} + +void +PseudoInstruction::SetDescription (const char *description) +{ + if (description && strlen (description) > 0) + m_description = description; +} Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp?rev=129832&r1=129831&r2=129832&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp (original) +++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp Tue Apr 19 18:30:03 2011 @@ -367,7 +367,19 @@ break; case 4: - m_opcode.SetOpcode32 (data.GetU32 (&offset)); + { + if (GetAddressClass() == eAddressClassCodeAlternateISA) + { + // If it is a 32-bit THUMB instruction, we need to swap the upper & lower halves. + uint32_t orig_bytes = data.GetU32 (&offset); + uint16_t upper_bits = (orig_bytes >> 16) & ((1u << 16) - 1); + uint16_t lower_bits = orig_bytes & ((1u << 16) - 1); + uint32_t swapped = (lower_bits << 16) | upper_bits; + m_opcode.SetOpcode32 (swapped); + } + else + m_opcode.SetOpcode32 (data.GetU32 (&offset)); + } break; default: Modified: lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp?rev=129832&r1=129831&r2=129832&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp (original) +++ lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp Tue Apr 19 18:30:03 2011 @@ -10,10 +10,12 @@ #include #include "EmulateInstructionARM.h" +#include "EmulationStateARM.h" #include "lldb/Core/ArchSpec.h" #include "lldb/Core/Address.h" #include "lldb/Core/ConstString.h" #include "lldb/Core/PluginManager.h" +#include "lldb/Core/Stream.h" #include "Plugins/Process/Utility/ARMDefines.h" #include "Plugins/Process/Utility/ARMUtils.h" @@ -12218,6 +12220,8 @@ { 0x0fef00f0, 0x01a00070, ARMvAll, eEncodingA1, No_VFP, eSize32, &EmulateInstructionARM::EmulateRORReg, "ror{s} , , "}, // mul { 0x0fe000f0, 0x00000090, ARMvAll, eEncodingA1, No_VFP, eSize32, &EmulateInstructionARM::EmulateMUL, "mul{s} ,," }, + + // subs pc, lr and related instructions { 0x0e10f000, 0x0210f000, ARMvAll, eEncodingA1, No_VFP, eSize32, &EmulateInstructionARM::EmulateSUBSPcLrEtc, "S PC,# | ,#" }, { 0x0e10f010, 0x0010f000, ARMvAll, eEncodingA2, No_VFP, eSize32, &EmulateInstructionARM::EmulateSUBSPcLrEtc, "S PC,,}" }, @@ -12504,8 +12508,9 @@ { 0xffffffc0, 0x00004340, ARMV4T_ABOVE, eEncodingT1, No_VFP, eSize16, &EmulateInstructionARM::EmulateMUL, "muls ,," }, // mul { 0xfff0f0f0, 0xfb00f000, ARMV6T2_ABOVE, eEncodingT2, No_VFP, eSize32, &EmulateInstructionARM::EmulateMUL, "mul ,," }, + + // subs pc, lr and related instructions { 0xffffff00, 0xf3de8f00, ARMV6T2_ABOVE, eEncodingT1, No_VFP, eSize32, &EmulateInstructionARM::EmulateSUBSPcLrEtc, "SUBS PC, LR, #" }, - //---------------------------------------------------------------------- // RFE instructions *** IMPORTANT *** THESE MUST BE LISTED **BEFORE** THE LDM.. Instructions in this table; @@ -13193,16 +13198,7 @@ ARMOpcode *opcode_data; if (m_opcode_mode == eModeThumb) - { - if (m_opcode.GetType() == Opcode::eType32) - { - uint16_t upper_bits = Bits32 (m_opcode.GetOpcode32(), 31, 16); - uint16_t lower_bits = Bits32 (m_opcode.GetOpcode32(), 15, 0); - uint32_t swapped = (lower_bits << 16) | upper_bits; - m_opcode.SetOpcode32 (swapped); - } opcode_data = GetThumbOpcodeForInstruction (m_opcode.GetOpcode32()); - } else if (m_opcode_mode == eModeARM) opcode_data = GetARMOpcodeForInstruction (m_opcode.GetOpcode32()); else @@ -13311,3 +13307,112 @@ return true; } + +bool +EmulateInstructionARM::TestEmulation (Stream *out_stream, FILE *test_file, ArchSpec &arch) +{ + if (!test_file) + { + out_stream->Printf ("TestEmulation: Missing test file.\n"); + return false; + } + + uint32_t test_opcode; + if (fscanf (test_file, "%x", &test_opcode) != 1) + { + out_stream->Printf ("Test Emulation: Error reading opcode from test file.\n"); + return false; + } + + char buffer[256]; + fgets (buffer, 255, test_file); // consume the newline after reading the opcode. + + SetAdvancePC (true); + + if (arch.GetTriple().getArch() == llvm::Triple::arm) + { + m_opcode_mode = eModeARM; + m_opcode.SetOpcode32 (test_opcode); + } + else if (arch.GetTriple().getArch() == llvm::Triple::thumb) + { + m_opcode_mode = eModeThumb; + if (test_opcode < 0x10000) + m_opcode.SetOpcode16 (test_opcode); + else + m_opcode.SetOpcode32 (test_opcode); + + } + else + { + out_stream->Printf ("Test Emulation: Invalid arch.\n"); + return false; + } + + + EmulationStateARM before_state; + EmulationStateARM after_state; + + // Read Memory info & load into before_state + if (!fgets (buffer, 255, test_file)) + { + out_stream->Printf ("Test Emulation: Error attempting to read from test file.\n"); + return false; + } + + if (strncmp (buffer, "Memory-Begin", 12) != 0) + { + out_stream->Printf ("Test Emulation: Cannot find Memory-Begin in test file.\n"); + return false; + } + + bool done = false; + while (!done) + { + if (fgets (buffer, 255, test_file)) + { + if (strncmp (buffer, "Memory-End", 10) == 0) + done = true; + else + { + uint32_t addr; + uint32_t value; + if (sscanf (buffer, "%x %x", &addr, &value) == 2) + before_state.StoreToPseudoAddress ((addr_t) addr, (uint64_t) value, 4); + else + { + out_stream->Printf ("Test Emulation: Error attempting to sscanf address/value pair.\n"); + return false; + } + } + } + else + { + out_stream->Printf ("Test Emulation: Error attemping to read test file.\n"); + return false; + } + } + + if (!EmulationStateARM::LoadRegisterStatesFromTestFile (test_file, before_state, after_state)) + { + out_stream->Printf ("Test Emulation: Error occurred while attempting to load the register data.\n"); + return false; + } + + SetBaton ((void *) &before_state); + SetCallbacks (&EmulationStateARM::ReadPseudoMemory, + &EmulationStateARM::WritePseudoMemory, + &EmulationStateARM::ReadPseudoRegister, + &EmulationStateARM::WritePseudoRegister); + + bool success = EvaluateInstruction (); + if (!success) + { + out_stream->Printf ("Test Emulation: EvaluateInstruction() failed.\n"); + return false; + } + + success = before_state.CompareState (after_state); + return success; +} + Modified: lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h?rev=129832&r1=129831&r2=129832&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h (original) +++ lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h Tue Apr 19 18:30:03 2011 @@ -148,6 +148,9 @@ virtual bool EvaluateInstruction (); + + virtual bool + TestEmulation (Stream *out_stream, FILE *test_file, ArchSpec &arch); uint32_t ArchVersion(); Added: lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.cpp?rev=129832&view=auto ============================================================================== --- lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.cpp (added) +++ lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.cpp Tue Apr 19 18:30:03 2011 @@ -0,0 +1,428 @@ +//===-- EmulationStateARM.cpp -----------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "EmulationStateARM.h" + +#include "lldb/Core/Scalar.h" +#include "lldb/Target/StackFrame.h" +#include "lldb/Target/RegisterContext.h" + +#include "Utility/ARM_DWARF_Registers.h" + +using namespace lldb; +using namespace lldb_private; + +EmulationStateARM::EmulationStateARM () : + m_gpr (), + m_vfp_regs (), + m_memory () +{ + ClearPseudoRegisters(); +} + +EmulationStateARM::~EmulationStateARM () +{ +} + +bool +EmulationStateARM::LoadPseudoRegistersFromFrame (StackFrame &frame) +{ + RegisterContext *reg_context = frame.GetRegisterContext().get(); + Scalar value; + uint64_t reg_value64; + uint32_t reg_value32; + + bool success = true; + + for (int i = dwarf_r0; i < dwarf_r0 + 17; ++i) + { + uint32_t internal_reg_num = reg_context->ConvertRegisterKindToRegisterNumber (eRegisterKindDWARF, i); + if (reg_context->ReadRegisterValue (internal_reg_num, value)) + { + reg_value32 = (uint32_t) value.GetRawBits64 (0); + m_gpr[i - dwarf_r0] = reg_value32; + } + else + success = false; + } + + for (int i = dwarf_s0; i < dwarf_s0 + 32; ++i) + { + uint32_t internal_reg_num = reg_context->ConvertRegisterKindToRegisterNumber (eRegisterKindDWARF, i); + if (reg_context->ReadRegisterValue (internal_reg_num, value)) + { + uint32_t idx = i - dwarf_s0; + reg_value32 = (uint32_t) value.GetRawBits64 (0); + m_vfp_regs.sd_regs[idx / 2].s_reg[idx % 2] = reg_value32; + } + else + success = false; + } + + for (int i = dwarf_d0; i < dwarf_d0 + 32; ++i) + { + uint32_t internal_reg_num = reg_context->ConvertRegisterKindToRegisterNumber (eRegisterKindDWARF, i); + if (reg_context->ReadRegisterValue (internal_reg_num, value)) + { + uint32_t idx = i - dwarf_d0; + reg_value64 = value.GetRawBits64 (0); + if (i < 16) + m_vfp_regs.sd_regs[idx].d_reg = reg_value64; + else + m_vfp_regs.d_regs[idx - 16] = reg_value64; + } + else + success = false; + } + + return success; +} + +bool +EmulationStateARM::StorePseudoRegisterValue (uint32_t reg_num, uint64_t value) +{ + if ((dwarf_r0 <= reg_num) && (reg_num <= dwarf_cpsr)) + m_gpr[reg_num - dwarf_r0] = (uint32_t) value; + else if ((dwarf_s0 <= reg_num) && (reg_num <= dwarf_s31)) + { + uint32_t idx = reg_num - dwarf_s0; + m_vfp_regs.sd_regs[idx / 2].s_reg[idx % 2] = (uint32_t) value; + } + else if ((dwarf_d0 <= reg_num) && (reg_num <= dwarf_d31)) + { + if ((reg_num - dwarf_d0) < 16) + { + m_vfp_regs.sd_regs[reg_num - dwarf_d0].d_reg = value; + } + else + m_vfp_regs.d_regs[reg_num - dwarf_d16] = value; + } + else + return false; + + return true; +} + +uint64_t +EmulationStateARM::ReadPseudoRegisterValue (uint32_t reg_num, bool &success) +{ + uint64_t value = 0; + success = true; + + if ((dwarf_r0 <= reg_num) && (reg_num <= dwarf_cpsr)) + value = m_gpr[reg_num - dwarf_r0]; + else if ((dwarf_s0 <= reg_num) && (reg_num <= dwarf_s31)) + { + uint32_t idx = reg_num - dwarf_s0; + value = m_vfp_regs.sd_regs[idx / 2].s_reg[idx % 2]; + } + else if ((dwarf_d0 <= reg_num) && (reg_num <= dwarf_d31)) + { + if ((reg_num - dwarf_d0) < 16) + value = m_vfp_regs.sd_regs[reg_num - dwarf_d0].d_reg; + else + value = m_vfp_regs.d_regs[reg_num - dwarf_d16]; + } + else + success = false; + + return value; +} + +void +EmulationStateARM::ClearPseudoRegisters () +{ + for (int i = 0; i < 17; ++i) + m_gpr[i] = 0; + + for (int i = 0; i < 16; ++i) + m_vfp_regs.sd_regs[i].d_reg = 0; + + for (int i = 0; i < 16; ++i) + m_vfp_regs.d_regs[i] = 0; +} + +void +EmulationStateARM::ClearPseudoMemory () +{ + m_memory.clear(); +} + +bool +EmulationStateARM::StoreToPseudoAddress (lldb::addr_t p_address, uint64_t value, uint32_t size) +{ + if (size > 8) + return false; + + if (size <= 4) + m_memory[p_address] = value; + else if (size == 8) + { + m_memory[p_address] = (value << 32) >> 32; + m_memory[p_address + 4] = value << 32; + } + return true; +} + +uint32_t +EmulationStateARM::ReadFromPseudoAddress (lldb::addr_t p_address, uint32_t size, bool &success) +{ + std::map::iterator pos; + uint32_t ret_val = 0; + + success = true; + pos = m_memory.find(p_address); + if (pos != m_memory.end()) + ret_val = pos->second; + else + success = false; + + return ret_val; +} + +size_t +EmulationStateARM::ReadPseudoMemory (void *baton, + const EmulateInstruction::Context &context, + lldb::addr_t addr, + void *dst, + size_t length) +{ + if (!baton) + return 0; + + bool success = true; + EmulationStateARM *pseudo_state = (EmulationStateARM *) baton; + if (length <= 4) + { + uint32_t value = pseudo_state->ReadFromPseudoAddress (addr, length, success); + if (!success) + return 0; + + *((uint32_t *) dst) = value; + } + else if (length == 8) + { + uint32_t value1 = pseudo_state->ReadFromPseudoAddress (addr, 4, success); + if (!success) + return 0; + + uint32_t value2 = pseudo_state->ReadFromPseudoAddress (addr + 4, 4, success); + if (!success) + return 0; + + uint64_t value64 = value2; + value64 = (value64 << 32) | value1; + *((uint64_t *) dst) = value64; + } + else + success = false; + + if (success) + return length; + + return 0; +} + +size_t +EmulationStateARM::WritePseudoMemory (void *baton, + const EmulateInstruction::Context &context, + lldb::addr_t addr, + const void *dst, + size_t length) +{ + if (!baton) + return 0; + + bool success; + EmulationStateARM *pseudo_state = (EmulationStateARM *) baton; + uint64_t value = *((uint64_t *) dst); + success = pseudo_state->StoreToPseudoAddress (addr, value, length); + if (success) + return length; + + return 0; +} + +bool +EmulationStateARM::ReadPseudoRegister (void *baton, + uint32_t reg_kind, + uint32_t reg_num, + uint64_t ®_value) +{ + if (!baton) + return false; + + bool success = true; + EmulationStateARM *pseudo_state = (EmulationStateARM *) baton; + + if (reg_kind == eRegisterKindGeneric) + { + switch (reg_num) + { + case LLDB_REGNUM_GENERIC_PC: + reg_num = dwarf_pc; break; + case LLDB_REGNUM_GENERIC_SP: + reg_num = dwarf_sp; break; + case LLDB_REGNUM_GENERIC_FLAGS: + reg_num = dwarf_cpsr; break; + case LLDB_REGNUM_GENERIC_RA: + reg_num = dwarf_lr; break; + default: + break; + } + } + reg_value = pseudo_state->ReadPseudoRegisterValue (reg_num, success); + + return success; + +} + +bool +EmulationStateARM::WritePseudoRegister (void *baton, + const EmulateInstruction::Context &context, + uint32_t reg_kind, + uint32_t reg_num, + uint64_t reg_value) +{ + if (!baton) + return false; + + if (reg_kind == eRegisterKindGeneric) + { + switch (reg_num) + { + case LLDB_REGNUM_GENERIC_PC: + reg_num = dwarf_pc; break; + case LLDB_REGNUM_GENERIC_SP: + reg_num = dwarf_sp; break; + case LLDB_REGNUM_GENERIC_FLAGS: + reg_num = dwarf_cpsr; break; + case LLDB_REGNUM_GENERIC_RA: + reg_num = dwarf_lr; break; + default: + break; + } + } + + EmulationStateARM *pseudo_state = (EmulationStateARM *) baton; + return pseudo_state->StorePseudoRegisterValue (reg_num, reg_value); +} + +bool +EmulationStateARM::LoadState (FILE *test_file) +{ + if (!test_file) + return false; + + uint32_t num_regs; + uint32_t value32; + uint64_t value64; + + /* Load general register state */ + if (fscanf (test_file, "%d", &num_regs) != 1) + return false; + + + for (int i = 0; i < num_regs; ++i) + { + if (fscanf (test_file, "%x", &value32) == 1) + { + if (i < 17) // We only have 17 general registers, but if for some reason the file contains more + // we need to read them all, to get to the next set of register values. + m_gpr[i] = value32; + } + else + return false; + } + + /* Load d register state */ + if (fscanf (test_file, "%d", &num_regs) != 1) + return false; + + for (int i = 0; i < num_regs; ++i) + { + if (fscanf (test_file, "%x", &value64) == 1) + { + if (i < 32) + { + if (i < 16) + m_vfp_regs.sd_regs[i].d_reg = value64; + else + m_vfp_regs.d_regs[i - 16] = value64; + } + } + else + return false; + } + + /* Load s register state */ + if (fscanf (test_file, "%d", &num_regs) != 1) + return false; + + for (int i = 0; i < num_regs; ++i) + { + if (fscanf (test_file, "%x", &value32) == 1) + m_vfp_regs.sd_regs[i / 2].s_reg[i % 2] = value32; + else + return false; + } + + return true; +} + +bool +EmulationStateARM::LoadRegisterStatesFromTestFile (FILE *test_file, + EmulationStateARM &before_state, + EmulationStateARM &after_state) +{ + if (test_file) + { + if (before_state.LoadState (test_file)) + return after_state.LoadState (test_file); + } + + return false; +} + +bool +EmulationStateARM::CompareState (EmulationStateARM &other_state) +{ + bool match = true; + + for (int i = 0; match && i < 17; ++i) + { + if (m_gpr[i] != other_state.m_gpr[i]) + match = false; + } + + for (int i = 0; match && i < 16; ++i) + { + if (m_vfp_regs.sd_regs[i].s_reg[0] != other_state.m_vfp_regs.sd_regs[i].s_reg[0]) + match = false; + + if (m_vfp_regs.sd_regs[i].s_reg[1] != other_state.m_vfp_regs.sd_regs[i].s_reg[1]) + match = false; + } + + for (int i = 0; match && i < 32; ++i) + { + if (i < 16) + { + if (m_vfp_regs.sd_regs[i].d_reg != other_state.m_vfp_regs.sd_regs[i].d_reg) + match = false; + } + else + { + if (m_vfp_regs.d_regs[i - 16] != other_state.m_vfp_regs.d_regs[i - 16]) + match = false; + } + } + + return match; +} Added: lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.h?rev=129832&view=auto ============================================================================== --- lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.h (added) +++ lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.h Tue Apr 19 18:30:03 2011 @@ -0,0 +1,105 @@ +//===-- lldb_EmulationStateARM.h --------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef lldb_EmulationStateARM_h_ +#define lldb_EmulationStateARM_h_ + +#include + +#include "lldb/Core/EmulateInstruction.h" +#include "lldb/Core/Opcode.h" + +namespace lldb_private { + +class EmulationStateARM { +public: + + EmulationStateARM (); + + virtual + ~EmulationStateARM (); + + bool + StorePseudoRegisterValue (uint32_t reg_num, uint64_t value); + + uint64_t + ReadPseudoRegisterValue (uint32_t reg_num, bool &success); + + bool + StoreToPseudoAddress (lldb::addr_t p_address, uint64_t value, uint32_t size); + + uint32_t + ReadFromPseudoAddress (lldb::addr_t p_address, uint32_t size, bool &success); + + void + ClearPseudoRegisters (); + + void + ClearPseudoMemory (); + + bool + LoadPseudoRegistersFromFrame (StackFrame &frame); + + bool + LoadState (FILE *test_file); + + static bool + LoadRegisterStatesFromTestFile (FILE *test_file, EmulationStateARM &before_state, EmulationStateARM &after_state); + + bool + CompareState (EmulationStateARM &other_state); + + static size_t + ReadPseudoMemory (void *baton, + const EmulateInstruction::Context &context, + lldb::addr_t addr, + void *dst, + size_t length); + + static size_t + WritePseudoMemory (void *baton, + const EmulateInstruction::Context &context, + lldb::addr_t addr, + const void *dst, + size_t length); + + static bool + ReadPseudoRegister (void *baton, + uint32_t reg_kind, + uint32_t reg_num, + uint64_t ®_value); + + static bool + WritePseudoRegister (void *baton, + const EmulateInstruction::Context &context, + uint32_t reg_kind, + uint32_t reg_num, + uint64_t reg_value); +private: + uint32_t m_gpr[17]; + struct sd_regs + { + union + { + uint32_t s_reg[2]; + uint64_t d_reg; + } sd_regs[16]; // sregs 0 - 31 & dregs 0 - 15 + + uint64_t d_regs[16]; // dregs 16-31 + + } m_vfp_regs; + + std::map m_memory; // Eventually will want to change uint32_t to a data buffer heap type. + + DISALLOW_COPY_AND_ASSIGN (EmulationStateARM); +}; + +} // namespace lldb_private + +#endif // lldb_EmulationStateARM_h_ Added: lldb/trunk/test/arm_emulation/TestEmulations.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/TestEmulations.py?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/TestEmulations.py (added) +++ lldb/trunk/test/arm_emulation/TestEmulations.py Tue Apr 19 18:30:03 2011 @@ -0,0 +1,59 @@ +""" +Test some ARM instruction emulation. +""" + +import os, time +import unittest2 +import lldb +from lldbtest import * + +class ARMEmulationTestCase(TestBase): + + mydir = "arm_emulation" + + def test_thumb_emulations (self): + current_dir = os.getcwd(); + test_dir = os.path.join (current_dir, "test-files") + files = os.listdir (test_dir) + thumb_files = list() + for f in files: + if '-thumb.dat' in f: + thumb_files.append (f) + + for f in thumb_files: + test_file = os.path.join (test_dir, f) + print '\nRunning test ' + f + self.run_a_single_test (test_file) + + + def test_arm_emulations (self): + current_dir = os.getcwd(); + test_dir = os.path.join (current_dir, "test-files") + files = os.listdir (test_dir) + arm_files = list() + for f in files: + if '-arm.dat' in f: + arm_files.append (f) + + for f in arm_files: + test_file = os.path.join (test_dir, f) + print '\nRunning test ' + f + self.run_a_single_test (test_file) + + def run_a_single_test (self, filename): + insn = lldb.SBInstruction (); + stream = lldb.SBStream (); + success = insn.TestEmulation (stream, filename); + output = stream.GetData(); + if not success: + print output + + self.assertTrue ('Emulation test succeeded.' in output) + self.assertTrue (success == True) + +if __name__ == '__main__': + import atexit + lldb.SBDebugger.Initialize() + atexit.register(lambda: lldb.SBDebugger.Terminate()) + unittest2.main() + Added: lldb/trunk/test/arm_emulation/test-files/test-add-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r0, r0, r15" +arm-apple-darwin +0xe080000f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00003000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r0, r13, #0" +thumb-apple-darwin +0xa800 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-10-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-10-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-10-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-10-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add sp, r13" +thumb-apple-darwin +0x44ed +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x5fbffca0 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-11-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-11-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-11-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-11-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add sp, r15" +thumb-apple-darwin +0x44fd +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fe02e50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-12-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-12-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-12-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-12-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add sp, r8" +thumb-apple-darwin +0x44c5 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r0, r13, #0" +arm-apple-darwin +0xe28d0000 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe58 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r0, sp, r0" +thumb-apple-darwin +0x4468 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-3-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-3-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r0, r1, r0, lsl #2" +arm-apple-darwin +0xe0810100 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000001 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add.w r10, r13, #31" +thumb-apple-darwin +0xf10d0a1f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe40 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe40 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe40 +0x00000008 +0x00000009 +0x2fdffe5f +0x0000000b +0x0000000c +0x2fdffe40 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-4-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-4-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r0, r2, r7, lsl r1" +arm-apple-darwin +0xe0820117 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe40 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe40 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x5fbffc82 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe40 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe40 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-4-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-4-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r3, r13, #16" +thumb-apple-darwin +0xab04 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x2fdffe58 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-5-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-5-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-5-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-5-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r10, r13, #31" +arm-apple-darwin +0xe28da01f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x2fdffe6f +0x0000000b +0x0000000c +0x2fdffe50 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-5-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-5-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-5-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-5-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r3, sp, r3" +thumb-apple-darwin +0x446b +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x2fdffe53 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-6-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-6-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-6-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-6-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r12, r13, #24" +arm-apple-darwin +0xe28dc018 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x2fdffe68 +0x2fdffe50 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-6-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-6-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-6-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-6-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r5, r13, #32" +thumb-apple-darwin +0xad08 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x2fdffe68 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-7-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-7-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-7-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-7-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add r6, sp, #8" +arm-apple-darwin +0xe28d6008 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x2fdffe68 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-7-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-7-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-7-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-7-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add sp, #16" +thumb-apple-darwin +0xb004 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe68 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-8-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-8-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-8-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-8-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add sp, r8" +arm-apple-darwin +0xe08dd008 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe68 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-8-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-8-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-8-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-8-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add sp, #4" +thumb-apple-darwin +0xb001 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe5c +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-add-9-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-add-9-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-add-9-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-add-9-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "add sp, r10" +thumb-apple-darwin +0x44d5 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe5a +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-bic-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-bic-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-bic-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-bic-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "bic r4, r9" +arm-apple-darwin +0xe1c44009 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-bic-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-bic-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-bic-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-bic-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "bics r4, r6" +thumb-apple-darwin +0x43b4 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000000 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldmia-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldmia-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldmia-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldmia-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,131 @@ +# "ldmia r0!, {r1, r3}" +arm-apple-darwin +0xe8b0000a +Memory-Begin +0x2fdffe50 0x0 +0x2fdffe54 0x2e7c +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x0000001f +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe58 +0x00000000 +0x2fdffe70 +0x00002e7c +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldmia-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldmia-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldmia-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldmia-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,131 @@ +# "ldmia r0!, {r1, r3}" +thumb-apple-darwin +0xc80a +Memory-Begin +0x2fdffe40 0x0 +0x2fdffe44 0x2f84 +Memory-End +17 +0x2fdffe40 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffe40 +0x2fdffec0 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdffe40 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe48 +0x00000000 +0x2fdffe60 +0x00002f84 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffe40 +0x2fdffec0 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdffe40 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldmia-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldmia-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldmia-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldmia-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,135 @@ +# "ldmia r0!, {r2, r4, r6, r8, r10, r12}" +arm-apple-darwin +0xe8b01554 +Memory-Begin +0x2fdffe20 0x0 +0x2fdffe24 0x2e7c +0x2fdffe28 0x1 +0x2fdffe2c 0x2fdffe84 +0x2fdffe30 0x0 +0x2fdffe34 0x0 +Memory-End +17 +0x2fdffe20 +0x2fdffe30 +0x2fdffe40 +0x0000001f +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe20 +0x2fdffea0 +0x2fdffeb0 +0x2fdffec0 +0x2fdffed0 +0x2fdffee0 +0x2fdffe20 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe38 +0x2fdffe30 +0x00000000 +0x0000001f +0x00002e7c +0x2fdffe70 +0x00000001 +0x2fdffe20 +0x2fdffe84 +0x2fdffeb0 +0x00000000 +0x2fdffed0 +0x00000000 +0x2fdffe20 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldmia-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldmia-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldmia-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldmia-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,135 @@ +# "ldmia.w r0!,{r2,r4,r6,r8,r10,r12}" +thumb-apple-darwin +0xe8b01554 +Memory-Begin +0x2fdffe50 0x0 +0x2fdffe54 0x2f80 +0x2fdffe58 0x1 +0x2fdffe5c 0x2fdffeac +0x2fdffe60 0x0 +0x2fdffe64 0x0 +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe68 +0x2fdffe60 +0x00000000 +0x2fdffe80 +0x00002f80 +0x2fdffea0 +0x00000001 +0x2fdffe50 +0x2fdffeac +0x2fdffee0 +0x00000000 +0x2fdfff00 +0x00000000 +0x2fdffe50 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldmia-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldmia-3-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldmia-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldmia-3-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,131 @@ +# "ldmia r14!, {r1, r3}" +arm-apple-darwin +0xe8be000a +Memory-Begin +0x2e7c 0xe59fc00c +0x2e80 0xe08fc00c +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x0000001f +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe50 +0xe59fc00c +0x2fdffe70 +0xe08fc00c +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e84 +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldmia-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldmia-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldmia-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldmia-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,131 @@ +# "ldmia.w r14!, {r1, r3}" +thumb-apple-darwin +0xe8be000a +Memory-Begin +0x2f80 0xe59fc00c +0x2f84 0xe08fc00c +Memory-End +17 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffec8 +0x2fdffed8 +0x2fdffe78 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdfff28 +0x2fdfff38 +0x2fdffe78 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe78 +0xe59fc00c +0x2fdffe98 +0xe08fc00c +0x2fdffeb8 +0x2fdffec8 +0x2fdffed8 +0x2fdffe78 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdfff28 +0x2fdfff38 +0x2fdffe78 +0x00002f88 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r0, [pc, #+24]" +arm-apple-darwin +0xe59f0018 +Memory-Begin +0x3018 0x3030 +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00003030 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r0, [pc, #12]" +thumb-apple-darwin +0x4803 +Memory-Begin +0x300c 0x3024 +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00003024 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-10-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-10-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-10-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-10-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr.w r10,[ pc, #4]" +thumb-apple-darwin +0xf8dfa004 +Memory-Begin +0x3000 0x2fe01000 +Memory-End +17 +0x2fdffe48 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe48 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fe01000 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-11-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-11-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-11-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-11-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr.w r8, [pc , #0]" +thumb-apple-darwin +0xf8df8000 +Memory-Begin +0x2ffc 0xa0e1defe +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0xa0e1defe +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-12-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-12-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-12-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-12-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr.w r9, [pc, #-4]" +thumb-apple-darwin +0xf85f9004 +Memory-Begin +0x2fec 0x9004f85f +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x9004f85f +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r0, [pc, #256]" +arm-apple-darwin +0xe59f0100 +Memory-Begin +0x3100 0x0 +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r0, [pc, #+24]" +thumb-apple-darwin +0x4806 +Memory-Begin +0x3018 0x3030 +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00003030 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-3-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-3-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r0, [r13, #+24]" +arm-apple-darwin +0xe59d0018 +Memory-Begin +0x2fdffe70 0x2fdffe80 +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe80 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r0, [pc, #256]" +thumb-apple-darwin +0x4840 +Memory-Begin +0x3100 0x0 +Memory-End +17 +0x2fdffe48 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-4-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-4-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r1, [r5, #16]" +arm-apple-darwin +0xe5951010 +Memory-Begin +0x2fdffeb8 0x7365742d +Memory-End +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe58 +0x7365742d +0x2fdffe78 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-4-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-4-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r0, [r13, #+24]" +thumb-apple-darwin +0x9806 +Memory-Begin +0x2fdffe60 0x2fdffe70 +Memory-End +17 +0x2fdffe48 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe70 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-5-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-5-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-5-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-5-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r2, [r0]" +arm-apple-darwin +0xe5902000 +Memory-Begin +0x2fdffe60 0x0 +Memory-End +17 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x0000001f +0x2fdffea0 +0x2fdffeb0 +0x2fdffec0 +0x2fdffe60 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdfff20 +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe60 +0x2fdffe70 +0x00000000 +0x0000001f +0x2fdffea0 +0x2fdffeb0 +0x2fdffec0 +0x2fdffe60 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdfff20 +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-5-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-5-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-5-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-5-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r1, [pc, #0]" +thumb-apple-darwin +0x4900 +Memory-Begin +0x3000 0x2fe01000 +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x2fe01000 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-6-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-6-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-6-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-6-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r2, [r6], +r8, lsl #2" +arm-apple-darwin +0xe6962108 +Memory-Begin +0x2fdffea8 0x7365742d +Memory-End +17 +0x2fdffe48 +0x2fdffe58 +0x2fdffe68 +0x0000001f +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe48 +0x2fdffe58 +0x7365742d +0x0000001f +0x2fdffe88 +0x2fdffe98 +0xef5ff9c8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-6-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-6-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-6-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-6-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r1, [r5, #16]" +thumb-apple-darwin +0x6929 +Memory-Begin +0x2fdffeb0 0x65742d62 +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x65742d62 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-7-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-7-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-7-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-7-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r2, [sp, #24]" +arm-apple-darwin +0xe59d2018 +Memory-Begin +0x2fdffe70 0x0 +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000000 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-7-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-7-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-7-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-7-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r2, [r0]" +thumb-apple-darwin +0x6802 +Memory-Begin +0x2fdffe58 0x0 +Memory-End +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe58 +0x2fdffe68 +0x00000000 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-8-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-8-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-8-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-8-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r3, [r11, #-8]" +arm-apple-darwin +0xe51b3008 +Memory-Begin +0x2fdfff00 0x63387830 +Memory-End +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x63387830 +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-8-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-8-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-8-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-8-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr r2, [sp, #24]" +thumb-apple-darwin +0x9a06 +Memory-Begin +0x2fdffe68 0x2fdffe78 +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe78 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldr-9-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldr-9-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldr-9-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldr-9-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldr.w r3, [r11, #8]" +thumb-apple-darwin +0xf8db3008 +Memory-Begin +0x2fdfff08 0x62343134 +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x62343134 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldrd-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldrd-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldrd-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldrd-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,131 @@ +# "ldrd r0, r1, [r12, #+4]" +arm-apple-darwin +0xe1cc00d4 +Memory-Begin +0x2fdfff14 0x30313038 +0x2fdfff18 0x31623039 +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x0000001f +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x30313038 +0x31623039 +0x2fdffe70 +0x0000001f +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldrd-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldrd-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldrd-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldrd-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,131 @@ +# "ldrd r0, r1, [r12, #+4]" +thumb-apple-darwin +0xe9dc0101 +Memory-Begin +0x2fdfff3c 0x0 +0x2fdfff40 0x0 +Memory-End +17 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffec8 +0x2fdffed8 +0x2fdffe78 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdfff28 +0x2fdfff38 +0x2fdffe78 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000000 +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffec8 +0x2fdffed8 +0x2fdffe78 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdfff28 +0x2fdfff38 +0x2fdffe78 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldrd-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldrd-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldrd-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldrd-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,131 @@ +# "ldrd r4, r5, [pc, #-0]" +thumb-apple-darwin +0xe9df4500 +Memory-Begin +0x2ffc 0xa0e1defe +0x3000 0x2fe01000 +Memory-End +17 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffec8 +0x2fdffed8 +0x2fdffe78 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdfff28 +0x2fdfff38 +0x2fdffe78 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0xa0e1defe +0x2fe01000 +0x2fdffed8 +0x2fdffe78 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdfff28 +0x2fdfff38 +0x2fdffe78 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldrh-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldrh-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldrh-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldrh-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldrh r0, [r2, #16]" +thumb-apple-darwin +0x8a10 +Memory-Begin +0x2fdffe78 0x0000762f +Memory-End +17 +0x2fdffe48 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x0000762f +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldrsh-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldrsh-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldrsh-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldrsh-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldrsh r0, [r2], #+15" +arm-apple-darwin +0xe0d200ff +Memory-Begin +0x2fdffe70 0xfffffeeb +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x0000001f +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0xfffffeeb +0x2fdffe60 +0x2fdffe7f +0x0000001f +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-ldrsh-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-ldrsh-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-ldrsh-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-ldrsh-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "ldrsh r14, [r2], #+15" +arm-apple-darwin +0xe0d2e0ff +Memory-Begin +0x2fdffe70 0xfffffeec +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x0000001f +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe7f +0x0000001f +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0xfffffeec +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r12, #256" +arm-apple-darwin +0xe3a0cc01 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x00000100 +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov ip, pc" +thumb-apple-darwin +0x46fc +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x00003000 +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-10-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-10-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-10-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-10-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r0, r15" +thumb-apple-darwin +0x4678 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00003000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-11-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-11-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-11-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-11-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r0, r7" +thumb-apple-darwin +0x4638 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe58 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-12-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-12-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-12-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-12-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov.w r12, #256" +thumb-apple-darwin +0xf44f7c80 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x00000100 +0x2fdffe50 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-13-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-13-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-13-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-13-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r12, r13" +thumb-apple-darwin +0x46ec +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x2fdffe50 +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-14-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-14-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-14-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-14-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r14, r2" +thumb-apple-darwin +0x4696 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00000002 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-15-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-15-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-15-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-15-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r1, r14" +thumb-apple-darwin +0x4671 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00002f84 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-16-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-16-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-16-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-16-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r2, ip" +thumb-apple-darwin +0x4662 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x0000000c +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-17-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-17-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-17-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-17-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r2, r13" +thumb-apple-darwin +0x466a +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x2fdffe50 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-18-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-18-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-18-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-18-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r2, r9" +thumb-apple-darwin +0x464a +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000009 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-19-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-19-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-19-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-19-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r3, r12" +thumb-apple-darwin +0x4663 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000000c +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r12, r13" +arm-apple-darwin +0xe1a0c00d +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x2fdffe58 +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov ip, r8" +thumb-apple-darwin +0x46c4 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x00000008 +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-20-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-20-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-20-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-20-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r3, r13" +thumb-apple-darwin +0x466b +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x2fdffe50 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-21-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-21-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-21-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-21-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r3, sp" +thumb-apple-darwin +0x466b +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x2fdffe58 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-22-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-22-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-22-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-22-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r4, r11" +thumb-apple-darwin +0x465c +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x0000000b +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-23-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-23-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-23-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-23-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r5, r10" +thumb-apple-darwin +0x4655 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x0000000a +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-24-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-24-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-24-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-24-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r6, r9" +thumb-apple-darwin +0x464e +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000009 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-25-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-25-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-25-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-25-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r7, lr" +thumb-apple-darwin +0x4677 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00002f84 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-26-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-26-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-26-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-26-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r7, r8" +thumb-apple-darwin +0x4647 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000008 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-27-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-27-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-27-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-27-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r9, pc" +thumb-apple-darwin +0x46f9 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00003000 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-28-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-28-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-28-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-28-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov sp, ip" +thumb-apple-darwin +0x46e5 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000c +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-29-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-29-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-29-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-29-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov sp, pc" +thumb-apple-darwin +0x46fd +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x00003000 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-3-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-3-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r14, r2" +arm-apple-darwin +0xe1a0e002 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00000002 +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov ip, sp" +thumb-apple-darwin +0x46ec +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x2fdffe58 +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-30-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-30-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-30-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-30-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov sp, r7" +thumb-apple-darwin +0x46bd +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-31-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-31-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-31-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-31-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "movs r3, #1" +thumb-apple-darwin +0x2301 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000001 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffe +0x20000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-4-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-4-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r2, r9" +arm-apple-darwin +0xe1a02009 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000009 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-4-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-4-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov lr, pc" +thumb-apple-darwin +0x46fe +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00003000 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-5-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-5-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-5-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-5-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r3, #2147483648" +arm-apple-darwin +0xe3a03102 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe38 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe38 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x80000000 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe38 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe38 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-5-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-5-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-5-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-5-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov lr, r2" +thumb-apple-darwin +0x4696 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00000002 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-6-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-6-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-6-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-6-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov r3, r13" +arm-apple-darwin +0xe1a0300d +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x2fdffe60 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-6-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-6-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-6-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-6-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov pc, ip" +thumb-apple-darwin +0x46e7 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x0000000c +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-7-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-7-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-7-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-7-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov pc, lr" +thumb-apple-darwin +0x46f7 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002f84 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-8-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-8-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-8-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-8-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov pc, r4" +thumb-apple-darwin +0x46a7 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00000004 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mov-9-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mov-9-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mov-9-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mov-9-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mov pc, sp" +thumb-apple-darwin +0x46ef +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002f84 +0x2fdffe58 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-moveq-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-moveq-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-moveq-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-moveq-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "moveq r3, #1" +arm-apple-darwin +0x3a03001 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000001 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-movs-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-movs-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-movs-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-movs-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "movs r12, r13" +arm-apple-darwin +0xe1b0c00d +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x2fdffe58 +0x2fdffe58 +0x00002e7c +0x00002ffc +0x20000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mvn-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mvn-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mvn-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mvn-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mvn r14, #1" +arm-apple-darwin +0xe3e0e001 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0xfffffffe +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mvn-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mvn-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mvn-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mvn-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mvn r0, #1" +thumb-apple-darwin +0xf06f0001 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe98 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe98 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0xfffffffe +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe98 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe98 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mvn-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mvn-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mvn-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mvn-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mvn r0, #1" +arm-apple-darwin +0xe3e00001 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe68 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe68 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0xfffffffe +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe68 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe68 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mvn-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mvn-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mvn-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mvn-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mvn r0, #31" +thumb-apple-darwin +0xf06f001f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe90 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe90 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0xffffffe0 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe90 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe90 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mvn-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mvn-3-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mvn-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mvn-3-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mvn r0, #31" +arm-apple-darwin +0xe3e0001f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0xffffffe0 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mvn-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mvn-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mvn-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mvn-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mvn r14, #1" +thumb-apple-darwin +0xf06f0e01 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe90 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe90 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe90 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe90 +0xfffffffe +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mvn-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mvn-4-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mvn-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mvn-4-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mvn r3, r8" +arm-apple-darwin +0xe1e03008 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0xfffffff7 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-mvn-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-mvn-4-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-mvn-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-mvn-4-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "mvns r3, r8" +thumb-apple-darwin +0xea7f0308 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe90 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe90 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0xfffffff7 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe90 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe90 +0x00002f80 +0x00002ffc +0xa0000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-pop-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-pop-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-pop-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-pop-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,133 @@ +# "pop {r3, r4, r8, r10}" +arm-apple-darwin +0xe8bd0518 +Memory-Begin +0x2fdffe50 0x0 +0x2fdffe54 0x2e7c +0x2fdffe58 0x1 +0x2fdffe5c 0x2fdffeac +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000000 +0x00002e7c +0x00000005 +0x00000006 +0x2fdffe50 +0x00000001 +0x00000009 +0x2fdffeac +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-pop-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-pop-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-pop-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-pop-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,133 @@ +# "pop.w {r3, r4, r8, r10}" +thumb-apple-darwin +0xe8bd0518 +Memory-Begin +0x2fdffe38 0x0 +0x2fdffe3c 0x2f80 +0x2fdffe40 0x1000 +0x2fdffe44 0x1 +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe38 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe38 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000000 +0x00002f80 +0x00000005 +0x00000006 +0x2fdffe38 +0x00001000 +0x00000009 +0x00000001 +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-pop-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-pop-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-pop-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-pop-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "pop {r9}" +arm-apple-darwin +0xe8bd0200 +Memory-Begin +0x2fdffe70 0x0 +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe70 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe70 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe70 +0x00000008 +0x00000000 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe74 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-pop-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-pop-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-pop-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-pop-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "pop {r3}" +thumb-apple-darwin +0xbc08 +Memory-Begin +0x2fdffe60 0x0 +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000000 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe64 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-pop-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-pop-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-pop-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-pop-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "pop {r6}" +thumb-apple-darwin +0xbc40 +Memory-Begin +0x2fdffe60 0x0 +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000000 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe64 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-push-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-push-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-push-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-push-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "push {r0, r1, r2, r3, r7, r14}" +arm-apple-darwin +0xe92d408f +Memory-Begin +Memory-End +17 +0x2fdffe30 +0x2fdffe40 +0x2fdffe50 +0x0000001f +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffe30 +0x2fdffeb0 +0x2fdffec0 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdffe30 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe30 +0x2fdffe40 +0x2fdffe50 +0x0000001f +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffe30 +0x2fdffeb0 +0x2fdffec0 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdffe18 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-push-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-push-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-push-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-push-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "push {r0, r1, r2, r3, r7, r14}" +thumb-apple-darwin +0xb58f +Memory-Begin +Memory-End +17 +0x2fdffe28 +0x2fdffe38 +0x2fdffe48 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe28 +0x2fdffea8 +0x2fdffeb8 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffe28 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe28 +0x2fdffe38 +0x2fdffe48 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe28 +0x2fdffea8 +0x2fdffeb8 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffe10 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-push-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-push-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-push-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-push-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "push {r6}" +arm-apple-darwin +0xe92d0040 +Memory-Begin +Memory-End +17 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x0000001f +0x2fdffea8 +0x2fdffeb8 +0x2fdffec8 +0x2fdffe68 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdfff28 +0x2fdffe68 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x0000001f +0x2fdffea8 +0x2fdffeb8 +0x2fdffec8 +0x2fdffe68 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdfff28 +0x2fdffe64 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-push-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-push-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-push-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-push-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "push {r6}" +thumb-apple-darwin +0xb440 +Memory-Begin +Memory-End +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe54 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-push-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-push-3-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-push-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-push-3-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "push {r7, r14}" +arm-apple-darwin +0xe92d4080 +Memory-Begin +Memory-End +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe50 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-push-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-push-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-push-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-push-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "push {r7, r14}" +thumb-apple-darwin +0xb580 +Memory-Begin +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe48 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-str-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-str-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-str-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-str-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "str r0, [r13]" +arm-apple-darwin +0xe58d0000 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-str-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-str-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-str-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-str-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "str r0, [r13]" +thumb-apple-darwin +0x9000 +Memory-Begin +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-str-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-str-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-str-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-str-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "str r1, [r0, #+4]" +arm-apple-darwin +0xe5801004 +Memory-Begin +Memory-End +17 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x0000001f +0x2fdffea0 +0x2fdffeb0 +0x2fdffec0 +0x2fdffe60 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdfff20 +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x0000001f +0x2fdffea0 +0x2fdffeb0 +0x2fdffec0 +0x2fdffe60 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdfff20 +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-str-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-str-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-str-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-str-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "str r0, [sp, #0]" +thumb-apple-darwin +0x9000 +Memory-Begin +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-str-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-str-3-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-str-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-str-3-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "str r2, [r0]" +arm-apple-darwin +0xe5802000 +Memory-Begin +Memory-End +17 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x0000001f +0x2fdffea0 +0x2fdffeb0 +0x2fdffec0 +0x2fdffe60 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdfff20 +0x2fdffe60 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x0000001f +0x2fdffea0 +0x2fdffeb0 +0x2fdffec0 +0x2fdffe60 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdfff20 +0x2fdffe60 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-str-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-str-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-str-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-str-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "str r1, [sp, #32]" +thumb-apple-darwin +0x9108 +Memory-Begin +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002f84 +0x00002ffe +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-str-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-str-4-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-str-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-str-4-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "str r2, [r13, #+4]" +arm-apple-darwin +0xe58d2004 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-str-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-str-4-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-str-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-str-4-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "str.w r7, [r13, #-12]!" +thumb-apple-darwin +0xf84d7d0c +Memory-Begin +Memory-End +17 +0x2fdffe48 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe48 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe48 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x2fdffe88 +0x2fdffe98 +0x2fdffea8 +0x2fdffe48 +0x2fdffec8 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdffe3c +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-str-5-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-str-5-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-str-5-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-str-5-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "str r7, [r13, #-12]!" +arm-apple-darwin +0xe52d700c +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe4c +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-strb-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-strb-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-strb-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-strb-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "strb r0, [r2], #+15" +arm-apple-darwin +0xe4c2000f +Memory-Begin +Memory-End +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe87 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-strb-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-strb-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-strb-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-strb-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "strb r3, [r0, #+8]" +arm-apple-darwin +0xe5c03008 +Memory-Begin +Memory-End +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-strbt-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-strbt-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-strbt-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-strbt-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "strbt r14, [r2], #+15" +arm-apple-darwin +0xe4e2e00f +Memory-Begin +Memory-End +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe70 +0x0000001f +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe50 +0x2fdffe60 +0x2fdffe7f +0x0000001f +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffe50 +0x2fdffed0 +0x2fdffee0 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdffe50 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-strd-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-strd-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-strd-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-strd-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "strd r10, r11, [r6, #+28]" +thumb-apple-darwin +0xe9c6ab07 +Memory-Begin +Memory-End +17 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffec0 +0x2fdffed0 +0x2fdffe70 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdfff20 +0x2fdfff30 +0x2fdffe70 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe70 +0x2fdffe80 +0x2fdffe90 +0x2fdffea0 +0x2fdffeb0 +0x2fdffec0 +0x2fdffed0 +0x2fdffe70 +0x2fdffef0 +0x2fdfff00 +0x2fdfff10 +0x2fdfff20 +0x2fdfff30 +0x2fdffe70 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-strt-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-strt-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-strt-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-strt-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "strt r0, [r2], #+15" +arm-apple-darwin +0xe4a2000f +Memory-Begin +Memory-End +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe78 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe58 +0x2fdffe68 +0x2fdffe87 +0x0000001f +0x2fdffe98 +0x2fdffea8 +0x2fdffeb8 +0x2fdffe58 +0x2fdffed8 +0x2fdffee8 +0x2fdffef8 +0x2fdfff08 +0x2fdfff18 +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub r0, sp, r8" +arm-apple-darwin +0xe04d0008 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x2fdffe50 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub.w r10, sp, #16" +thumb-apple-darwin +0xf1ad0a10 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe40 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe40 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe40 +0x00000008 +0x00000009 +0x2fdffe30 +0x0000000b +0x0000000c +0x2fdffe40 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-10-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-10-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-10-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-10-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub r7, r12, #8" +arm-apple-darwin +0xe24c7008 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x00000004 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-2-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-2-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub r10, r12, #31" +arm-apple-darwin +0xe24ca01f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0xffffffed +0x0000000b +0x0000000c +0x2fdffe50 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub.w r10, sp, #31" +thumb-apple-darwin +0xf1ad0a1f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe40 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe40 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe40 +0x00000008 +0x00000009 +0x2fdffe21 +0x0000000b +0x0000000c +0x2fdffe40 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-3-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-3-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub r12, r13, #12" +arm-apple-darwin +0xe24dc00c +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x2fdffe44 +0x2fdffe50 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub.w r12, sp, #31" +thumb-apple-darwin +0xf1ad0c1f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe40 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe40 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe40 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x2fdffe21 +0x2fdffe40 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-4-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-4-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub r13, r13, #24" +arm-apple-darwin +0xe24dd018 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe38 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-4-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-4-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub.w r1, sp, r3, lsl #2" +thumb-apple-darwin +0xebad0183 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe30 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe30 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x2fdffe24 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe30 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe30 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-5-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-5-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-5-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-5-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub r13, r13, #4" +arm-apple-darwin +0xe24dd004 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe54 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-5-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-5-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-5-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-5-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub.w r7, sp, #1" +thumb-apple-darwin +0xf1ad0701 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe4f +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-6-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-6-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-6-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-6-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub r1, r13, #4" +arm-apple-darwin +0xe24d1004 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x2fdffe54 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-6-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-6-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-6-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-6-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub.w sp, sp, #4" +thumb-apple-darwin +0xf1ad0d04 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe4c +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-8-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-8-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-8-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-8-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub r2, r2, r3" +arm-apple-darwin +0xe0422003 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0xffffffe3 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-sub-9-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-sub-9-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-sub-9-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-sub-9-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "sub r4, r12, r7" +arm-apple-darwin +0xe04c4007 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0xd02001b4 +0x00000005 +0x00000006 +0x2fdffe58 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe58 +0x00002e7c +0x00002ffc +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-subs-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-subs-1-arm.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-subs-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-subs-1-arm.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "subs r10, r13, #31" +arm-apple-darwin +0xe25da01f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002e7c +0x00002ff8 +0x60000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x0000001f +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x2fdffe31 +0x0000000b +0x0000000c +0x2fdffe50 +0x00002e7c +0x00002ffc +0x20000010 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x00000007 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x0000000d +0x0000000e +0x0000000f +0x00000010 +0x00000011 +0x00000012 +0x00000013 +0x00000014 +0x00000015 +0x00000016 +0x00000017 +0x00000018 +0x00000019 +0x0000001a +0x0000001b +0x0000001c +0x0000001d +0x0000001e +0x0000001f +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-subs-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-subs-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-subs-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-subs-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "subs r0, r6, #0" +thumb-apple-darwin +0x1e30 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000006 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x20000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-subs-10-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-subs-10-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-subs-10-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-subs-10-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "subs.w r1, sp, #4" +thumb-apple-darwin +0xf1bd0104 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x2fdffe44 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f80 +0x00002ffc +0x20000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-subs-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-subs-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-subs-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-subs-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "subs r0, r7, r5" +thumb-apple-darwin +0x1b78 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x2fdffe43 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f84 +0x00002ffe +0x20000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-subs-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-subs-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-subs-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-subs-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "subs.w r10, r13, #31" +thumb-apple-darwin +0xf1bd0a1f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe38 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe38 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe38 +0x00000008 +0x00000009 +0x2fdffe19 +0x0000000b +0x0000000c +0x2fdffe38 +0x00002f80 +0x00002ffc +0x20000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-subs-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-subs-4-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-subs-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-subs-4-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "subs r1, r3, #4" +thumb-apple-darwin +0x1f19 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0xffffffff +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x80000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-subs-5-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-subs-5-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-subs-5-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-subs-5-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "subs r4, r2, r6" +thumb-apple-darwin +0x1b94 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0xfffffffc +0x00000005 +0x00000006 +0x2fdffe48 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe48 +0x00002f84 +0x00002ffe +0x80000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-subs-6-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-subs-6-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-subs-6-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-subs-6-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "subs r7, r5, #7" +thumb-apple-darwin +0x1fef +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe50 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0xfffffffe +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f84 +0x00002ffe +0x80000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-subs-8-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-subs-8-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-subs-8-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-subs-8-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "subs.w r10, r13, #31" +thumb-apple-darwin +0xf1bd0a1f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe38 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe38 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe38 +0x00000008 +0x00000009 +0x2fdffe19 +0x0000000b +0x0000000c +0x2fdffe38 +0x00002f80 +0x00002ffc +0x20000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-subs-9-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-subs-9-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-subs-9-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-subs-9-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "subs.w r10, sp, #31" +thumb-apple-darwin +0xf1bd0a1f +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe38 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe38 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe38 +0x00000008 +0x00000009 +0x2fdffe19 +0x0000000b +0x0000000c +0x2fdffe38 +0x00002f80 +0x00002ffc +0x20000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-vpop-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-vpop-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-vpop-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-vpop-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,137 @@ +# "vpop {d11, d12, d13, d14}" +thumb-apple-darwin +0xecbdbb08 +Memory-Begin +0x2fdffe60 0x00000000 +0x2fdffe64 0x00002f80 +0x2fdffe68 0x00001000 +0x2fdffe6c 0x00000001 +0x2fdffe70 0x2fdffebc +0x2fdffe74 0x00000000 +0x2fdffe78 0x00000000 +0x2fdffe7c 0x2fdffe8c +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe80 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00002f80 +0x00001000 +0x00000001 +0x2fdffebc +0x00000000 +0x00000000 +0x2fdffe8c +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-vpop-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-vpop-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-vpop-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-vpop-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,130 @@ +# "vpop {s0}" +thumb-apple-darwin +0xecbd0a01 +Memory-Begin +0x2fdffe98 0x0 +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe98 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe98 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe98 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe9c +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-vpop-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-vpop-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-vpop-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-vpop-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,133 @@ +# "vpop {s11, s12, s13, s14}" +thumb-apple-darwin +0xecfd5a04 +Memory-Begin +0x2fdffe60 0x0 +0x2fdffe64 0x2f80 +0x2fdffe68 0x1000 +0x2fdffe6c 0x1 +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe70 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00002f80 +0x00001000 +0x00000001 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-vpush-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-vpush-1-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-vpush-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-vpush-1-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "vpush {d11, d12, d13, d14}" +thumb-apple-darwin +0xed2dbb08 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe40 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-vpush-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-vpush-2-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-vpush-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-vpush-2-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "vpush {s0}" +thumb-apple-darwin +0xed2d0a01 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe90 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe90 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe90 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe8c +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 Added: lldb/trunk/test/arm_emulation/test-files/test-vpush-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/test-files/test-vpush-3-thumb.dat?rev=129832&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/test-files/test-vpush-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/test-files/test-vpush-3-thumb.dat Tue Apr 19 18:30:03 2011 @@ -0,0 +1,129 @@ +# "vpush {s11, s12, s13, s14}" +thumb-apple-darwin +0xed6d5a04 +Memory-Begin +Memory-End +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe60 +0x00002f80 +0x00002ff8 +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 +17 +0x00000000 +0x00000001 +0x00000002 +0x00000003 +0x00000004 +0x00000005 +0x00000006 +0x2fdffe60 +0x00000008 +0x00000009 +0x0000000a +0x0000000b +0x0000000c +0x2fdffe50 +0x00002f80 +0x00002ffc +0x60000030 +9 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x000000000000000000000000 +0x00000000 +33 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x00000000 +0x03000000 From gclayton at apple.com Tue Apr 19 20:33:38 2011 From: gclayton at apple.com (Greg Clayton) Date: Wed, 20 Apr 2011 01:33:38 -0000 Subject: [Lldb-commits] [lldb] r129843 - in /lldb/trunk: include/lldb/Interpreter/NamedOptionValue.h include/lldb/lldb-forward-rtti.h include/lldb/lldb-forward.h lldb.xcodeproj/project.pbxproj source/Interpreter/NamedOptionValue.cpp Message-ID: <20110420013338.3E00C2A6C12C@llvm.org> Author: gclayton Date: Tue Apr 19 20:33:38 2011 New Revision: 129843 URL: http://llvm.org/viewvc/llvm-project?rev=129843&view=rev Log: Added the start of a new option value system that we can use for many things around the debugger. The class isn't hooked into anything yet, but it will be soon. Added: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h lldb/trunk/source/Interpreter/NamedOptionValue.cpp Modified: lldb/trunk/include/lldb/lldb-forward-rtti.h lldb/trunk/include/lldb/lldb-forward.h lldb/trunk/lldb.xcodeproj/project.pbxproj Added: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h?rev=129843&view=auto ============================================================================== --- lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h (added) +++ lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Tue Apr 19 20:33:38 2011 @@ -0,0 +1,648 @@ +//===-- NamedOptionValue.h --------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef liblldb_NamedOptionValue_h_ +#define liblldb_NamedOptionValue_h_ + +// C Includes +// C++ Includes +#include +#include + +// Other libraries and framework includes +// Project includes +#include "lldb/Core/ConstString.h" +#include "lldb/Host/FileSpec.h" + +namespace lldb_private { + + + //--------------------------------------------------------------------- + // OptionValue + //--------------------------------------------------------------------- + class OptionValue + { + public: + typedef enum { + eTypeInvalid = 0, + eTypeArray, + eTypeBoolean, + eTypeDictionary, + eTypeEnum, + eTypeFileSpec, + eTypeSInt64, + eTypeUInt64, + eTypeString + } Type; + + virtual ~OptionValue () + { + } + //----------------------------------------------------------------- + // Subclasses should override these functions + //----------------------------------------------------------------- + virtual Type + GetType () = 0; + + virtual void + DumpValue (Stream &strm) = 0; + + virtual bool + SetValueFromCString (const char *value) = 0; + + virtual bool + ResetValueToDefault () = 0; + }; + + + + //--------------------------------------------------------------------- + // OptionValueBoolean + //--------------------------------------------------------------------- + class OptionValueBoolean : public OptionValue + { + OptionValueBoolean (bool current_value, + bool default_value) : + m_current_value (current_value), + m_default_value (default_value) + { + } + + virtual + ~OptionValueBoolean() + { + } + + //--------------------------------------------------------------------- + // Virtual subclass pure virtual overrides + //--------------------------------------------------------------------- + + virtual OptionValue::Type + GetType () + { + return eTypeBoolean; + } + + virtual void + DumpValue (Stream &strm); + + virtual bool + SetValueFromCString (const char *value); + + virtual bool + ResetValueToDefault () + { + m_current_value = m_default_value; + return true; + } + + //--------------------------------------------------------------------- + // Subclass specific functions + //--------------------------------------------------------------------- + + bool + GetCurrentValue() const + { + return m_current_value; + } + + bool + GetDefaultValue() const + { + return m_default_value; + } + + void + SetCurrentValue (bool value) + { + m_current_value = value; + } + + void + SetDefaultValue (bool value) + { + m_default_value = value; + } + + protected: + bool m_current_value; + bool m_default_value; + }; + + //--------------------------------------------------------------------- + // OptionValueSInt64 + //--------------------------------------------------------------------- + class OptionValueSInt64 : public OptionValue + { + OptionValueSInt64 (int64_t current_value, + int64_t default_value) : + m_current_value (current_value), + m_default_value (default_value) + { + } + + virtual + ~OptionValueSInt64() + { + } + + //--------------------------------------------------------------------- + // Virtual subclass pure virtual overrides + //--------------------------------------------------------------------- + + virtual OptionValue::Type + GetType () + { + return eTypeSInt64; + } + + virtual void + DumpValue (Stream &strm); + + virtual bool + SetValueFromCString (const char *value); + + virtual bool + ResetValueToDefault () + { + m_current_value = m_default_value; + return true; + } + + //--------------------------------------------------------------------- + // Subclass specific functions + //--------------------------------------------------------------------- + + int64_t + GetCurrentValue() const + { + return m_current_value; + } + + int64_t + GetDefaultValue() const + { + return m_default_value; + } + + void + SetCurrentValue (int64_t value) + { + m_current_value = value; + } + + void + SetDefaultValue (int64_t value) + { + m_default_value = value; + } + + protected: + int64_t m_current_value; + int64_t m_default_value; + }; + + //--------------------------------------------------------------------- + // OptionValueUInt64 + //--------------------------------------------------------------------- + class OptionValueUInt64 : public OptionValue + { + OptionValueUInt64 (uint64_t current_value, + uint64_t default_value) : + m_current_value (current_value), + m_default_value (default_value) + { + } + + virtual + ~OptionValueUInt64() + { + } + + //--------------------------------------------------------------------- + // Virtual subclass pure virtual overrides + //--------------------------------------------------------------------- + + virtual OptionValue::Type + GetType () + { + return eTypeUInt64; + } + + virtual void + DumpValue (Stream &strm); + + virtual bool + SetValueFromCString (const char *value); + + virtual bool + ResetValueToDefault () + { + m_current_value = m_default_value; + return true; + } + + //--------------------------------------------------------------------- + // Subclass specific functions + //--------------------------------------------------------------------- + + uint64_t + GetCurrentValue() const + { + return m_current_value; + } + + uint64_t + GetDefaultValue() const + { + return m_default_value; + } + + void + SetCurrentValue (uint64_t value) + { + m_current_value = value; + } + + void + SetDefaultValue (uint64_t value) + { + m_default_value = value; + } + + protected: + uint64_t m_current_value; + uint64_t m_default_value; + }; + + //--------------------------------------------------------------------- + // OptionValueFileSpec + //--------------------------------------------------------------------- + class OptionValueFileSpec : public OptionValue + { + OptionValueFileSpec (const FileSpec ¤t_value, + const FileSpec &default_value) : + m_current_value (current_value), + m_default_value (default_value) + { + } + + virtual + ~OptionValueFileSpec() + { + } + + //--------------------------------------------------------------------- + // Virtual subclass pure virtual overrides + //--------------------------------------------------------------------- + + virtual OptionValue::Type + GetType () + { + return eTypeFileSpec; + } + + virtual void + DumpValue (Stream &strm); + + virtual bool + SetValueFromCString (const char *value); + + virtual bool + ResetValueToDefault () + { + m_current_value = m_default_value; + return true; + } + + //--------------------------------------------------------------------- + // Subclass specific functions + //--------------------------------------------------------------------- + + const FileSpec & + GetCurrentValue() const + { + return m_current_value; + } + + const FileSpec & + GetDefaultValue() const + { + return m_default_value; + } + + void + SetCurrentValue (const FileSpec &value) + { + m_current_value = value; + } + + void + SetDefaultValue (const FileSpec &value) + { + m_default_value = value; + } + + protected: + FileSpec m_current_value; + FileSpec m_default_value; + }; + + //--------------------------------------------------------------------- + // OptionValueArray + //--------------------------------------------------------------------- + class OptionValueArray : public OptionValue + { + OptionValueArray () : + m_values () + { + } + + virtual + ~OptionValueArray() + { + } + + //--------------------------------------------------------------------- + // Virtual subclass pure virtual overrides + //--------------------------------------------------------------------- + + virtual OptionValue::Type + GetType () + { + return eTypeArray; + } + + virtual void + DumpValue (Stream &strm); + + virtual bool + SetValueFromCString (const char *value); + + virtual bool + ResetValueToDefault () + { + m_values.clear(); + return true; + } + + //--------------------------------------------------------------------- + // Subclass specific functions + //--------------------------------------------------------------------- + + uint32_t + GetNumValues() const + { + return m_values.size(); + } + + lldb::OptionValueSP + GetValueAtIndex (uint32_t idx) const + { + lldb::OptionValueSP value_sp; + if (idx < m_values.size()) + value_sp = m_values[idx]; + return value_sp; + } + + void + AppendValue (const lldb::OptionValueSP &value_sp) + { + m_values.push_back(value_sp); + } + + void + InsertValue (uint32_t idx, const lldb::OptionValueSP &value_sp) + { + if (idx < m_values.size()) + m_values.insert(m_values.begin() + idx, value_sp); + else + m_values.push_back(value_sp); + } + + bool + ReplaceValue (uint32_t idx, const lldb::OptionValueSP &value_sp) + { + if (idx < m_values.size()) + { + m_values[idx] = value_sp; + return true; + } + return false; + } + + bool + DeleteValue (uint32_t idx) + { + if (idx < m_values.size()) + { + m_values.erase (m_values.begin() + idx); + return true; + } + return false; + } + + protected: + typedef std::vector collection; + collection m_values; + }; + + + + //--------------------------------------------------------------------- + // OptionValueDictionary + //--------------------------------------------------------------------- + class OptionValueDictionary : public OptionValue + { + OptionValueDictionary () : + m_values () + { + } + + virtual + ~OptionValueDictionary() + { + } + + //--------------------------------------------------------------------- + // Virtual subclass pure virtual overrides + //--------------------------------------------------------------------- + + virtual OptionValue::Type + GetType () + { + return eTypeDictionary; + } + + virtual void + DumpValue (Stream &strm); + + virtual bool + SetValueFromCString (const char *value); + + virtual bool + ResetValueToDefault () + { + m_values.clear(); + return true; + } + + //--------------------------------------------------------------------- + // Subclass specific functions + //--------------------------------------------------------------------- + + uint32_t + GetNumValues() const + { + return m_values.size(); + } + + lldb::OptionValueSP + GetValueForKey (const ConstString &key) const + { + lldb::OptionValueSP value_sp; + collection::const_iterator pos = m_values.find (key); + if (pos != m_values.end()) + value_sp = pos->second; + return value_sp; + } + + bool + SetValueForKey (const ConstString &key, + const lldb::OptionValueSP &value_sp, + bool can_replace) + { + if (!can_replace) + { + collection::const_iterator pos = m_values.find (key); + if (pos != m_values.end()) + return false; + } + m_values[key] = value_sp; + return true; + } + + bool + DeleteValueForKey (const ConstString &key) + { + collection::iterator pos = m_values.find (key); + if (pos != m_values.end()) + { + m_values.erase(pos); + return true; + } + return false; + } + + protected: + typedef std::map collection; + collection m_values; + }; + + + + //--------------------------------------------------------------------- + // NamedOptionValue + //--------------------------------------------------------------------- + class NamedOptionValue + { + public: + + NamedOptionValue (NamedOptionValue *parent, const ConstString &name) : + m_parent (parent), + m_name (name), + m_user_data (0) + { + } + + virtual + ~NamedOptionValue () + { + } + + NamedOptionValue * + GetParent () + { + return m_parent; + } + + const NamedOptionValue * + GetParent () const + { + return m_parent; + } + + const ConstString & + GetName () const + { + return m_name; + } + + uint32_t + GetUserData () const + { + return m_user_data; + } + + void + SetUserData (uint32_t user_data) + { + m_user_data = user_data; + } + + void + GetQualifiedName (Stream &strm); + + lldb::OptionValueSP + GetOptionValue () + { + return m_value_sp; + } + + OptionValue::Type + GetValueType (); + + bool + DumpValue (Stream &strm); + + bool + SetValueFromCString (const char *value); + + bool + ResetValueToDefault (); + + OptionValueBoolean * + GetBooleanValue (); + + OptionValueSInt64 * + GetSInt64Value (); + + OptionValueUInt64 * + GetUInt64Value (); + + OptionValueFileSpec * + GetFileSpecValue() ; + + OptionValueArray * + GetArrayValue() ; + + OptionValueDictionary * + GetDictionaryValue() ; + + protected: + NamedOptionValue *m_parent; // NULL if this is a root object + ConstString m_name; // Name for this setting + uint32_t m_user_data; // User data that can be used for anything. + lldb::OptionValueSP m_value_sp; // Abstract option value + }; + + +} // namespace lldb_private + +#endif // liblldb_NamedOptionValue_h_ Modified: lldb/trunk/include/lldb/lldb-forward-rtti.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-forward-rtti.h?rev=129843&r1=129842&r2=129843&view=diff ============================================================================== --- lldb/trunk/include/lldb/lldb-forward-rtti.h (original) +++ lldb/trunk/include/lldb/lldb-forward-rtti.h Tue Apr 19 20:33:38 2011 @@ -50,6 +50,7 @@ typedef SharedPtr::Type LogSP; typedef SharedPtr::Type LogChannelSP; typedef SharedPtr::Type ModuleSP; + typedef SharedPtr::Type OptionValueSP; typedef SharedPtr::Type PlatformSP; typedef SharedPtr::Type ProcessSP; typedef SharedPtr::Type RegisterContextSP; Modified: lldb/trunk/include/lldb/lldb-forward.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-forward.h?rev=129843&r1=129842&r2=129843&view=diff ============================================================================== --- lldb/trunk/include/lldb/lldb-forward.h (original) +++ lldb/trunk/include/lldb/lldb-forward.h Tue Apr 19 20:33:38 2011 @@ -99,6 +99,8 @@ class ObjectContainer; class ObjectFile; class Options; +class OptionValue; +class NamedOption; class PathMappingList; class Platform; class Process; Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=129843&r1=129842&r2=129843&view=diff ============================================================================== --- lldb/trunk/lldb.xcodeproj/project.pbxproj (original) +++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Apr 19 20:33:38 2011 @@ -370,6 +370,7 @@ 268F9D55123AA16600B91E9B /* SBSymbolContextList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 268F9D54123AA16600B91E9B /* SBSymbolContextList.cpp */; }; 2697A54D133A6305004E4240 /* PlatformDarwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2697A54B133A6305004E4240 /* PlatformDarwin.cpp */; }; 2697A54E133A6305004E4240 /* PlatformDarwin.h in Headers */ = {isa = PBXBuildFile; fileRef = 2697A54C133A6305004E4240 /* PlatformDarwin.h */; }; + 26A7A035135E6E4200FB369E /* NamedOptionValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26A7A034135E6E4200FB369E /* NamedOptionValue.cpp */; }; 26B1FA1413380E61002886E2 /* LLDBWrapPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */; }; 26B1FCB813381071002886E2 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C39010F3FA26009D5894 /* CoreFoundation.framework */; }; 26B1FCB913381071002886E2 /* DebugSymbols.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 265ABF6210F42EE900531910 /* DebugSymbols.framework */; }; @@ -426,7 +427,6 @@ 9A357673116E7B6400E8ED2F /* SBStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A357672116E7B6400E8ED2F /* SBStringList.cpp */; }; 9A3576A8116E9AB700E8ED2F /* SBHostOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A3576A7116E9AB700E8ED2F /* SBHostOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9A3576AA116E9AC700E8ED2F /* SBHostOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A3576A9116E9AC700E8ED2F /* SBHostOS.cpp */; }; - 9AA20A84133D278400E2E4A7 /* DisassemblerShark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AA20A82133D278400E2E4A7 /* DisassemblerShark.cpp */; }; 9AA69DA61188F52100D753A0 /* PseudoTerminal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2682F16A115EDA0D00CCFF99 /* PseudoTerminal.cpp */; }; 9AA69DAF118A023300D753A0 /* SBInputReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AA69DAE118A023300D753A0 /* SBInputReader.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9AA69DB1118A024600D753A0 /* SBInputReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AA69DB0118A024600D753A0 /* SBInputReader.cpp */; }; @@ -715,6 +715,8 @@ 26A3B4AC1181454800381BC2 /* ObjectContainerBSDArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectContainerBSDArchive.cpp; sourceTree = ""; }; 26A3B4AD1181454800381BC2 /* ObjectContainerBSDArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectContainerBSDArchive.h; sourceTree = ""; }; 26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LLDBWrapPython.cpp; path = source/LLDBWrapPython.cpp; sourceTree = ""; }; + 26A7A034135E6E4200FB369E /* NamedOptionValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NamedOptionValue.cpp; path = source/Interpreter/NamedOptionValue.cpp; sourceTree = ""; }; + 26A7A036135E6E5300FB369E /* NamedOptionValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = NamedOptionValue.h; path = include/lldb/Interpreter/NamedOptionValue.h; sourceTree = ""; }; 26B167A41123BF5500DC7B4F /* ThreadSafeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadSafeValue.h; path = include/lldb/Core/ThreadSafeValue.h; sourceTree = ""; }; 26B42C4C1187ABA50079C8C8 /* LLDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LLDB.h; path = include/lldb/API/LLDB.h; sourceTree = ""; }; 26B4E26E112F35F700AB3F64 /* TimeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TimeValue.h; path = include/lldb/Host/TimeValue.h; sourceTree = ""; }; @@ -1196,8 +1198,6 @@ 9A9831081125FC5800A56CB0 /* SBTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBTarget.h; path = include/lldb/API/SBTarget.h; sourceTree = ""; }; 9A9831091125FC5800A56CB0 /* SBThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBThread.cpp; path = source/API/SBThread.cpp; sourceTree = ""; }; 9A98310A1125FC5800A56CB0 /* SBThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBThread.h; path = include/lldb/API/SBThread.h; sourceTree = ""; }; - 9AA20A82133D278400E2E4A7 /* DisassemblerShark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DisassemblerShark.cpp; sourceTree = ""; }; - 9AA20A83133D278400E2E4A7 /* DisassemblerShark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisassemblerShark.h; sourceTree = ""; }; 9AA69DAE118A023300D753A0 /* SBInputReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBInputReader.h; path = include/lldb/API/SBInputReader.h; sourceTree = ""; }; 9AA69DB0118A024600D753A0 /* SBInputReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBInputReader.cpp; path = source/API/SBInputReader.cpp; sourceTree = ""; }; 9AA69DB5118A027A00D753A0 /* InputReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InputReader.cpp; path = source/Core/InputReader.cpp; sourceTree = ""; }; @@ -1366,7 +1366,6 @@ isa = PBXGroup; children = ( 260C897310F57C5600BB2B04 /* llvm */, - 9AA20A81133D278400E2E4A7 /* shark */, ); path = Disassembler; sourceTree = ""; @@ -2182,6 +2181,8 @@ 26DFBC59113B48F300DD817F /* CommandObjectRegexCommand.cpp */, 26BC7DE410F1B7F900F91463 /* CommandReturnObject.h */, 26BC7F0A10F1B8DD00F91463 /* CommandReturnObject.cpp */, + 26A7A036135E6E5300FB369E /* NamedOptionValue.h */, + 26A7A034135E6E4200FB369E /* NamedOptionValue.cpp */, 26BC7D6D10F1B77400F91463 /* Options.h */, 26BC7E8610F1B85900F91463 /* Options.cpp */, 26D5E160135BAEB0006EA0A7 /* OptionGroupArchitecture.h */, @@ -2509,15 +2510,6 @@ path = source/Host/common; sourceTree = ""; }; - 9AA20A81133D278400E2E4A7 /* shark */ = { - isa = PBXGroup; - children = ( - 9AA20A82133D278400E2E4A7 /* DisassemblerShark.cpp */, - 9AA20A83133D278400E2E4A7 /* DisassemblerShark.h */, - ); - path = shark; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -3160,7 +3152,6 @@ 264A97BF133918BC0017F0BE /* PlatformRemoteGDBServer.cpp in Sources */, 2697A54D133A6305004E4240 /* PlatformDarwin.cpp in Sources */, 26651A18133BF9E0005B64B7 /* Opcode.cpp in Sources */, - 9AA20A84133D278400E2E4A7 /* DisassemblerShark.cpp in Sources */, 266603CA1345B5A8004DA8B6 /* ConnectionSharedMemory.cpp in Sources */, 2671A0D013482601003A87BB /* ConnectionMachPort.cpp in Sources */, 4CABA9E0134A8BCD00539BDD /* ValueObjectMemory.cpp in Sources */, @@ -3168,6 +3159,7 @@ 26D5E15F135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp in Sources */, 26D5E163135BB054006EA0A7 /* OptionGroupPlatform.cpp in Sources */, 26BD407F135D2AE000237D80 /* FileLineResolver.cpp in Sources */, + 26A7A035135E6E4200FB369E /* NamedOptionValue.cpp in Sources */, 9A22A161135E30370024DDC3 /* EmulateInstructionARM.cpp in Sources */, 9A22A163135E30370024DDC3 /* EmulationStateARM.cpp in Sources */, ); Added: lldb/trunk/source/Interpreter/NamedOptionValue.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/NamedOptionValue.cpp?rev=129843&view=auto ============================================================================== --- lldb/trunk/source/Interpreter/NamedOptionValue.cpp (added) +++ lldb/trunk/source/Interpreter/NamedOptionValue.cpp Tue Apr 19 20:33:38 2011 @@ -0,0 +1,264 @@ +//===-- NamedOptionValue.cpp ------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "lldb/Interpreter/NamedOptionValue.h" + +// C Includes +// C++ Includes +// Other libraries and framework includes +// Project includes +#include "lldb/Core/Stream.h" +#include "lldb/Interpreter/Args.h" + +using namespace lldb; +using namespace lldb_private; + +//------------------------------------------------------------------------- +// NamedOptionValue +//------------------------------------------------------------------------- + +void +NamedOptionValue::GetQualifiedName (Stream &strm) +{ + if (m_parent) + { + m_parent->GetQualifiedName (strm); + strm.PutChar('.'); + } + strm << m_name; +} + +OptionValue::Type +NamedOptionValue::GetValueType () +{ + if (m_value_sp) + return m_value_sp->GetType(); + return OptionValue::eTypeInvalid; +} + +bool +NamedOptionValue::DumpValue (Stream &strm) +{ + if (m_value_sp) + { + m_value_sp->DumpValue (strm); + return true; + } + return false; +} + +bool +NamedOptionValue::SetValueFromCString (const char *value_cstr) +{ + if (m_value_sp) + return m_value_sp->SetValueFromCString (value_cstr); + return false; +} + +bool +NamedOptionValue::ResetValueToDefault () +{ + if (m_value_sp) + return m_value_sp->ResetValueToDefault (); + return false; +} + + +OptionValueBoolean * +NamedOptionValue::GetBooleanValue () +{ + if (GetValueType() == OptionValue::eTypeBoolean) + return static_cast(m_value_sp.get()); + return NULL; +} + +OptionValueSInt64 * +NamedOptionValue::GetSInt64Value () +{ + if (GetValueType() == OptionValue::eTypeSInt64) + return static_cast(m_value_sp.get()); + return NULL; +} + +OptionValueUInt64 * +NamedOptionValue::GetUInt64Value () +{ + if (GetValueType() == OptionValue::eTypeUInt64) + return static_cast(m_value_sp.get()); + return NULL; +} + + +OptionValueFileSpec * +NamedOptionValue::GetFileSpecValue () +{ + if (GetValueType() == OptionValue::eTypeFileSpec) + return static_cast(m_value_sp.get()); + return NULL; +} + +OptionValueArray * +NamedOptionValue::GetArrayValue () +{ + if (GetValueType() == OptionValue::eTypeArray) + return static_cast(m_value_sp.get()); + return NULL; +} + +OptionValueDictionary * +NamedOptionValue::GetDictionaryValue () +{ + if (GetValueType() == OptionValue::eTypeDictionary) + return static_cast(m_value_sp.get()); + return NULL; +} + +//------------------------------------------------------------------------- +// OptionValueBoolean +//------------------------------------------------------------------------- +void +OptionValueBoolean::DumpValue (Stream &strm) +{ + strm.PutCString (m_current_value ? "true" : "false"); +} + +bool +OptionValueBoolean::SetValueFromCString (const char *value_cstr) +{ + bool success = false; + bool value = Args::StringToBoolean(value_cstr, false, &success); + if (success) + { + m_current_value = value; + return true; + } + return false; +} + +//------------------------------------------------------------------------- +// OptionValueSInt64 +//------------------------------------------------------------------------- +void +OptionValueSInt64::DumpValue (Stream &strm) +{ + strm.Printf ("%lli", m_current_value); +} + +bool +OptionValueSInt64::SetValueFromCString (const char *value_cstr) +{ + bool success = false; + int64_t value = Args::StringToSInt64 (value_cstr, 0, 0, &success); + if (success) + { + m_current_value = value; + return true; + } + return false; +} + +//------------------------------------------------------------------------- +// OptionValueUInt64 +//------------------------------------------------------------------------- +void +OptionValueUInt64::DumpValue (Stream &strm) +{ + strm.Printf ("0x%llx", m_current_value); +} + +bool +OptionValueUInt64::SetValueFromCString (const char *value_cstr) +{ + bool success = false; + uint64_t value = Args::StringToUInt64 (value_cstr, 0, 0, &success); + if (success) + { + m_current_value = value; + return true; + } + return false; +} + +//------------------------------------------------------------------------- +// OptionValueFileSpec +//------------------------------------------------------------------------- +void +OptionValueFileSpec::DumpValue (Stream &strm) +{ + if (m_current_value) + { + if (m_current_value.GetDirectory()) + { + strm << '"' << m_current_value.GetDirectory(); + if (m_current_value.GetFilename()) + strm << '/' << m_current_value.GetFilename(); + strm << '"'; + } + else + { + strm << '"' << m_current_value.GetFilename() << '"'; + } + } +} + +bool +OptionValueFileSpec::SetValueFromCString (const char *value_cstr) +{ + if (value_cstr && value_cstr[0]) + m_current_value.SetFile(value_cstr, false); + else + m_current_value.Clear(); + return true; +} + + +//------------------------------------------------------------------------- +// OptionValueArray +//------------------------------------------------------------------------- +void +OptionValueArray::DumpValue (Stream &strm) +{ + const uint32_t size = m_values.size(); + for (uint32_t i = 0; iDumpValue (strm); + } +} + +bool +OptionValueArray::SetValueFromCString (const char *value_cstr) +{ + // We must be able to set this using the array specific functions + return false; +} + +//------------------------------------------------------------------------- +// OptionValueDictionary +//------------------------------------------------------------------------- +void +OptionValueDictionary::DumpValue (Stream &strm) +{ + collection::iterator pos, end = m_values.end(); + + for (pos = m_values.begin(); pos != end; ++pos) + { + strm.Printf("%s=", pos->first.GetCString()); + pos->second->DumpValue (strm); + } +} + +bool +OptionValueDictionary::SetValueFromCString (const char *value_cstr) +{ + // We must be able to set this using the array specific functions + return false; +} + + From gclayton at apple.com Wed Apr 20 11:37:46 2011 From: gclayton at apple.com (Greg Clayton) Date: Wed, 20 Apr 2011 16:37:46 -0000 Subject: [Lldb-commits] [lldb] r129855 - in /lldb/trunk: include/lldb/Interpreter/CommandInterpreter.h include/lldb/Interpreter/CommandObjectRegexCommand.h include/lldb/Interpreter/NamedOptionValue.h source/Commands/CommandObjectCommands.cpp source/Interpreter/CommandInterpreter.cpp source/Interpreter/NamedOptionValue.cpp Message-ID: <20110420163746.76B962A6C12C@llvm.org> Author: gclayton Date: Wed Apr 20 11:37:46 2011 New Revision: 129855 URL: http://llvm.org/viewvc/llvm-project?rev=129855&view=rev Log: Added the ability for users to create new regex commands. To do this currently, it must be done in multi-line mode: (lldb) commands regex --help "Help text for command" --syntax "syntax for command" Any example that would use "f" for "finish" when there are no arguments, and "f " to do a "frame select " would be: (lldb) commands regex f Enter multiple regular expressions in the form s/find/replace/ then terminate with an empty line: s/^$/finish/ s/([0-9]+)/frame select %1/ (lldb) f 11 frame select 12 ... (lldb) f finish ... Also added the string version of the OptionValue as OptionValueString. Modified: lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h lldb/trunk/include/lldb/Interpreter/CommandObjectRegexCommand.h lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h lldb/trunk/source/Commands/CommandObjectCommands.cpp lldb/trunk/source/Interpreter/CommandInterpreter.cpp lldb/trunk/source/Interpreter/NamedOptionValue.cpp Modified: lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h?rev=129855&r1=129854&r2=129855&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h (original) +++ lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h Wed Apr 20 11:37:46 2011 @@ -49,6 +49,11 @@ virtual ~CommandInterpreter (); + bool + AddCommand (const char *name, + const lldb::CommandObjectSP &cmd_sp, + bool can_replace); + lldb::CommandObjectSP GetCommandSPExact (const char *cmd, bool include_aliases); Modified: lldb/trunk/include/lldb/Interpreter/CommandObjectRegexCommand.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandObjectRegexCommand.h?rev=129855&r1=129854&r2=129855&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/CommandObjectRegexCommand.h (original) +++ lldb/trunk/include/lldb/Interpreter/CommandObjectRegexCommand.h Wed Apr 20 11:37:46 2011 @@ -16,8 +16,8 @@ // Other libraries and framework includes // Project includes -#include "lldb/Interpreter/CommandObject.h" #include "lldb/Core/RegularExpression.h" +#include "lldb/Interpreter/CommandObject.h" namespace lldb_private { @@ -53,6 +53,12 @@ bool AddRegexCommand (const char *re_cstr, const char *command_cstr); + bool + HasRegexEntries () const + { + return !m_entries.empty(); + } + protected: struct Entry { Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h?rev=129855&r1=129854&r2=129855&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h (original) +++ lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Wed Apr 20 11:37:46 2011 @@ -282,6 +282,89 @@ }; //--------------------------------------------------------------------- + // OptionValueString + //--------------------------------------------------------------------- + class OptionValueString : public OptionValue + { + OptionValueString (const char *current_value, + const char *default_value) : + m_current_value (), + m_default_value () + { + if (current_value && current_value[0]) + m_current_value.assign (current_value); + if (default_value && default_value[0]) + m_default_value.assign (default_value); + } + + virtual + ~OptionValueString() + { + } + + //--------------------------------------------------------------------- + // Virtual subclass pure virtual overrides + //--------------------------------------------------------------------- + + virtual OptionValue::Type + GetType () + { + return eTypeString; + } + + virtual void + DumpValue (Stream &strm); + + virtual bool + SetValueFromCString (const char *value); + + virtual bool + ResetValueToDefault () + { + m_current_value = m_default_value; + return true; + } + + //--------------------------------------------------------------------- + // Subclass specific functions + //--------------------------------------------------------------------- + + const char * + GetCurrentValue() const + { + return m_current_value.c_str(); + } + + const char * + GetDefaultValue() const + { + return m_default_value.c_str(); + } + + void + SetCurrentValue (const char *value) + { + if (value && value[0]) + m_current_value.assign (value); + else + m_current_value.clear(); + } + + void + SetDefaultValue (const char *value) + { + if (value && value[0]) + m_default_value.assign (value); + else + m_default_value.clear(); + } + + protected: + std::string m_current_value; + std::string m_default_value; + }; + + //--------------------------------------------------------------------- // OptionValueFileSpec //--------------------------------------------------------------------- class OptionValueFileSpec : public OptionValue @@ -626,6 +709,9 @@ OptionValueUInt64 * GetUInt64Value (); + OptionValueString * + GetStringValue (); + OptionValueFileSpec * GetFileSpecValue() ; Modified: lldb/trunk/source/Commands/CommandObjectCommands.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectCommands.cpp?rev=129855&r1=129854&r2=129855&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectCommands.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectCommands.cpp Wed Apr 20 11:37:46 2011 @@ -13,9 +13,11 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/Interpreter/Args.h" #include "lldb/Core/Debugger.h" +#include "lldb/Core/InputReader.h" +#include "lldb/Interpreter/Args.h" #include "lldb/Interpreter/CommandInterpreter.h" +#include "lldb/Interpreter/CommandObjectRegexCommand.h" #include "lldb/Interpreter/CommandReturnObject.h" #include "lldb/Interpreter/Options.h" @@ -92,10 +94,6 @@ bool m_stop_on_continue; }; - // Options table: Required for subclasses of Options. - - static OptionDefinition g_option_table[]; - CommandOptions m_options; virtual Options * @@ -640,6 +638,275 @@ } }; +#pragma mark CommandObjectCommandsAddRegex +//------------------------------------------------------------------------- +// CommandObjectCommandsAddRegex +//------------------------------------------------------------------------- + +class CommandObjectCommandsAddRegex : public CommandObject +{ +public: + CommandObjectCommandsAddRegex (CommandInterpreter &interpreter) : + CommandObject (interpreter, + "commands regex", + "Allow the user to create a regular expression command.", + NULL), + m_options (interpreter) + { + } + + ~CommandObjectCommandsAddRegex() + { + } + + + bool + Execute (Args& args, CommandReturnObject &result) + { + if (args.GetArgumentCount() == 1) + { + const char *name = args.GetArgumentAtIndex(0); + InputReaderSP reader_sp (new InputReader(m_interpreter.GetDebugger())); + m_regex_cmd_ap.reset (new CommandObjectRegexCommand (m_interpreter, + name, + m_options.GetHelp (), + m_options.GetSyntax (), + 10)); + if (reader_sp) + { + Error err (reader_sp->Initialize (CommandObjectCommandsAddRegex::InputReaderCallback, + this, // baton + eInputReaderGranularityLine, // token size, to pass to callback function + "DONE", // end token + "> ", // prompt + true)); // echo input + if (err.Success()) + { + m_interpreter.GetDebugger().PushInputReader (reader_sp); + result.SetStatus (eReturnStatusSuccessFinishNoResult); + } + else + { + result.AppendError (err.AsCString()); + result.SetStatus (eReturnStatusFailed); + } + } + } + else + { + result.AppendError ("invalid arguments.\n"); + result.SetStatus (eReturnStatusFailed); + } + return result.Succeeded(); + } + + bool + AppendRegexAndSubstitution (const char *regex, const char *subst) + { + if (m_regex_cmd_ap.get()) + { + m_regex_cmd_ap->AddRegexCommand (regex, subst); + return true; + } + return false; + } + + void + InputReaderIsDone() + { + if (m_regex_cmd_ap.get()) + { + if (m_regex_cmd_ap->HasRegexEntries()) + { + CommandObjectSP cmd_sp (m_regex_cmd_ap.release()); + m_interpreter.AddCommand(cmd_sp->GetCommandName(), cmd_sp, true); + } + } + } + + static size_t + InputReaderCallback (void *baton, + InputReader &reader, + lldb::InputReaderAction notification, + const char *bytes, + size_t bytes_len); +private: + std::auto_ptr m_regex_cmd_ap; + + class CommandOptions : public Options + { + public: + + CommandOptions (CommandInterpreter &interpreter) : + Options (interpreter) + { + } + + virtual + ~CommandOptions (){} + + virtual Error + SetOptionValue (uint32_t option_idx, const char *option_arg) + { + Error error; + char short_option = (char) m_getopt_table[option_idx].val; + + switch (short_option) + { + case 'h': + m_help.assign (option_arg); + break; + case 's': + m_syntax.assign (option_arg); + break; + + default: + error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option); + break; + } + + return error; + } + + void + OptionParsingStarting () + { + m_help.clear(); + m_syntax.clear(); + } + + const OptionDefinition* + GetDefinitions () + { + return g_option_table; + } + + // Options table: Required for subclasses of Options. + + static OptionDefinition g_option_table[]; + + const char * + GetHelp () + { + if (m_help.empty()) + return NULL; + return m_help.c_str(); + } + const char * + GetSyntax () + { + if (m_syntax.empty()) + return NULL; + return m_syntax.c_str(); + } + // Instance variables to hold the values for command options. + protected: + std::string m_help; + std::string m_syntax; + }; + + CommandOptions m_options; + + virtual Options * + GetOptions () + { + return &m_options; + } + +}; + +size_t +CommandObjectCommandsAddRegex::InputReaderCallback (void *baton, + InputReader &reader, + lldb::InputReaderAction notification, + const char *bytes, + size_t bytes_len) +{ + CommandObjectCommandsAddRegex *add_regex_cmd = (CommandObjectCommandsAddRegex *) baton; + + switch (notification) + { + case eInputReaderActivate: + reader.GetDebugger().GetOutputStream().Printf("%s\n", "Enter multiple regular expressions in the form s/find/replace/ then terminate with an empty line:"); + break; + case eInputReaderReactivate: + break; + + case eInputReaderDeactivate: + break; + + case eInputReaderGotToken: + if (bytes_len == 0) + reader.SetIsDone(true); + else if (bytes) + { + std::string regex_sed (bytes, bytes_len); + bool success = regex_sed.size() > 3 && regex_sed[0] == 's'; + if (success) + { + const size_t first_separator_char_pos = 1; + const char separator_char = regex_sed[first_separator_char_pos]; + const size_t third_separator_char_pos = regex_sed.rfind (separator_char); + + if (third_separator_char_pos != regex_sed.size() - 1) + success = false; // Didn't end with regex separator char + else + { + const size_t second_separator_char_pos = regex_sed.find (separator_char, first_separator_char_pos + 1); + if (second_separator_char_pos == std::string::npos) + success = false; // Didn't find second regex separator char + else + { + if (second_separator_char_pos <= 3) + success = false; // Empty regex is invalid ("s///") + else + { + std::string regex(regex_sed.substr(first_separator_char_pos + 1, second_separator_char_pos - first_separator_char_pos - 1)); + std::string subst(regex_sed.substr(second_separator_char_pos + 1, third_separator_char_pos - second_separator_char_pos - 1)); + if (regex.empty() || subst.empty()) + success= false; + else + { + add_regex_cmd->AppendRegexAndSubstitution(regex.c_str(), subst.c_str()); + } + } + } + } + } + if (!success) + { + reader.GetDebugger().GetOutputStream().PutCString("Regular expressions should be in the form s///.\n"); + } + } + break; + + case eInputReaderInterrupt: + reader.SetIsDone (true); + reader.GetDebugger().GetOutputStream().PutCString("Regular expression command creations was cancelled.\n"); + break; + + case eInputReaderEndOfFile: + reader.SetIsDone (true); + break; + + case eInputReaderDone: + add_regex_cmd->InputReaderIsDone(); + break; + } + + return bytes_len; +} + + +OptionDefinition +CommandObjectCommandsAddRegex::CommandOptions::g_option_table[] = +{ +{ LLDB_OPT_SET_1, false, "help", 'h', required_argument, NULL, 0, eArgTypeNone, "The help text to display for this command."}, +{ LLDB_OPT_SET_1, false, "syntax", 's', required_argument, NULL, 0, eArgTypeNone, "A syntax string showing the typical usage syntax."}, +{ 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } +}; + + #pragma mark CommandObjectMultiwordCommands //------------------------------------------------------------------------- @@ -655,6 +922,7 @@ LoadSubCommand ("source", CommandObjectSP (new CommandObjectCommandsSource (interpreter))); LoadSubCommand ("alias", CommandObjectSP (new CommandObjectCommandsAlias (interpreter))); LoadSubCommand ("unalias", CommandObjectSP (new CommandObjectCommandsUnalias (interpreter))); + LoadSubCommand ("regex", CommandObjectSP (new CommandObjectCommandsAddRegex (interpreter))); } CommandObjectMultiwordCommands::~CommandObjectMultiwordCommands () Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=129855&r1=129854&r2=129855&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original) +++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Wed Apr 20 11:37:46 2011 @@ -356,6 +356,24 @@ return ret_val; } +bool +CommandInterpreter::AddCommand (const char *name, const lldb::CommandObjectSP &cmd_sp, bool can_replace) +{ + if (name && name[0]) + { + std::string name_sstr(name); + if (!can_replace) + { + if (m_command_dict.find (name_sstr) != m_command_dict.end()) + return false; + } + m_command_dict[name_sstr] = cmd_sp; + return true; + } + return false; +} + + CommandObjectSP CommandInterpreter::GetCommandSPExact (const char *cmd_cstr, bool include_aliases) { Modified: lldb/trunk/source/Interpreter/NamedOptionValue.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/NamedOptionValue.cpp?rev=129855&r1=129854&r2=129855&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/NamedOptionValue.cpp (original) +++ lldb/trunk/source/Interpreter/NamedOptionValue.cpp Wed Apr 20 11:37:46 2011 @@ -94,6 +94,13 @@ return NULL; } +OptionValueString * +NamedOptionValue::GetStringValue () +{ + if (GetValueType() == OptionValue::eTypeString) + return static_cast(m_value_sp.get()); + return NULL; +} OptionValueFileSpec * NamedOptionValue::GetFileSpecValue () @@ -186,6 +193,24 @@ } //------------------------------------------------------------------------- +// OptionValueDictionary +//------------------------------------------------------------------------- +void +OptionValueString::DumpValue (Stream &strm) +{ + strm.Printf ("\"%s\"", m_current_value.c_str()); +} + +bool +OptionValueString::SetValueFromCString (const char *value_cstr) +{ + SetCurrentValue (value_cstr); + return true; +} + + + +//------------------------------------------------------------------------- // OptionValueFileSpec //------------------------------------------------------------------------- void From ctice at apple.com Wed Apr 20 12:14:12 2011 From: ctice at apple.com (Caroline Tice) Date: Wed, 20 Apr 2011 17:14:12 -0000 Subject: [Lldb-commits] [lldb] r129859 - /lldb/trunk/include/lldb/Core/UserSettingsController.h Message-ID: <20110420171412.451742A6C12E@llvm.org> Author: ctice Date: Wed Apr 20 12:14:12 2011 New Revision: 129859 URL: http://llvm.org/viewvc/llvm-project?rev=129859&view=rev Log: Fix typo (accidental second 'const' qualifier). Modified: lldb/trunk/include/lldb/Core/UserSettingsController.h Modified: lldb/trunk/include/lldb/Core/UserSettingsController.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/UserSettingsController.h?rev=129859&r1=129858&r2=129859&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/UserSettingsController.h (original) +++ lldb/trunk/include/lldb/Core/UserSettingsController.h Wed Apr 20 12:14:12 2011 @@ -136,7 +136,7 @@ static void FindAllSettingsDescriptions (CommandInterpreter &interpreter, const lldb::UserSettingsControllerSP& usc_sp, - const const char *current_prefix, + const char *current_prefix, Stream &result_stream, Error &err); From gclayton at apple.com Wed Apr 20 13:16:33 2011 From: gclayton at apple.com (Greg Clayton) Date: Wed, 20 Apr 2011 18:16:33 -0000 Subject: [Lldb-commits] [lldb] r129863 - /lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Message-ID: <20110420181633.9DE2D2A6C12C@llvm.org> Author: gclayton Date: Wed Apr 20 13:16:33 2011 New Revision: 129863 URL: http://llvm.org/viewvc/llvm-project?rev=129863&view=rev Log: Added the ability for arrays and dictionaries to contain only specific types of values. Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h?rev=129863&r1=129862&r2=129863&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h (original) +++ lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Wed Apr 20 13:16:33 2011 @@ -58,6 +58,16 @@ virtual bool ResetValueToDefault () = 0; + + //----------------------------------------------------------------- + // Subclasses should NOT override these functions as they use the + // above functions to implement functionality + //----------------------------------------------------------------- + uint32_t + GetTypeAsMask () + { + return 1u << GetType(); + } }; @@ -69,8 +79,8 @@ { OptionValueBoolean (bool current_value, bool default_value) : - m_current_value (current_value), - m_default_value (default_value) + m_current_value (current_value), + m_default_value (default_value) { } @@ -442,7 +452,8 @@ //--------------------------------------------------------------------- class OptionValueArray : public OptionValue { - OptionValueArray () : + OptionValueArray (uint32_t type_mask = UINT32_MAX) : + m_type_mask (type_mask), m_values () { } @@ -494,28 +505,47 @@ return value_sp; } - void + bool AppendValue (const lldb::OptionValueSP &value_sp) { - m_values.push_back(value_sp); + // Make sure the value_sp object is allowed to contain + // values of the type passed in... + if (value_sp && (m_type_mask & value_sp->GetTypeAsMask())) + { + m_values.push_back(value_sp); + return true; + } + return false; } - void + bool InsertValue (uint32_t idx, const lldb::OptionValueSP &value_sp) { - if (idx < m_values.size()) - m_values.insert(m_values.begin() + idx, value_sp); - else - m_values.push_back(value_sp); + // Make sure the value_sp object is allowed to contain + // values of the type passed in... + if (value_sp && (m_type_mask & value_sp->GetTypeAsMask())) + { + if (idx < m_values.size()) + m_values.insert(m_values.begin() + idx, value_sp); + else + m_values.push_back(value_sp); + return true; + } + return false; } bool ReplaceValue (uint32_t idx, const lldb::OptionValueSP &value_sp) { - if (idx < m_values.size()) + // Make sure the value_sp object is allowed to contain + // values of the type passed in... + if (value_sp && (m_type_mask & value_sp->GetTypeAsMask())) { - m_values[idx] = value_sp; - return true; + if (idx < m_values.size()) + { + m_values[idx] = value_sp; + return true; + } } return false; } @@ -533,6 +563,8 @@ protected: typedef std::vector collection; + + uint32_t m_type_mask; collection m_values; }; @@ -543,8 +575,9 @@ //--------------------------------------------------------------------- class OptionValueDictionary : public OptionValue { - OptionValueDictionary () : - m_values () + OptionValueDictionary (uint32_t type_mask = UINT32_MAX) : + m_type_mask (type_mask), + m_values () { } @@ -601,14 +634,20 @@ const lldb::OptionValueSP &value_sp, bool can_replace) { - if (!can_replace) + // Make sure the value_sp object is allowed to contain + // values of the type passed in... + if (value_sp && (m_type_mask & value_sp->GetTypeAsMask())) { - collection::const_iterator pos = m_values.find (key); - if (pos != m_values.end()) - return false; + if (!can_replace) + { + collection::const_iterator pos = m_values.find (key); + if (pos != m_values.end()) + return false; + } + m_values[key] = value_sp; + return true; } - m_values[key] = value_sp; - return true; + return false; } bool @@ -625,6 +664,7 @@ protected: typedef std::map collection; + uint32_t m_type_mask; collection m_values; }; @@ -683,11 +723,17 @@ GetQualifiedName (Stream &strm); lldb::OptionValueSP - GetOptionValue () + GetValue () { return m_value_sp; } + void + SetValue (const lldb::OptionValueSP &value_sp) + { + m_value_sp = value_sp; + } + OptionValue::Type GetValueType (); From gclayton at apple.com Wed Apr 20 13:52:45 2011 From: gclayton at apple.com (Greg Clayton) Date: Wed, 20 Apr 2011 18:52:45 -0000 Subject: [Lldb-commits] [lldb] r129867 - in /lldb/trunk: include/lldb/Core/SourceManager.h source/Commands/CommandObjectSource.cpp Message-ID: <20110420185245.D3A372A6C12C@llvm.org> Author: gclayton Date: Wed Apr 20 13:52:45 2011 New Revision: 129867 URL: http://llvm.org/viewvc/llvm-project?rev=129867&view=rev Log: Fixed an issue where breakpoint were being displayed when using the "source list" command when the file was implicit or found from a symbol. Modified: lldb/trunk/include/lldb/Core/SourceManager.h lldb/trunk/source/Commands/CommandObjectSource.cpp Modified: lldb/trunk/include/lldb/Core/SourceManager.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/SourceManager.h?rev=129867&r1=129866&r2=129867&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/SourceManager.h (original) +++ lldb/trunk/include/lldb/Core/SourceManager.h Wed Apr 20 13:52:45 2011 @@ -47,6 +47,12 @@ bool FileSpecMatches (const FileSpec &file_spec); + const FileSpec & + GetFileSpec () + { + return m_file_spec; + } + protected: bool @@ -73,6 +79,12 @@ FileSP GetFile (const FileSpec &file_spec); + FileSP + GetLastFile () + { + return m_last_file_sp; + } + size_t DisplaySourceLines (const FileSpec &file, uint32_t line, Modified: lldb/trunk/source/Commands/CommandObjectSource.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectSource.cpp?rev=129867&r1=129866&r2=129867&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectSource.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectSource.cpp Wed Apr 20 13:52:45 2011 @@ -417,13 +417,25 @@ char path_buf[PATH_MAX]; start_file.GetPath(path_buf, sizeof(path_buf)); + + if (m_options.show_bp_locs && exe_ctx.target) + { + const bool show_inlines = true; + m_breakpoint_locations.Reset (start_file, 0, show_inlines); + SearchFilter target_search_filter (exe_ctx.target->GetSP()); + target_search_filter.Search (m_breakpoint_locations); + } + else + m_breakpoint_locations.Clear(); + result.AppendMessageWithFormat("File: %s.\n", path_buf); m_interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers (start_file, line_no, 0, m_options.num_lines, "", - &result.GetOutputStream()); + &result.GetOutputStream(), + GetBreakpointLocations ()); result.SetStatus (eReturnStatusSuccessFinishResult); return true; @@ -445,6 +457,20 @@ } else { + if (m_options.show_bp_locs && exe_ctx.target) + { + SourceManager::FileSP last_file_sp (m_interpreter.GetDebugger().GetSourceManager().GetLastFile ()); + if (last_file_sp) + { + const bool show_inlines = true; + m_breakpoint_locations.Reset (last_file_sp->GetFileSpec(), 0, show_inlines); + SearchFilter target_search_filter (exe_ctx.target->GetSP()); + target_search_filter.Search (m_breakpoint_locations); + } + } + else + m_breakpoint_locations.Clear(); + if (m_interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbersUsingLastFile( m_options.start_line, // Line to display 0, // Lines before line to display From ctice at apple.com Wed Apr 20 13:58:35 2011 From: ctice at apple.com (Caroline Tice) Date: Wed, 20 Apr 2011 18:58:35 -0000 Subject: [Lldb-commits] [lldb] r129868 - /lldb/trunk/lldb.xcodeproj/project.pbxproj Message-ID: <20110420185835.388572A6C12C@llvm.org> Author: ctice Date: Wed Apr 20 13:58:35 2011 New Revision: 129868 URL: http://llvm.org/viewvc/llvm-project?rev=129868&view=rev Log: Remove ARMDissasembler.framework from project (it accidentally got included in a recent commit). Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=129868&r1=129867&r2=129868&view=diff ============================================================================== --- lldb/trunk/lldb.xcodeproj/project.pbxproj (original) +++ lldb/trunk/lldb.xcodeproj/project.pbxproj Wed Apr 20 13:58:35 2011 @@ -63,9 +63,6 @@ 26680337116005F1008E1FE4 /* SBBreakpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AF16A9C11402D5B007A7B3F /* SBBreakpoint.cpp */; }; 2668035C11601108008E1FE4 /* LLDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26680207115FD0ED008E1FE4 /* LLDB.framework */; }; 266E8C6A13528ABC000C2042 /* lldb-platform in Resources */ = {isa = PBXBuildFile; fileRef = 26DC6A101337FE6900FF7998 /* lldb-platform */; }; - 26700BD4133D1262009921FB /* ARMDisassembler.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26700BD2133D1256009921FB /* ARMDisassembler.framework */; }; - 26700BD5133D1266009921FB /* ARMDisassembler.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26700BD2133D1256009921FB /* ARMDisassembler.framework */; }; - 26700BD6133D1267009921FB /* ARMDisassembler.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26700BD2133D1256009921FB /* ARMDisassembler.framework */; }; 2671A0CE134825F6003A87BB /* ConnectionMachPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 2671A0CD134825F6003A87BB /* ConnectionMachPort.h */; }; 2671A0D013482601003A87BB /* ConnectionMachPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2671A0CF13482601003A87BB /* ConnectionMachPort.cpp */; }; 26744EF11338317700EF765A /* GDBRemoteCommunicationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26744EED1338317700EF765A /* GDBRemoteCommunicationClient.cpp */; }; @@ -674,7 +671,6 @@ 266A42D5128E3FFB0090CF7C /* ClangNamespaceDecl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClangNamespaceDecl.cpp; path = source/Symbol/ClangNamespaceDecl.cpp; sourceTree = ""; }; 266A42D7128E40040090CF7C /* ClangNamespaceDecl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClangNamespaceDecl.h; path = include/lldb/Symbol/ClangNamespaceDecl.h; sourceTree = ""; }; 266F5CBB12FC846200DFCE33 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Config.h; path = include/lldb/Host/Config.h; sourceTree = ""; }; - 26700BD2133D1256009921FB /* ARMDisassembler.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ARMDisassembler.framework; path = /System/Library/PrivateFrameworks/ARMDisassembler.framework; sourceTree = ""; }; 2671A0CD134825F6003A87BB /* ConnectionMachPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConnectionMachPort.h; path = include/lldb/Core/ConnectionMachPort.h; sourceTree = ""; }; 2671A0CF13482601003A87BB /* ConnectionMachPort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConnectionMachPort.cpp; path = source/Core/ConnectionMachPort.cpp; sourceTree = ""; }; 2672D8461189055500FF4019 /* CommandObjectFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectFrame.cpp; path = source/Commands/CommandObjectFrame.cpp; sourceTree = ""; }; @@ -1247,7 +1243,6 @@ 26680232115FD1A4008E1FE4 /* libpython.dylib in Frameworks */, 26680233115FD1A7008E1FE4 /* libobjc.dylib in Frameworks */, 4C74CB6312288704006A8171 /* Carbon.framework in Frameworks */, - 26700BD4133D1262009921FB /* ARMDisassembler.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1255,7 +1250,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 26700BD5133D1266009921FB /* ARMDisassembler.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1270,7 +1264,6 @@ 26B1FCBB13381071002886E2 /* libpython.dylib in Frameworks */, 26B1FCBC13381071002886E2 /* libobjc.dylib in Frameworks */, 26B1FCBD13381071002886E2 /* Carbon.framework in Frameworks */, - 26700BD6133D1267009921FB /* ARMDisassembler.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2380,7 +2373,6 @@ 26F5C32810F3DF7D009D5894 /* Libraries */ = { isa = PBXGroup; children = ( - 26700BD2133D1256009921FB /* ARMDisassembler.framework */, 26F5C39010F3FA26009D5894 /* CoreFoundation.framework */, 265ABF6210F42EE900531910 /* DebugSymbols.framework */, 260C876910F538E700BB2B04 /* Foundation.framework */, From johnny.chen at apple.com Wed Apr 20 15:36:00 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Wed, 20 Apr 2011 20:36:00 -0000 Subject: [Lldb-commits] [lldb] r129871 - /lldb/trunk/test/source-manager/TestSourceManager.py Message-ID: <20110420203600.0C3972A6C12C@llvm.org> Author: johnny Date: Wed Apr 20 15:35:59 2011 New Revision: 129871 URL: http://llvm.org/viewvc/llvm-project?rev=129871&view=rev Log: Add a test scenario for 'source list -b' which shows the line table locations from the debug information which indicates valid places to set source level breakpoints. Modified: lldb/trunk/test/source-manager/TestSourceManager.py Modified: lldb/trunk/test/source-manager/TestSourceManager.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/source-manager/TestSourceManager.py?rev=129871&r1=129870&r2=129871&view=diff ============================================================================== --- lldb/trunk/test/source-manager/TestSourceManager.py (original) +++ lldb/trunk/test/source-manager/TestSourceManager.py Wed Apr 20 15:35:59 2011 @@ -86,13 +86,28 @@ # The stop reason of the thread should be breakpoint. self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, substrs = ['stopped', - 'main.c', + 'main.c:%d' % self.line, 'stop reason = breakpoint']) # Display some source code. self.expect("list -f main.c -l %d" % self.line, SOURCE_DISPLAYED_CORRECTLY, substrs = ['Hello world']) + # The '-b' option shows the line table locations from the debug information + # that indicates valid places to set source level breakpoints. + + # The file to display is implicit in this case. + self.runCmd("list -l %d -c 3 -b" % self.line) + output = self.res.GetOutput().splitlines()[0] + + # If the breakpoint set command succeeded, we should expect a positive number + # of breakpoints for the current line, i.e., self.line. + import re + m = re.search('^\[(\d+)\].*// Set break point at this line.', output) + if not m: + self.fail("Fail to display source level breakpoints") + self.assertTrue(int(m.group(1)) > 0) + # Read the main.c file content. with open('main.c', 'r') as f: original_content = f.read() From johnny.chen at apple.com Wed Apr 20 16:51:31 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Wed, 20 Apr 2011 21:51:31 -0000 Subject: [Lldb-commits] [lldb] r129879 - in /lldb/trunk/test/command_regex: ./ TestCommandRegex.py Message-ID: <20110420215131.457472A6C12C@llvm.org> Author: johnny Date: Wed Apr 20 16:51:31 2011 New Revision: 129879 URL: http://llvm.org/viewvc/llvm-project?rev=129879&view=rev Log: Add a simple test scenario for 'command regex' invocation and subsequent use. Added: lldb/trunk/test/command_regex/ lldb/trunk/test/command_regex/TestCommandRegex.py Added: lldb/trunk/test/command_regex/TestCommandRegex.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/command_regex/TestCommandRegex.py?rev=129879&view=auto ============================================================================== --- lldb/trunk/test/command_regex/TestCommandRegex.py (added) +++ lldb/trunk/test/command_regex/TestCommandRegex.py Wed Apr 20 16:51:31 2011 @@ -0,0 +1,42 @@ +""" +Test lldb 'commands regex' command which allows the user to create a regular expression command. +""" + +import os +import unittest2 +import lldb +import pexpect +from lldbtest import * + +class CommandRegexTestCase(TestBase): + + mydir = "command_regex" + + def test_command_regex(self): + """Test a simple scenario of 'commands regexp' invocation and subsequent use.""" + prompt = "\(lldb\) " + regex_prompt = "Enter multiple regular expressions in the form s/find/replace/ then terminate with an empty line:\r\n" + regex_prompt1 = "\r\n" + + child = pexpect.spawn('%s' % self.lldbExec) + # Turn on logging for what the child sends back. + if traceAlways: + child.logfile_read = sys.stdout + + # Set the breakpoint, followed by the target stop-hook commands. + child.expect(prompt) + child.sendline('commands regex Help!') + child.expect(regex_prompt) + child.sendline('s/^$/help/') + child.expect(regex_prompt1) + child.sendline('') + # Help! + child.sendline('Help!') + # If we see the familiar 'help' output, the test is done. + child.expect('The following is a list of built-in, permanent debugger commands:') + +if __name__ == '__main__': + import atexit + lldb.SBDebugger.Initialize() + atexit.register(lambda: lldb.SBDebugger.Terminate()) + unittest2.main() From johnny.chen at apple.com Wed Apr 20 17:01:48 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Wed, 20 Apr 2011 22:01:48 -0000 Subject: [Lldb-commits] [lldb] r129880 - in /lldb/trunk/test: command_regex/TestCommandRegex.py stop-hook/TestStopHook.py Message-ID: <20110420220148.E6D052A6C12C@llvm.org> Author: johnny Date: Wed Apr 20 17:01:48 2011 New Revision: 129880 URL: http://llvm.org/viewvc/llvm-project?rev=129880&view=rev Log: Use self.TraceOn() API. Modified: lldb/trunk/test/command_regex/TestCommandRegex.py lldb/trunk/test/stop-hook/TestStopHook.py Modified: lldb/trunk/test/command_regex/TestCommandRegex.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/command_regex/TestCommandRegex.py?rev=129880&r1=129879&r2=129880&view=diff ============================================================================== --- lldb/trunk/test/command_regex/TestCommandRegex.py (original) +++ lldb/trunk/test/command_regex/TestCommandRegex.py Wed Apr 20 17:01:48 2011 @@ -20,7 +20,7 @@ child = pexpect.spawn('%s' % self.lldbExec) # Turn on logging for what the child sends back. - if traceAlways: + if self.TraceOn(): child.logfile_read = sys.stdout # Set the breakpoint, followed by the target stop-hook commands. Modified: lldb/trunk/test/stop-hook/TestStopHook.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/stop-hook/TestStopHook.py?rev=129880&r1=129879&r2=129880&view=diff ============================================================================== --- lldb/trunk/test/stop-hook/TestStopHook.py (original) +++ lldb/trunk/test/stop-hook/TestStopHook.py Wed Apr 20 17:01:48 2011 @@ -40,7 +40,7 @@ child = pexpect.spawn('%s %s' % (self.lldbExec, exe)) # Turn on logging for what the child sends back. - if traceAlways: + if self.TraceOn(): child.logfile_read = sys.stdout # Set the breakpoint, followed by the target stop-hook commands. From johnny.chen at apple.com Wed Apr 20 17:13:23 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Wed, 20 Apr 2011 22:13:23 -0000 Subject: [Lldb-commits] [lldb] r129881 - /lldb/trunk/test/command_regex/TestCommandRegex.py Message-ID: <20110420221323.D59C22A6C12C@llvm.org> Author: johnny Date: Wed Apr 20 17:13:23 2011 New Revision: 129881 URL: http://llvm.org/viewvc/llvm-project?rev=129881&view=rev Log: Fix wrong comment. Modified: lldb/trunk/test/command_regex/TestCommandRegex.py Modified: lldb/trunk/test/command_regex/TestCommandRegex.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/command_regex/TestCommandRegex.py?rev=129881&r1=129880&r2=129881&view=diff ============================================================================== --- lldb/trunk/test/command_regex/TestCommandRegex.py (original) +++ lldb/trunk/test/command_regex/TestCommandRegex.py Wed Apr 20 17:13:23 2011 @@ -23,7 +23,7 @@ if self.TraceOn(): child.logfile_read = sys.stdout - # Set the breakpoint, followed by the target stop-hook commands. + # Substitute 'Help!' with 'help' using the 'commands regex' mechanism. child.expect(prompt) child.sendline('commands regex Help!') child.expect(regex_prompt) From johnny.chen at apple.com Wed Apr 20 17:30:17 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Wed, 20 Apr 2011 22:30:17 -0000 Subject: [Lldb-commits] [lldb] r129885 - /lldb/trunk/test/class_types/TestClassTypesDisassembly.py Message-ID: <20110420223017.C97F22A6C12C@llvm.org> Author: johnny Date: Wed Apr 20 17:30:17 2011 New Revision: 129885 URL: http://llvm.org/viewvc/llvm-project?rev=129885&view=rev Log: Use self.TraceOn() API. Modified: lldb/trunk/test/class_types/TestClassTypesDisassembly.py Modified: lldb/trunk/test/class_types/TestClassTypesDisassembly.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/class_types/TestClassTypesDisassembly.py?rev=129885&r1=129884&r2=129885&view=diff ============================================================================== --- lldb/trunk/test/class_types/TestClassTypesDisassembly.py (original) +++ lldb/trunk/test/class_types/TestClassTypesDisassembly.py Wed Apr 20 17:30:17 2011 @@ -103,8 +103,12 @@ # Get all instructions for this function and print them out. insts = function.GetInstructions(target) from lldbutil import lldb_iter - for i in lldb_iter(insts, 'GetSize', 'GetInstructionAtIndex'): - print i + for inst in lldb_iter(insts, 'GetSize', 'GetInstructionAtIndex'): + # It could simply be 'print inst' to print out the disassembly. + # But we want to print to stdout only if self.TraceOn() is True. + disasm = str(inst) + if self.TraceOn(): + print disasm if __name__ == '__main__': From gclayton at apple.com Wed Apr 20 17:55:21 2011 From: gclayton at apple.com (Greg Clayton) Date: Wed, 20 Apr 2011 22:55:21 -0000 Subject: [Lldb-commits] [lldb] r129889 - /lldb/trunk/source/Commands/CommandObjectCommands.cpp Message-ID: <20110420225521.99DF12A6C12C@llvm.org> Author: gclayton Date: Wed Apr 20 17:55:21 2011 New Revision: 129889 URL: http://llvm.org/viewvc/llvm-project?rev=129889&view=rev Log: Renamed the "commands" command to "command" as this is the way we were using it everywhere internally. Modified the "command regex" command to be able to specify all regular expressions on the command line. For example: (lldb) command regex f s/^$/finish/ 's/([0-9]+)/frame select %1/' Also improved the error reporting when an invalid 's///' argument is given. Modified: lldb/trunk/source/Commands/CommandObjectCommands.cpp Modified: lldb/trunk/source/Commands/CommandObjectCommands.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectCommands.cpp?rev=129889&r1=129888&r2=129889&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectCommands.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectCommands.cpp Wed Apr 20 17:55:21 2011 @@ -12,6 +12,8 @@ // C Includes // C++ Includes // Other libraries and framework includes +#include "llvm/ADT/StringRef.h" + // Project includes #include "lldb/Core/Debugger.h" #include "lldb/Core/InputReader.h" @@ -105,7 +107,7 @@ public: CommandObjectCommandsSource(CommandInterpreter &interpreter) : CommandObject (interpreter, - "commands source", + "command source", "Read in debugger commands from the file and execute them.", NULL), m_options (interpreter) @@ -183,7 +185,7 @@ public: CommandObjectCommandsAlias (CommandInterpreter &interpreter) : CommandObject (interpreter, - "commands alias", + "command alias", "Allow users to define their own debugger command abbreviations.", NULL) { @@ -559,7 +561,7 @@ public: CommandObjectCommandsUnalias (CommandInterpreter &interpreter) : CommandObject (interpreter, - "commands unalias", + "command unalias", "Allow the user to remove/delete a user-defined command abbreviation.", NULL) { @@ -648,11 +650,34 @@ public: CommandObjectCommandsAddRegex (CommandInterpreter &interpreter) : CommandObject (interpreter, - "commands regex", + "command regex", "Allow the user to create a regular expression command.", - NULL), + "command regex [s/// ...]"), m_options (interpreter) { + SetHelpLong( +"This command allows the user to create powerful regular expression commands\n" +"with substitutions. The regular expressions and substitutions are specified\n" +"using the regular exression substitution format of:\n" +"\n" +" s///\n" +"\n" +" is a regular expression that can use parenthesis to capture regular\n" +"expression input and substitute the captured matches in the output using %1\n" +"for the first match, %2 for the second, and so on.\n" +"\n" +"The regular expressions can all be specified on the command line if more than\n" +"one argument is provided. If just the command name is provided on the command\n" +"line, then the regular expressions and substitutions can be entered on separate\n" +" lines, followed by an empty line to terminate the command definition.\n" +"\n" +"EXAMPLES\n" +"\n" +"The following example with define a regular expression command named 'f' that\n" +"will call 'finish' if there are no arguments, or 'frame select ' if\n" +"a number follows 'f':\n" +"(lldb) command regex f s/^$/finish/ 's/([0-9]+)/frame select %1/'\n" + ); } ~CommandObjectCommandsAddRegex() @@ -663,56 +688,166 @@ bool Execute (Args& args, CommandReturnObject &result) { - if (args.GetArgumentCount() == 1) + const size_t argc = args.GetArgumentCount(); + if (argc == 0) { + result.AppendError ("usage: 'commands regex [s/// s/// ...]'\n"); + result.SetStatus (eReturnStatusFailed); + } + else + { + Error error; const char *name = args.GetArgumentAtIndex(0); - InputReaderSP reader_sp (new InputReader(m_interpreter.GetDebugger())); m_regex_cmd_ap.reset (new CommandObjectRegexCommand (m_interpreter, name, m_options.GetHelp (), m_options.GetSyntax (), 10)); - if (reader_sp) + + if (argc == 1) { - Error err (reader_sp->Initialize (CommandObjectCommandsAddRegex::InputReaderCallback, + InputReaderSP reader_sp (new InputReader(m_interpreter.GetDebugger())); + if (reader_sp) + { + error =reader_sp->Initialize (CommandObjectCommandsAddRegex::InputReaderCallback, this, // baton eInputReaderGranularityLine, // token size, to pass to callback function - "DONE", // end token + NULL, // end token "> ", // prompt - true)); // echo input - if (err.Success()) + true); // echo input + if (error.Success()) + { + m_interpreter.GetDebugger().PushInputReader (reader_sp); + result.SetStatus (eReturnStatusSuccessFinishNoResult); + return true; + } + } + } + else + { + for (size_t arg_idx = 1; arg_idx < argc; ++arg_idx) { - m_interpreter.GetDebugger().PushInputReader (reader_sp); - result.SetStatus (eReturnStatusSuccessFinishNoResult); + llvm::StringRef arg_strref (args.GetArgumentAtIndex(arg_idx)); + error = AppendRegexSubstitution (arg_strref); + if (error.Fail()) + break; } - else + + if (error.Success()) { - result.AppendError (err.AsCString()); - result.SetStatus (eReturnStatusFailed); + AddRegexCommandToInterpreter(); } } + if (error.Fail()) + { + result.AppendError (error.AsCString()); + result.SetStatus (eReturnStatusFailed); + } } - else - { - result.AppendError ("invalid arguments.\n"); - result.SetStatus (eReturnStatusFailed); - } + return result.Succeeded(); } - bool - AppendRegexAndSubstitution (const char *regex, const char *subst) + Error + AppendRegexSubstitution (const llvm::StringRef ®ex_sed) { - if (m_regex_cmd_ap.get()) + Error error; + + if (m_regex_cmd_ap.get() == NULL) + { + error.SetErrorStringWithFormat("invalid regular expression command object for: '%.*s'", + (int)regex_sed.size(), + regex_sed.data()); + return error; + } + + size_t regex_sed_size = regex_sed.size(); + + if (regex_sed_size <= 1) + { + error.SetErrorStringWithFormat("regular expression substitution string is too short: '%.*s'", + (int)regex_sed.size(), + regex_sed.data()); + return error; + } + + if (regex_sed[0] != 's') + { + error.SetErrorStringWithFormat("regular expression substitution string doesn't start with 's': '%.*s'", + (int)regex_sed.size(), + regex_sed.data()); + return error; + } + const size_t first_separator_char_pos = 1; + // use the char that follows 's' as the regex separator character + // so we can have "s///" or "s|||" + const char separator_char = regex_sed[first_separator_char_pos]; + const size_t second_separator_char_pos = regex_sed.find (separator_char, first_separator_char_pos + 1); + + if (second_separator_char_pos == std::string::npos) { - m_regex_cmd_ap->AddRegexCommand (regex, subst); - return true; + error.SetErrorStringWithFormat("missing second '%c' separator char after '%.*s'", + separator_char, + (int)(regex_sed.size() - first_separator_char_pos - 1), + regex_sed.data() + (first_separator_char_pos + 1)); + return error; } - return false; + + const size_t third_separator_char_pos = regex_sed.find (separator_char, second_separator_char_pos + 1); + + if (third_separator_char_pos == std::string::npos) + { + error.SetErrorStringWithFormat("missing third '%c' separator char after '%.*s'", + separator_char, + (int)(regex_sed.size() - second_separator_char_pos - 1), + regex_sed.data() + (second_separator_char_pos + 1)); + return error; + } + + if (third_separator_char_pos != regex_sed_size - 1) + { + // Make sure that everything that follows the last regex + // separator char + if (regex_sed.find_first_not_of("\t\n\v\f\r ", third_separator_char_pos + 1) != std::string::npos) + { + error.SetErrorStringWithFormat("extra data found after the '%.*s' regular expression substitution string: '%.*s'", + (int)third_separator_char_pos + 1, + regex_sed.data(), + (int)(regex_sed.size() - third_separator_char_pos - 1), + regex_sed.data() + (third_separator_char_pos + 1)); + return error; + } + + } + else if (first_separator_char_pos + 1 == second_separator_char_pos) + { + error.SetErrorStringWithFormat(" can't be empty in 's%c%c%c' string: '%.*s'", + separator_char, + separator_char, + separator_char, + (int)regex_sed.size(), + regex_sed.data()); + return error; + } + else if (second_separator_char_pos + 1 == third_separator_char_pos) + { + error.SetErrorStringWithFormat(" can't be empty in 's%c%c%c' string: '%.*s'", + separator_char, + separator_char, + separator_char, + (int)regex_sed.size(), + regex_sed.data()); + return error; + } + std::string regex(regex_sed.substr(first_separator_char_pos + 1, second_separator_char_pos - first_separator_char_pos - 1)); + std::string subst(regex_sed.substr(second_separator_char_pos + 1, third_separator_char_pos - second_separator_char_pos - 1)); + m_regex_cmd_ap->AddRegexCommand (regex.c_str(), + subst.c_str()); + return error; } void - InputReaderIsDone() + AddRegexCommandToInterpreter() { if (m_regex_cmd_ap.get()) { @@ -724,6 +859,12 @@ } } + void + InputReaderDidCancel() + { + m_regex_cmd_ap.reset(); + } + static size_t InputReaderCallback (void *baton, InputReader &reader, @@ -827,7 +968,7 @@ switch (notification) { case eInputReaderActivate: - reader.GetDebugger().GetOutputStream().Printf("%s\n", "Enter multiple regular expressions in the form s/find/replace/ then terminate with an empty line:"); + reader.GetDebugger().GetOutputStream().Printf("%s\n", "Enter regular expressions in the form 's///' and terminate with an empty line:"); break; case eInputReaderReactivate: break; @@ -836,46 +977,19 @@ break; case eInputReaderGotToken: + while (bytes_len > 0 && (bytes[bytes_len-1] == '\r' || bytes[bytes_len-1] == '\n')) + --bytes_len; if (bytes_len == 0) reader.SetIsDone(true); else if (bytes) { - std::string regex_sed (bytes, bytes_len); - bool success = regex_sed.size() > 3 && regex_sed[0] == 's'; - if (success) - { - const size_t first_separator_char_pos = 1; - const char separator_char = regex_sed[first_separator_char_pos]; - const size_t third_separator_char_pos = regex_sed.rfind (separator_char); - - if (third_separator_char_pos != regex_sed.size() - 1) - success = false; // Didn't end with regex separator char - else - { - const size_t second_separator_char_pos = regex_sed.find (separator_char, first_separator_char_pos + 1); - if (second_separator_char_pos == std::string::npos) - success = false; // Didn't find second regex separator char - else - { - if (second_separator_char_pos <= 3) - success = false; // Empty regex is invalid ("s///") - else - { - std::string regex(regex_sed.substr(first_separator_char_pos + 1, second_separator_char_pos - first_separator_char_pos - 1)); - std::string subst(regex_sed.substr(second_separator_char_pos + 1, third_separator_char_pos - second_separator_char_pos - 1)); - if (regex.empty() || subst.empty()) - success= false; - else - { - add_regex_cmd->AppendRegexAndSubstitution(regex.c_str(), subst.c_str()); - } - } - } - } - } - if (!success) + llvm::StringRef bytes_strref (bytes, bytes_len); + Error error (add_regex_cmd->AppendRegexSubstitution (bytes_strref)); + if (error.Fail()) { - reader.GetDebugger().GetOutputStream().PutCString("Regular expressions should be in the form s///.\n"); + reader.GetDebugger().GetOutputStream().Printf("error: %s\n", error.AsCString()); + add_regex_cmd->InputReaderDidCancel (); + reader.SetIsDone (true); } } break; @@ -883,6 +997,7 @@ case eInputReaderInterrupt: reader.SetIsDone (true); reader.GetDebugger().GetOutputStream().PutCString("Regular expression command creations was cancelled.\n"); + add_regex_cmd->InputReaderDidCancel (); break; case eInputReaderEndOfFile: @@ -890,7 +1005,7 @@ break; case eInputReaderDone: - add_regex_cmd->InputReaderIsDone(); + add_regex_cmd->AddRegexCommandToInterpreter(); break; } @@ -901,9 +1016,9 @@ OptionDefinition CommandObjectCommandsAddRegex::CommandOptions::g_option_table[] = { -{ LLDB_OPT_SET_1, false, "help", 'h', required_argument, NULL, 0, eArgTypeNone, "The help text to display for this command."}, +{ LLDB_OPT_SET_1, false, "help" , 'h', required_argument, NULL, 0, eArgTypeNone, "The help text to display for this command."}, { LLDB_OPT_SET_1, false, "syntax", 's', required_argument, NULL, 0, eArgTypeNone, "A syntax string showing the typical usage syntax."}, -{ 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } +{ 0 , false, NULL , 0 , 0 , NULL, 0, eArgTypeNone, NULL } }; @@ -915,9 +1030,9 @@ CommandObjectMultiwordCommands::CommandObjectMultiwordCommands (CommandInterpreter &interpreter) : CommandObjectMultiword (interpreter, - "commands", + "command", "A set of commands for managing or customizing the debugger commands.", - "commands []") + "command []") { LoadSubCommand ("source", CommandObjectSP (new CommandObjectCommandsSource (interpreter))); LoadSubCommand ("alias", CommandObjectSP (new CommandObjectCommandsAlias (interpreter))); From johnny.chen at apple.com Wed Apr 20 17:59:01 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Wed, 20 Apr 2011 22:59:01 -0000 Subject: [Lldb-commits] [lldb] r129890 - /lldb/trunk/test/alias_tests/TestAliases.py Message-ID: <20110420225901.B39112A6C12C@llvm.org> Author: johnny Date: Wed Apr 20 17:59:01 2011 New Revision: 129890 URL: http://llvm.org/viewvc/llvm-project?rev=129890&view=rev Log: Use self.TraceOn() API. Modified: lldb/trunk/test/alias_tests/TestAliases.py Modified: lldb/trunk/test/alias_tests/TestAliases.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/alias_tests/TestAliases.py?rev=129890&r1=129889&r2=129890&view=diff ============================================================================== --- lldb/trunk/test/alias_tests/TestAliases.py (original) +++ lldb/trunk/test/alias_tests/TestAliases.py Wed Apr 20 17:59:01 2011 @@ -29,6 +29,16 @@ self.runCmd (r'''command alias hello expr (int) printf ("\n\nHello, anybody!\n\n")''') self.runCmd ("command alias python script") + + # We don't want to display the stdout if not in TraceOn() mode. + if not self.TraceOn(): + old_stdout = sys.stdout + session = StringIO.StringIO() + sys.stdout = session + def restore_stdout(): + sys.stdout = old_stdout + self.addTearDownHook(restore_stdout) + self.runCmd (r'''python print "\n\n\nWhoopee!\n\n\n"''') # self.expect (r'''python print "\n\n\nWhoopee!\n\n\n"''', # substrs = [ "Whoopee!" ]) From johnny.chen at apple.com Wed Apr 20 19:05:59 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Thu, 21 Apr 2011 00:05:59 -0000 Subject: [Lldb-commits] [lldb] r129895 - /lldb/trunk/test/command_regex/TestCommandRegex.py Message-ID: <20110421000559.368252A6C12C@llvm.org> Author: johnny Date: Wed Apr 20 19:05:59 2011 New Revision: 129895 URL: http://llvm.org/viewvc/llvm-project?rev=129895&view=rev Log: Replace 'commands' with 'command', and update to the latest prompt. Modified: lldb/trunk/test/command_regex/TestCommandRegex.py Modified: lldb/trunk/test/command_regex/TestCommandRegex.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/command_regex/TestCommandRegex.py?rev=129895&r1=129894&r2=129895&view=diff ============================================================================== --- lldb/trunk/test/command_regex/TestCommandRegex.py (original) +++ lldb/trunk/test/command_regex/TestCommandRegex.py Wed Apr 20 19:05:59 2011 @@ -13,9 +13,9 @@ mydir = "command_regex" def test_command_regex(self): - """Test a simple scenario of 'commands regexp' invocation and subsequent use.""" + """Test a simple scenario of 'command regexp' invocation and subsequent use.""" prompt = "\(lldb\) " - regex_prompt = "Enter multiple regular expressions in the form s/find/replace/ then terminate with an empty line:\r\n" + regex_prompt = "Enter regular expressions in the form 's///' and terminate with an empty line:\r\n" regex_prompt1 = "\r\n" child = pexpect.spawn('%s' % self.lldbExec) @@ -25,7 +25,7 @@ # Substitute 'Help!' with 'help' using the 'commands regex' mechanism. child.expect(prompt) - child.sendline('commands regex Help!') + child.sendline("command regex 'Help!'") child.expect(regex_prompt) child.sendline('s/^$/help/') child.expect(regex_prompt1) From johnny.chen at apple.com Wed Apr 20 19:39:18 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Thu, 21 Apr 2011 00:39:18 -0000 Subject: [Lldb-commits] [lldb] r129897 - in /lldb/trunk: source/Interpreter/CommandInterpreter.cpp test/abbreviation_tests/TestAbbreviations.py test/alias_tests/TestAliases.py Message-ID: <20110421003918.A979F2A6C12C@llvm.org> Author: johnny Date: Wed Apr 20 19:39:18 2011 New Revision: 129897 URL: http://llvm.org/viewvc/llvm-project?rev=129897&view=rev Log: Fixed some more 'commands' to 'command' change. Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp lldb/trunk/test/abbreviation_tests/TestAbbreviations.py lldb/trunk/test/alias_tests/TestAliases.py Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=129897&r1=129896&r2=129897&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original) +++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Wed Apr 20 19:39:18 2011 @@ -163,7 +163,7 @@ m_command_dict["apropos"] = CommandObjectSP (new CommandObjectApropos (*this)); m_command_dict["breakpoint"]= CommandObjectSP (new CommandObjectMultiwordBreakpoint (*this)); //m_command_dict["call"] = CommandObjectSP (new CommandObjectCall (*this)); - m_command_dict["commands"] = CommandObjectSP (new CommandObjectMultiwordCommands (*this)); + m_command_dict["command"] = CommandObjectSP (new CommandObjectMultiwordCommands (*this)); m_command_dict["disassemble"] = CommandObjectSP (new CommandObjectDisassemble (*this)); m_command_dict["expression"]= CommandObjectSP (new CommandObjectExpression (*this)); // m_command_dict["file"] = CommandObjectSP (new CommandObjectFile (*this)); @@ -562,7 +562,7 @@ if (m_alias_dict.size() > 0) { result.AppendMessage("The following is a list of your current command abbreviations " - "(see 'help commands alias' for more info):"); + "(see 'help command alias' for more info):"); result.AppendMessage(""); max_len = FindLongestCommandWord (m_alias_dict); Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/abbreviation_tests/TestAbbreviations.py?rev=129897&r1=129896&r2=129897&view=diff ============================================================================== --- lldb/trunk/test/abbreviation_tests/TestAbbreviations.py (original) +++ lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Wed Apr 20 19:39:18 2011 @@ -17,7 +17,7 @@ substrs = ['breakpoint command add', 'breakpoint command list', 'breakpoint list', - 'commands alias', + 'command alias', 'expression', 'script']) Modified: lldb/trunk/test/alias_tests/TestAliases.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/alias_tests/TestAliases.py?rev=129897&r1=129896&r2=129897&view=diff ============================================================================== --- lldb/trunk/test/alias_tests/TestAliases.py (original) +++ lldb/trunk/test/alias_tests/TestAliases.py Wed Apr 20 19:39:18 2011 @@ -53,8 +53,8 @@ # substrs = [ "hello" ]) - self.runCmd ("commands alias alias commands alias") - self.runCmd ("commands alias unalias commands unalias") + self.runCmd ("command alias alias command alias") + self.runCmd ("command alias unalias command unalias") self.runCmd ("alias myrun process launch -t%1 --") self.runCmd ("alias bp breakpoint") From gclayton at apple.com Wed Apr 20 20:09:42 2011 From: gclayton at apple.com (Greg Clayton) Date: Thu, 21 Apr 2011 01:09:42 -0000 Subject: [Lldb-commits] [lldb] r129898 - in /lldb/trunk/www: blog.html sidebar.incl Message-ID: <20110421010942.D7F3D2A6C12C@llvm.org> Author: gclayton Date: Wed Apr 20 20:09:42 2011 New Revision: 129898 URL: http://llvm.org/viewvc/llvm-project?rev=129898&view=rev Log: Added a blog page with a description and tutorial on using the new "command regex" command. Added: lldb/trunk/www/blog.html (with props) Modified: lldb/trunk/www/sidebar.incl Added: lldb/trunk/www/blog.html URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/www/blog.html?rev=129898&view=auto ============================================================================== --- lldb/trunk/www/blog.html (added) +++ lldb/trunk/www/blog.html Wed Apr 20 20:09:42 2011 @@ -0,0 +1,128 @@ + + + + + +LLDB FAQ + + + +
+ The LLDB Debugger +
+ +
+
+ + +
+
+

April 20, 2011  
Regular Expression Commands

+
+

Greetings LLDB users. I want to start writing regular blog posts + for the new and cool features and things you can do in LLDB. Today I + will start with one that was just added: regular expression commands. + What is a regular expression command? It is a command that you can + define by giving it a command name, where the command will have its raw arguments be + matched against one or more regular expressions. The first regular + expression to match your command's raw arguments wins and gets to + use substitutions to place argument snippets into a new command that + will get executed.

+ +

Lets supposed we want to use the "f" as a command to + select a frame by frame index. The command to select a frame by the + frame index is the "frame select <num>" command + which you might not always want to type out (even with out command + completion). + We can make this a bit easier this using a regular expression command: +

+ (lldb) command regex f 's/([0-9]+)/frame select %1/' +

+ +

"command regex f" tells the interpreter to create a new + regex command named "f", and when a command is entered + on the command line that starts with "f", it will match + the remaining command text against the regular expression + "([0-9]+)", and it if matches, it will substitute any + parenthesized subexpressions as needed. Here we enclosed the number + regular expression "[0-9]+" in parentheses which will + save the results in the first match and allow the matching string + to be substitued into the result "frame select %1". + So now we can use our new command and it will show us what command + resulted from our regular expression substitution: +

+

+ (lldb) f 12
+ frame select 12 +
+

+

Leading spaces will always be stripped, but there may be trailing spaces + since we are processing the remaining raw command string that follows + the initial f command name, plus any leading spaces. The regular expression + is also just looking for any sequence of one or more digits. Our + current regular expression will actually match "f 11 22 33": +

+ (lldb) f 11 22 33
+ frame select 11 +
+

+ Since this isn't desired, we should make the regular expression more complete by checking for + the start of the line (^) and the end of the line ($) + and also allow for zero or more spaces ([[:space:]]*) + to come after the number. Our newer and safer regular expression command line looks like: +

+ (lldb) command regex f 's/^([0-9]+)[[:space:]]*$/frame select %1/' +

+

Now we can type in a command as "f 12 " (note the trailing + spaces), and still get correct substitutions, while our previous + example of "f 11 22 33" will no longer match: +

+ (lldb) f 11 22 33
+ error: Command contents '11 22 33' failed to match any regular expression in the 'f' regex command. +
+

Lets take this a bit further by also using the f command + to emulate GDB's finish command when it is typed without + any arguments. We will also modify this command to watch for a single + "+" or "-" followed by a digit to signify a relative frame change + using the frame select command with the --relative option: +

+

+ (lldb) frame select --relative <offset> +

+ Multiple regular expressions can be entered in on the command line + or using the multi-line mode when typing in a live LLDB debug session. + Below the text in bold is user entered: +

+ + (lldb) commands regex f
+ Enter regular expressions in the form 's/<regex>/<subst>/' and terminate with an empty line:
+ s/^([0-9]+)[[:space:]]*$/frame select %1/
+ s/^([+-][0-9]+)[[:space:]]*$/frame select --relative=%1/
+ s/^[[:space:]]*$/finish/

+
+ (lldb) f
+ finish
+ ...
+ (lldb) f -1
+ frame select --relative=-1
+ ...
+ (lldb) f +1
+ frame select --relative=+1
+ ...
+ (lldb) f 12
+ frame select 12
+
+

+

I hope you can see the possilbities in how you can customize your + command line experience in LLDB using these commands. You can add + any regular expression commands to your ~/.lldbinit file to + always have your regular expression commands defined in your debug + sessions. + +

+ +
+
+
+ + \ No newline at end of file Propchange: lldb/trunk/www/blog.html ------------------------------------------------------------------------------ svn:executable = * Modified: lldb/trunk/www/sidebar.incl URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/www/sidebar.incl?rev=129898&r1=129897&r2=129898&view=diff ============================================================================== --- lldb/trunk/www/sidebar.incl (original) +++ lldb/trunk/www/sidebar.incl Wed Apr 20 20:09:42 2011 @@ -4,6 +4,7 @@

Goals and Status

  • About
  • +
  • Blog
  • Goals
  • Features
  • Status
  • From gclayton at apple.com Thu Apr 21 12:46:10 2011 From: gclayton at apple.com (Greg Clayton) Date: Thu, 21 Apr 2011 17:46:10 -0000 Subject: [Lldb-commits] [lldb] r129920 - in /lldb/trunk: include/lldb/Interpreter/NamedOptionValue.h source/Interpreter/NamedOptionValue.cpp Message-ID: <20110421174611.0E6972A6C12C@llvm.org> Author: gclayton Date: Thu Apr 21 12:46:10 2011 New Revision: 129920 URL: http://llvm.org/viewvc/llvm-project?rev=129920&view=rev Log: Made the constructors public for all OptionValue classes so we can instantiate them, and also moved the code that can get the specific subclass for a OptionValue into the OptionValue class. Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h lldb/trunk/source/Interpreter/NamedOptionValue.cpp Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h?rev=129920&r1=129919&r2=129920&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h (original) +++ lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Thu Apr 21 12:46:10 2011 @@ -22,6 +22,13 @@ namespace lldb_private { + class OptionValueBoolean; + class OptionValueSInt64; + class OptionValueUInt64; + class OptionValueString; + class OptionValueFileSpec; + class OptionValueArray; + class OptionValueDictionary; //--------------------------------------------------------------------- // OptionValue @@ -68,6 +75,27 @@ { return 1u << GetType(); } + + OptionValueBoolean * + GetAsBooleanValue (); + + OptionValueSInt64 * + GetAsSInt64Value (); + + OptionValueUInt64 * + GetAsUInt64Value (); + + OptionValueString * + GetAsStringValue (); + + OptionValueFileSpec * + GetAsFileSpecValue() ; + + OptionValueArray * + GetAsArrayValue() ; + + OptionValueDictionary * + GetAsDictionaryValue() ; }; @@ -77,6 +105,7 @@ //--------------------------------------------------------------------- class OptionValueBoolean : public OptionValue { + public: OptionValueBoolean (bool current_value, bool default_value) : m_current_value (current_value), @@ -150,6 +179,7 @@ //--------------------------------------------------------------------- class OptionValueSInt64 : public OptionValue { + public: OptionValueSInt64 (int64_t current_value, int64_t default_value) : m_current_value (current_value), @@ -223,6 +253,7 @@ //--------------------------------------------------------------------- class OptionValueUInt64 : public OptionValue { + public: OptionValueUInt64 (uint64_t current_value, uint64_t default_value) : m_current_value (current_value), @@ -296,8 +327,15 @@ //--------------------------------------------------------------------- class OptionValueString : public OptionValue { + public: + OptionValueString () : + m_current_value (), + m_default_value () + { + } + OptionValueString (const char *current_value, - const char *default_value) : + const char *default_value = NULL) : m_current_value (), m_default_value () { @@ -379,6 +417,19 @@ //--------------------------------------------------------------------- class OptionValueFileSpec : public OptionValue { + public: + OptionValueFileSpec () : + m_current_value (), + m_default_value () + { + } + + OptionValueFileSpec (const FileSpec ¤t_value) : + m_current_value (current_value), + m_default_value () + { + } + OptionValueFileSpec (const FileSpec ¤t_value, const FileSpec &default_value) : m_current_value (current_value), @@ -452,6 +503,7 @@ //--------------------------------------------------------------------- class OptionValueArray : public OptionValue { + public: OptionValueArray (uint32_t type_mask = UINT32_MAX) : m_type_mask (type_mask), m_values () @@ -575,6 +627,7 @@ //--------------------------------------------------------------------- class OptionValueDictionary : public OptionValue { + public: OptionValueDictionary (uint32_t type_mask = UINT32_MAX) : m_type_mask (type_mask), m_values () @@ -620,47 +673,27 @@ } lldb::OptionValueSP - GetValueForKey (const ConstString &key) const - { - lldb::OptionValueSP value_sp; - collection::const_iterator pos = m_values.find (key); - if (pos != m_values.end()) - value_sp = pos->second; - return value_sp; - } + GetValueForKey (const ConstString &key) const; + + //--------------------------------------------------------------------- + // String value getters and setters + //--------------------------------------------------------------------- + const char * + GetStringValueForKey (const ConstString &key); + + bool + SetStringValueForKey (const ConstString &key, + const char *value, + bool can_replace = true); + bool SetValueForKey (const ConstString &key, const lldb::OptionValueSP &value_sp, - bool can_replace) - { - // Make sure the value_sp object is allowed to contain - // values of the type passed in... - if (value_sp && (m_type_mask & value_sp->GetTypeAsMask())) - { - if (!can_replace) - { - collection::const_iterator pos = m_values.find (key); - if (pos != m_values.end()) - return false; - } - m_values[key] = value_sp; - return true; - } - return false; - } + bool can_replace = true); bool - DeleteValueForKey (const ConstString &key) - { - collection::iterator pos = m_values.find (key); - if (pos != m_values.end()) - { - m_values.erase(pos); - return true; - } - return false; - } + DeleteValueForKey (const ConstString &key); protected: typedef std::map collection; @@ -746,27 +779,6 @@ bool ResetValueToDefault (); - OptionValueBoolean * - GetBooleanValue (); - - OptionValueSInt64 * - GetSInt64Value (); - - OptionValueUInt64 * - GetUInt64Value (); - - OptionValueString * - GetStringValue (); - - OptionValueFileSpec * - GetFileSpecValue() ; - - OptionValueArray * - GetArrayValue() ; - - OptionValueDictionary * - GetDictionaryValue() ; - protected: NamedOptionValue *m_parent; // NULL if this is a root object ConstString m_name; // Name for this setting Modified: lldb/trunk/source/Interpreter/NamedOptionValue.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/NamedOptionValue.cpp?rev=129920&r1=129919&r2=129920&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/NamedOptionValue.cpp (original) +++ lldb/trunk/source/Interpreter/NamedOptionValue.cpp Thu Apr 21 12:46:10 2011 @@ -19,6 +19,67 @@ using namespace lldb; using namespace lldb_private; + +//------------------------------------------------------------------------- +// OptionValue +//------------------------------------------------------------------------- +OptionValueBoolean * +OptionValue::GetAsBooleanValue () +{ + if (GetType () == OptionValue::eTypeBoolean) + return static_cast(this); + return NULL; +} + +OptionValueSInt64 * +OptionValue::GetAsSInt64Value () +{ + if (GetType () == OptionValue::eTypeSInt64) + return static_cast(this); + return NULL; +} + +OptionValueUInt64 * +OptionValue::GetAsUInt64Value () +{ + if (GetType () == OptionValue::eTypeUInt64) + return static_cast(this); + return NULL; +} + +OptionValueString * +OptionValue::GetAsStringValue () +{ + if (GetType () == OptionValue::eTypeString) + return static_cast(this); + return NULL; +} + +OptionValueFileSpec * +OptionValue::GetAsFileSpecValue () +{ + if (GetType () == OptionValue::eTypeFileSpec) + return static_cast(this); + return NULL; +} + +OptionValueArray * +OptionValue::GetAsArrayValue () +{ + if (GetType () == OptionValue::eTypeArray) + return static_cast(this); + return NULL; +} + +OptionValueDictionary * +OptionValue::GetAsDictionaryValue () +{ + if (GetType () == OptionValue::eTypeDictionary) + return static_cast(this); + return NULL; +} + + //------------------------------------------------------------------------- // NamedOptionValue //------------------------------------------------------------------------- @@ -70,62 +131,6 @@ } -OptionValueBoolean * -NamedOptionValue::GetBooleanValue () -{ - if (GetValueType() == OptionValue::eTypeBoolean) - return static_cast(m_value_sp.get()); - return NULL; -} - -OptionValueSInt64 * -NamedOptionValue::GetSInt64Value () -{ - if (GetValueType() == OptionValue::eTypeSInt64) - return static_cast(m_value_sp.get()); - return NULL; -} - -OptionValueUInt64 * -NamedOptionValue::GetUInt64Value () -{ - if (GetValueType() == OptionValue::eTypeUInt64) - return static_cast(m_value_sp.get()); - return NULL; -} - -OptionValueString * -NamedOptionValue::GetStringValue () -{ - if (GetValueType() == OptionValue::eTypeString) - return static_cast(m_value_sp.get()); - return NULL; -} - -OptionValueFileSpec * -NamedOptionValue::GetFileSpecValue () -{ - if (GetValueType() == OptionValue::eTypeFileSpec) - return static_cast(m_value_sp.get()); - return NULL; -} - -OptionValueArray * -NamedOptionValue::GetArrayValue () -{ - if (GetValueType() == OptionValue::eTypeArray) - return static_cast(m_value_sp.get()); - return NULL; -} - -OptionValueDictionary * -NamedOptionValue::GetDictionaryValue () -{ - if (GetValueType() == OptionValue::eTypeDictionary) - return static_cast(m_value_sp.get()); - return NULL; -} - //------------------------------------------------------------------------- // OptionValueBoolean //------------------------------------------------------------------------- @@ -286,4 +291,81 @@ return false; } +lldb::OptionValueSP +OptionValueDictionary::GetValueForKey (const ConstString &key) const +{ + lldb::OptionValueSP value_sp; + collection::const_iterator pos = m_values.find (key); + if (pos != m_values.end()) + value_sp = pos->second; + return value_sp; +} + +const char * +OptionValueDictionary::GetStringValueForKey (const ConstString &key) +{ + collection::const_iterator pos = m_values.find (key); + if (pos != m_values.end()) + { + if (pos->second->GetType() == OptionValue::eTypeString) + return static_cast(pos->second.get())->GetCurrentValue(); + } + return NULL; +} + + +bool +OptionValueDictionary::SetStringValueForKey (const ConstString &key, + const char *value, + bool can_replace) +{ + collection::const_iterator pos = m_values.find (key); + if (pos != m_values.end()) + { + if (!can_replace) + return false; + if (pos->second->GetType() == OptionValue::eTypeString) + { + pos->second->SetValueFromCString(value); + return true; + } + } + m_values[key] = OptionValueSP (new OptionValueString (value)); + return true; + +} + +bool +OptionValueDictionary::SetValueForKey (const ConstString &key, + const lldb::OptionValueSP &value_sp, + bool can_replace) +{ + // Make sure the value_sp object is allowed to contain + // values of the type passed in... + if (value_sp && (m_type_mask & value_sp->GetTypeAsMask())) + { + if (!can_replace) + { + collection::const_iterator pos = m_values.find (key); + if (pos != m_values.end()) + return false; + } + m_values[key] = value_sp; + return true; + } + return false; +} + +bool +OptionValueDictionary::DeleteValueForKey (const ConstString &key) +{ + collection::iterator pos = m_values.find (key); + if (pos != m_values.end()) + { + m_values.erase(pos); + return true; + } + return false; +} + From gclayton at apple.com Thu Apr 21 14:21:29 2011 From: gclayton at apple.com (Greg Clayton) Date: Thu, 21 Apr 2011 19:21:29 -0000 Subject: [Lldb-commits] [lldb] r129926 - in /lldb/trunk: include/lldb/Interpreter/NamedOptionValue.h source/Interpreter/NamedOptionValue.cpp Message-ID: <20110421192129.ADBB62A6C12C@llvm.org> Author: gclayton Date: Thu Apr 21 14:21:29 2011 New Revision: 129926 URL: http://llvm.org/viewvc/llvm-project?rev=129926&view=rev Log: More iteration on the new option value stuff. We now define an OptionValueCollection class that can be subclassed to provide access to internal settings that are stored as ObjectValue subclasses. Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h lldb/trunk/source/Interpreter/NamedOptionValue.cpp Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h?rev=129926&r1=129925&r2=129926&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h (original) +++ lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Thu Apr 21 14:21:29 2011 @@ -702,91 +702,145 @@ }; - + //--------------------------------------------------------------------- - // NamedOptionValue + // OptionValueCollection + // + // The option value collection is a class that must be subclassed in + // order to provide a collection of named OptionValue objects. The + // collection is immutable (use OptionValueDictionary for mutable key + // value pair collection). This allows classes to have some member + // variables that are OptionValue subclasses, and still provide access + // to setting and modifying these values from textual commands: + // + // + // class Car : public OptionValueCollection + // { + // public: + // + // Car () : OptionValueCollection (NULL, "car"), + // m_is_running_name ("running"), + // m_license_number_name ("license"), + // m_is_running (false, false), + // m_license_number () + // { + // } + // + // + // bool + // GetIsRunning () const + // { + // return m_is_running.GetCurrentValue(); + // } + // + // const char * + // GetLicense () const + // { + // return m_license_number.GetCurrentValue(); + // } + // + // virtual uint32_t + // GetNumValues() const + // { + // return 2; + // } + // + // virtual ConstString + // GetKeyAtIndex (uint32_t idx) const + // { + // switch (idx) + // { + // case 0: return m_is_running_name; + // case 1: return m_license_number_name; + // } + // return ConstString(); + // } + // + // virtual OptionValue* + // GetValueForKey (const ConstString &key) + // { + // if (key == m_is_running_name) + // return &m_is_running; + // else if (key == m_license_number_name) + // return &m_license_number; + // return NULL; + // } + // + // protected: + // ConstString m_is_running_name; + // ConstString m_license_number_name; + // OptionValueBoolean m_is_running; + // OptionValueString m_license_number; + // + // }; + // + // As we can see above, this allows the Car class to have direct access + // to its member variables settings m_is_running and m_license_number, + // yet it allows them to also be available by name to our command + // interpreter. //--------------------------------------------------------------------- - class NamedOptionValue + class OptionValueCollection { public: - - NamedOptionValue (NamedOptionValue *parent, const ConstString &name) : + OptionValueCollection (OptionValueCollection *parent, const ConstString &name) : m_parent (parent), - m_name (name), - m_user_data (0) + m_name (name) { } - virtual - ~NamedOptionValue () + OptionValueCollection (OptionValueCollection *parent, const char *name) : + m_parent (parent), + m_name (name) + { + } + + virtual + ~OptionValueCollection() { } - NamedOptionValue * + + OptionValueCollection * GetParent () { return m_parent; } - - const NamedOptionValue * + + const OptionValueCollection * GetParent () const { return m_parent; } - + const ConstString & GetName () const { return m_name; } - - uint32_t - GetUserData () const - { - return m_user_data; - } - - void - SetUserData (uint32_t user_data) - { - m_user_data = user_data; - } void GetQualifiedName (Stream &strm); - lldb::OptionValueSP - GetValue () - { - return m_value_sp; - } - - void - SetValue (const lldb::OptionValueSP &value_sp) - { - m_value_sp = value_sp; - } + //--------------------------------------------------------------------- + // Subclass specific functions + //--------------------------------------------------------------------- - OptionValue::Type - GetValueType (); - - bool - DumpValue (Stream &strm); - - bool - SetValueFromCString (const char *value); - - bool - ResetValueToDefault (); + virtual uint32_t + GetNumValues() const = 0; + virtual ConstString + GetKeyAtIndex (uint32_t idx) const = 0; + + virtual OptionValue* + GetValueForKey (const ConstString &key) = 0; + protected: - NamedOptionValue *m_parent; // NULL if this is a root object - ConstString m_name; // Name for this setting - uint32_t m_user_data; // User data that can be used for anything. - lldb::OptionValueSP m_value_sp; // Abstract option value + OptionValueCollection *m_parent; // NULL if this is a root object + ConstString m_name; // Name for this collection setting (if any) }; - + + } // namespace lldb_private #endif // liblldb_NamedOptionValue_h_ Modified: lldb/trunk/source/Interpreter/NamedOptionValue.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/NamedOptionValue.cpp?rev=129926&r1=129925&r2=129926&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/NamedOptionValue.cpp (original) +++ lldb/trunk/source/Interpreter/NamedOptionValue.cpp Thu Apr 21 14:21:29 2011 @@ -81,11 +81,11 @@ //------------------------------------------------------------------------- -// NamedOptionValue +// OptionValueCollection //------------------------------------------------------------------------- void -NamedOptionValue::GetQualifiedName (Stream &strm) +OptionValueCollection::GetQualifiedName (Stream &strm) { if (m_parent) { @@ -95,41 +95,6 @@ strm << m_name; } -OptionValue::Type -NamedOptionValue::GetValueType () -{ - if (m_value_sp) - return m_value_sp->GetType(); - return OptionValue::eTypeInvalid; -} - -bool -NamedOptionValue::DumpValue (Stream &strm) -{ - if (m_value_sp) - { - m_value_sp->DumpValue (strm); - return true; - } - return false; -} - -bool -NamedOptionValue::SetValueFromCString (const char *value_cstr) -{ - if (m_value_sp) - return m_value_sp->SetValueFromCString (value_cstr); - return false; -} - -bool -NamedOptionValue::ResetValueToDefault () -{ - if (m_value_sp) - return m_value_sp->ResetValueToDefault (); - return false; -} - //------------------------------------------------------------------------- // OptionValueBoolean From johnny.chen at apple.com Thu Apr 21 15:27:45 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Thu, 21 Apr 2011 20:27:45 -0000 Subject: [Lldb-commits] [lldb] r129935 - in /lldb/trunk: source/API/SBInstruction.cpp source/Core/Disassembler.cpp test/arm_emulation/TestEmulations.py Message-ID: <20110421202745.E18762A6C12C@llvm.org> Author: johnny Date: Thu Apr 21 15:27:45 2011 New Revision: 129935 URL: http://llvm.org/viewvc/llvm-project?rev=129935&view=rev Log: Use self.TraceOn() API to decide whether to print debug output. Modified: lldb/trunk/source/API/SBInstruction.cpp lldb/trunk/source/Core/Disassembler.cpp lldb/trunk/test/arm_emulation/TestEmulations.py Modified: lldb/trunk/source/API/SBInstruction.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBInstruction.cpp?rev=129935&r1=129934&r2=129935&view=diff ============================================================================== --- lldb/trunk/source/API/SBInstruction.cpp (original) +++ lldb/trunk/source/API/SBInstruction.cpp Thu Apr 21 15:27:45 2011 @@ -155,8 +155,5 @@ if (!m_opaque_sp.get()) m_opaque_sp.reset (new PseudoInstruction()); - bool success = m_opaque_sp->TestEmulation (output_stream.get(), test_file); - if (output_stream.GetSize() > 0) - fprintf (stdout, "%s", output_stream.GetData()); - return success; -} \ No newline at end of file + return m_opaque_sp->TestEmulation (output_stream.get(), test_file); +} Modified: lldb/trunk/source/Core/Disassembler.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Disassembler.cpp?rev=129935&r1=129934&r2=129935&view=diff ============================================================================== --- lldb/trunk/source/Core/Disassembler.cpp (original) +++ lldb/trunk/source/Core/Disassembler.cpp Thu Apr 21 15:27:45 2011 @@ -510,14 +510,14 @@ if (!file_name) { - out_stream->Printf ("Instruction::TestEmulation: Missing file_name.\n"); + out_stream->Printf ("Instruction::TestEmulation: Missing file_name."); return false; } FILE *test_file = fopen (file_name, "r"); if (!test_file) { - out_stream->Printf ("Instruction::TestEmulation: Attempt to open test file failed.\n"); + out_stream->Printf ("Instruction::TestEmulation: Attempt to open test file failed."); return false; } @@ -525,7 +525,7 @@ char buffer[256]; if (!fgets (buffer,255, test_file)) // Read/skip first line of file, which should be a comment line (description). { - out_stream->Printf ("Instruction::TestEmulation: Read comment line failed.\n"); + out_stream->Printf ("Instruction::TestEmulation: Read comment line failed."); fclose (test_file); return false; } @@ -533,7 +533,7 @@ if (fscanf (test_file, "%s", buffer) != 1) // Read the arch or arch-triple from the file { - out_stream->Printf ("Instruction::TestEmulation: Read arch failed.\n"); + out_stream->Printf ("Instruction::TestEmulation: Read arch failed."); fclose (test_file); return false; } @@ -549,9 +549,9 @@ fclose (test_file); if (success) - out_stream->Printf ("Emulation test succeeded.\n"); + out_stream->Printf ("Emulation test succeeded."); else - out_stream->Printf ("Emulation test failed.\n"); + out_stream->Printf ("Emulation test failed."); return success; } Modified: lldb/trunk/test/arm_emulation/TestEmulations.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/TestEmulations.py?rev=129935&r1=129934&r2=129935&view=diff ============================================================================== --- lldb/trunk/test/arm_emulation/TestEmulations.py (original) +++ lldb/trunk/test/arm_emulation/TestEmulations.py Thu Apr 21 15:27:45 2011 @@ -22,7 +22,6 @@ for f in thumb_files: test_file = os.path.join (test_dir, f) - print '\nRunning test ' + f self.run_a_single_test (test_file) @@ -37,7 +36,6 @@ for f in arm_files: test_file = os.path.join (test_dir, f) - print '\nRunning test ' + f self.run_a_single_test (test_file) def run_a_single_test (self, filename): @@ -45,11 +43,11 @@ stream = lldb.SBStream (); success = insn.TestEmulation (stream, filename); output = stream.GetData(); - if not success: + if self.TraceOn(): + print '\nRunning test ' + os.path.basename(filename) print output - self.assertTrue ('Emulation test succeeded.' in output) - self.assertTrue (success == True) + self.assertTrue (success, 'Emulation test succeeded.') if __name__ == '__main__': import atexit From johnny.chen at apple.com Thu Apr 21 15:48:33 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Thu, 21 Apr 2011 20:48:33 -0000 Subject: [Lldb-commits] [lldb] r129936 - in /lldb/trunk/test: abbreviation_tests/TestAbbreviations.py class_types/TestClassTypesDisassembly.py dotest.py Message-ID: <20110421204833.1E39B2A6C12C@llvm.org> Author: johnny Date: Thu Apr 21 15:48:32 2011 New Revision: 129936 URL: http://llvm.org/viewvc/llvm-project?rev=129936&view=rev Log: Use self.TraceOn() API. Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py lldb/trunk/test/class_types/TestClassTypesDisassembly.py lldb/trunk/test/dotest.py Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/abbreviation_tests/TestAbbreviations.py?rev=129936&r1=129935&r2=129936&view=diff ============================================================================== --- lldb/trunk/test/abbreviation_tests/TestAbbreviations.py (original) +++ lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Thu Apr 21 15:48:32 2011 @@ -57,6 +57,15 @@ self.expect("set sh prompt", startstr = 'prompt (string) = "(lldb) "') + # We don't want to display the stdout if not in TraceOn() mode. + if not self.TraceOn(): + old_stdout = sys.stdout + session = StringIO.StringIO() + sys.stdout = session + def restore_stdout(): + sys.stdout = old_stdout + self.addTearDownHook(restore_stdout) + self.runCmd (r'''sc print "\n\n\tHello!\n"''') Modified: lldb/trunk/test/class_types/TestClassTypesDisassembly.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/class_types/TestClassTypesDisassembly.py?rev=129936&r1=129935&r2=129936&view=diff ============================================================================== --- lldb/trunk/test/class_types/TestClassTypesDisassembly.py (original) +++ lldb/trunk/test/class_types/TestClassTypesDisassembly.py Thu Apr 21 15:48:32 2011 @@ -97,8 +97,9 @@ frame = thread.GetFrameAtIndex(i) function = frame.GetFunction() # Print the function header. - print - print function + if self.traceOn(): + print + print function if function.IsValid(): # Get all instructions for this function and print them out. insts = function.GetInstructions(target) Modified: lldb/trunk/test/dotest.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=129936&r1=129935&r2=129936&view=diff ============================================================================== --- lldb/trunk/test/dotest.py (original) +++ lldb/trunk/test/dotest.py Thu Apr 21 15:48:32 2011 @@ -181,8 +181,8 @@ -s : specify the name of the dir created to store the session files of tests with errored or failed status; if not specified, the test driver uses the timestamp as the session dir name --t : trace lldb command execution and result --v : do verbose mode of unittest framework +-t : turn on tracing of lldb command and other detailed test executions +-v : do verbose mode of unittest framework (print out each test case invocation) -w : insert some wait time (currently 0.5 sec) between consecutive test cases -# : Repeat the test suite for a specified number of times From johnny.chen at apple.com Thu Apr 21 15:55:57 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Thu, 21 Apr 2011 20:55:57 -0000 Subject: [Lldb-commits] [lldb] r129937 - /lldb/trunk/test/logging/TestLogging.py Message-ID: <20110421205557.F049D2A6C12C@llvm.org> Author: johnny Date: Thu Apr 21 15:55:57 2011 New Revision: 129937 URL: http://llvm.org/viewvc/llvm-project?rev=129937&view=rev Log: Hopefully fix the last fallout of 'commands' to 'command' change. Modified: lldb/trunk/test/logging/TestLogging.py Modified: lldb/trunk/test/logging/TestLogging.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/logging/TestLogging.py?rev=129937&r1=129936&r2=129937&view=diff ============================================================================== --- lldb/trunk/test/logging/TestLogging.py (original) +++ lldb/trunk/test/logging/TestLogging.py Thu Apr 21 15:55:57 2011 @@ -34,16 +34,16 @@ self.runCmd ("log enable lldb commands -f " + log_file) - self.runCmd ("commands alias bp breakpoint") + self.runCmd ("command alias bp breakpoint") self.runCmd ("bp set -n main") self.runCmd ("bp l") expected_log_lines = [ - "com.apple.main-thread Processing command: commands alias bp breakpoint\n", - "com.apple.main-thread HandleCommand, cmd_obj : 'commands alias'\n", - "com.apple.main-thread HandleCommand, revised_command_line: 'commands alias bp breakpoint'\n", + "com.apple.main-thread Processing command: command alias bp breakpoint\n", + "com.apple.main-thread HandleCommand, cmd_obj : 'command alias'\n", + "com.apple.main-thread HandleCommand, revised_command_line: 'command alias bp breakpoint'\n", "com.apple.main-thread HandleCommand, wants_raw_input:'True'\n", "com.apple.main-thread HandleCommand, command line after removing command name(s): 'bp breakpoint'\n", "\n", From gclayton at apple.com Thu Apr 21 16:41:14 2011 From: gclayton at apple.com (Greg Clayton) Date: Thu, 21 Apr 2011 21:41:14 -0000 Subject: [Lldb-commits] [lldb] r129942 - /lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp Message-ID: <20110421214114.12D4D2A6C12C@llvm.org> Author: gclayton Date: Thu Apr 21 16:41:13 2011 New Revision: 129942 URL: http://llvm.org/viewvc/llvm-project?rev=129942&view=rev Log: Fixed a case where if a function, inlined function, or global with a mangled name had a DW_AT_name that was the same string as the DW_AT_MIPS_linkage_name, then it would get added twice to the DWARF index. Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp?rev=129942&r1=129941&r2=129942&view=diff ============================================================================== --- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp (original) +++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp Thu Apr 21 16:41:13 2011 @@ -624,7 +624,7 @@ DWARFDebugInfoEntry::Attributes attributes; const char *name = NULL; - Mangled mangled; + const char *mangled_cstr = NULL; bool is_variable = false; bool is_declaration = false; bool is_artificial = false; @@ -664,7 +664,7 @@ case DW_AT_MIPS_linkage_name: if (attributes.ExtractFormValueAtIndex(m_dwarf2Data, i, form_value)) - mangled.GetMangledName().SetCString(form_value.AsCString(debug_str)); + mangled_cstr = form_value.AsCString(debug_str); break; case DW_AT_low_pc: @@ -825,7 +825,7 @@ } else { - if (mangled && specification_die_offset != DW_INVALID_OFFSET) + if (mangled_cstr && specification_die_offset != DW_INVALID_OFFSET) { const DWARFDebugInfoEntry *specification_die = m_dwarf2Data->DebugInfo()->GetDIEPtr (specification_die_offset, NULL); if (specification_die) @@ -849,10 +849,20 @@ else func_basenames.Insert (ConstString(name), die_info); } - if (mangled.GetMangledName()) - func_fullnames.Insert (mangled.GetMangledName(), die_info); - if (mangled.GetDemangledName()) - func_fullnames.Insert (mangled.GetDemangledName(), die_info); + if (mangled_cstr) + { + // Make sure our mangled name isn't the same string table entry + // as our name. If it starts with '_', then it is ok, else compare + // the string to make sure it isn't the same and we don't end up + // with duplicate entries + if (name != mangled_cstr && ((mangled_cstr[0] == '_') || (::strcmp(name, mangled_cstr) != 0))) + { + Mangled mangled (mangled_cstr, true); + func_fullnames.Insert (mangled.GetMangledName(), die_info); + if (mangled.GetDemangledName()) + func_fullnames.Insert (mangled.GetDemangledName(), die_info); + } + } } break; @@ -861,10 +871,20 @@ { if (name) func_basenames.Insert (ConstString(name), die_info); - if (mangled.GetMangledName()) - func_fullnames.Insert (mangled.GetMangledName(), die_info); - if (mangled.GetDemangledName()) - func_fullnames.Insert (mangled.GetDemangledName(), die_info); + if (mangled_cstr) + { + // Make sure our mangled name isn't the same string table entry + // as our name. If it starts with '_', then it is ok, else compare + // the string to make sure it isn't the same and we don't end up + // with duplicate entries + if (name != mangled_cstr && ((mangled_cstr[0] == '_') || (::strcmp(name, mangled_cstr) != 0))) + { + Mangled mangled (mangled_cstr, true); + func_fullnames.Insert (mangled.GetMangledName(), die_info); + if (mangled.GetDemangledName()) + func_fullnames.Insert (mangled.GetDemangledName(), die_info); + } + } } break; @@ -896,10 +916,18 @@ // names if they have any since a variable can have a basename // "i", a mangled named "_ZN12_GLOBAL__N_11iE" and a demangled // mangled name "(anonymous namespace)::i"... - if (mangled.GetMangledName()) + + // Make sure our mangled name isn't the same string table entry + // as our name. If it starts with '_', then it is ok, else compare + // the string to make sure it isn't the same and we don't end up + // with duplicate entries + if (mangled_cstr && name != mangled_cstr && ((mangled_cstr[0] == '_') || (::strcmp(name, mangled_cstr) != 0))) + { + Mangled mangled (mangled_cstr, true); globals.Insert (mangled.GetMangledName(), die_info); - if (mangled.GetDemangledName()) - globals.Insert (mangled.GetDemangledName(), die_info); + if (mangled.GetDemangledName()) + globals.Insert (mangled.GetDemangledName(), die_info); + } } break; From johnny.chen at apple.com Thu Apr 21 17:50:23 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Thu, 21 Apr 2011 22:50:23 -0000 Subject: [Lldb-commits] [lldb] r129949 - in /lldb/trunk/test: abbreviation_tests/TestAbbreviations.py alias_tests/TestAliases.py command_source/TestCommandSource.py lldbtest.py Message-ID: <20110421225023.5C3852A6C12C@llvm.org> Author: johnny Date: Thu Apr 21 17:50:23 2011 New Revision: 129949 URL: http://llvm.org/viewvc/llvm-project?rev=129949&view=rev Log: Add a HideStdout() method to our TestBase class and call it from TestAbbreviations.py and TestAliases.py. Pass the keyword argument 'check=False' to: self.runCmd("script my.date()", check=False) since we want to restore sys.stdout no matter what the outcome of the runCmd is. Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py lldb/trunk/test/alias_tests/TestAliases.py lldb/trunk/test/command_source/TestCommandSource.py lldb/trunk/test/lldbtest.py Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/abbreviation_tests/TestAbbreviations.py?rev=129949&r1=129948&r2=129949&view=diff ============================================================================== --- lldb/trunk/test/abbreviation_tests/TestAbbreviations.py (original) +++ lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Thu Apr 21 17:50:23 2011 @@ -59,12 +59,7 @@ # We don't want to display the stdout if not in TraceOn() mode. if not self.TraceOn(): - old_stdout = sys.stdout - session = StringIO.StringIO() - sys.stdout = session - def restore_stdout(): - sys.stdout = old_stdout - self.addTearDownHook(restore_stdout) + self.HideStdout() self.runCmd (r'''sc print "\n\n\tHello!\n"''') Modified: lldb/trunk/test/alias_tests/TestAliases.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/alias_tests/TestAliases.py?rev=129949&r1=129948&r2=129949&view=diff ============================================================================== --- lldb/trunk/test/alias_tests/TestAliases.py (original) +++ lldb/trunk/test/alias_tests/TestAliases.py Thu Apr 21 17:50:23 2011 @@ -32,12 +32,7 @@ # We don't want to display the stdout if not in TraceOn() mode. if not self.TraceOn(): - old_stdout = sys.stdout - session = StringIO.StringIO() - sys.stdout = session - def restore_stdout(): - sys.stdout = old_stdout - self.addTearDownHook(restore_stdout) + self.HideStdout() self.runCmd (r'''python print "\n\n\nWhoopee!\n\n\n"''') # self.expect (r'''python print "\n\n\nWhoopee!\n\n\n"''', Modified: lldb/trunk/test/command_source/TestCommandSource.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/command_source/TestCommandSource.py?rev=129949&r1=129948&r2=129949&view=diff ============================================================================== --- lldb/trunk/test/command_source/TestCommandSource.py (original) +++ lldb/trunk/test/command_source/TestCommandSource.py Thu Apr 21 17:50:23 2011 @@ -27,7 +27,8 @@ sys.stdout = session # Python should evaluate "my.date()" successfully. - self.runCmd("script my.date()") + # Pass 'check=False' so that sys.stdout gets restored unconditionally. + self.runCmd("script my.date()", check=False) # Now restore stdout to the way we were. :-) sys.stdout = old_stdout Modified: lldb/trunk/test/lldbtest.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=129949&r1=129948&r2=129949&view=diff ============================================================================== --- lldb/trunk/test/lldbtest.py (original) +++ lldb/trunk/test/lldbtest.py Thu Apr 21 17:50:23 2011 @@ -566,6 +566,9 @@ # function to be run during tearDown() time. self.hooks = [] + # See HideStdout(self). + self.sys_stdout_hidden = False + def markError(self): """Callback invoked when an error (unexpected exception) errored.""" self.__errored__ = True @@ -955,3 +958,30 @@ def TraceOn(self): """Returns True if we are in trace mode (i.e., tracing lldb command execution).""" return traceAlways + + def HideStdout(self): + """Hide output to stdout from the user. + + During test execution, there might be cases where we don't want to show the + standard output to the user. For example, + + self.runCmd(r'''sc print "\n\n\tHello!\n"''') + + tests whether command abbreviation for 'script' works or not. There is no + need to show the 'Hello' output to the user as long as the 'script' command + succeeds and we are not in TraceOn() mode (see the '-t' option). + + In this case, the test method calls self.HideStdout(self) to redirect the + sys.stdout to a null device, and restores the sys.stdout upon teardown. + + Note that you should only call this method at most once during a test case + execution. Any subsequent call has no effect at all.""" + if self.sys_stdout_hidden: + return + + self.sys_stdout_hidden = True + old_stdout = sys.stdout + sys.stdout = open(os.devnull, 'w') + def restore_stdout(): + sys.stdout = old_stdout + self.addTearDownHook(restore_stdout) From johnny.chen at apple.com Thu Apr 21 19:13:28 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Fri, 22 Apr 2011 00:13:28 -0000 Subject: [Lldb-commits] [lldb] r129960 - /lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Message-ID: <20110422001328.8522C2A6C12C@llvm.org> Author: johnny Date: Thu Apr 21 19:13:28 2011 New Revision: 129960 URL: http://llvm.org/viewvc/llvm-project?rev=129960&view=rev Log: Conditionalize the self.expect("dis -f", ...) test scenario to check on Intel disassembly only when the test is currently running against the relevant architecture. Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/abbreviation_tests/TestAbbreviations.py?rev=129960&r1=129959&r2=129960&view=diff ============================================================================== --- lldb/trunk/test/abbreviation_tests/TestAbbreviations.py (original) +++ lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Thu Apr 21 19:13:28 2011 @@ -123,13 +123,15 @@ "at main.cpp\:25", "stop reason = breakpoint 2.1" ]) - self.expect("dis -f", - startstr = "a.out`sum(int, int):", - substrs = [' push', - ' mov', - ' addl ', - 'ret'], - patterns = ['(leave|popq|popl)']) + # ARCH, if not specified, defaults to x86_64. + if self.getArchitecture() in ["", 'x86_64', 'i386']: + self.expect("dis -f", + startstr = "a.out`sum(int, int):", + substrs = [' push', + ' mov', + ' addl ', + 'ret'], + patterns = ['(leave|popq|popl)']) self.expect("i d l main.cpp", patterns = ["Line table for .*main.cpp in `a.out"]) From johnny.chen at apple.com Thu Apr 21 19:33:09 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Fri, 22 Apr 2011 00:33:09 -0000 Subject: [Lldb-commits] [lldb] r129963 - /lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Message-ID: <20110422003309.546C52A6C12C@llvm.org> Author: johnny Date: Thu Apr 21 19:33:09 2011 New Revision: 129963 URL: http://llvm.org/viewvc/llvm-project?rev=129963&view=rev Log: Make the test case more robust by installing a teardown hook to kill the inferior rather than calling "process kill" explicitly at the end of the test. The test might not even reach the end because it could have failed prematurely. Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Modified: lldb/trunk/test/abbreviation_tests/TestAbbreviations.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/abbreviation_tests/TestAbbreviations.py?rev=129963&r1=129962&r2=129963&view=diff ============================================================================== --- lldb/trunk/test/abbreviation_tests/TestAbbreviations.py (original) +++ lldb/trunk/test/abbreviation_tests/TestAbbreviations.py Thu Apr 21 19:33:09 2011 @@ -112,6 +112,12 @@ startstr = "1 breakpoints cleared:", substrs = ["3: file ='main.cpp', line = 32, locations = 1"]) + # Add a future to terminate the current process being debugged. + # + # The test framework relies on detecting either "run" or "process launch" + # command to automatically kill the inferior upon tear down. + # But we'll be using "pro la" command to launch the inferior. + self.addTearDownHook(lambda: self.runCmd("process kill")) self.expect("pro la", patterns = [ "Process .* launched: "]) @@ -152,11 +158,6 @@ '/usr/lib/libSystem.B.dylib', '/usr/lib/system/libmathCommon.A.dylib']) - # Terminate the current process being debugged. - # The test framework was relying on detecting either "run" or - # "process launch" command to automatically kill the inferior. - self.runCmd("process kill") - if __name__ == '__main__': import atexit From gclayton at apple.com Thu Apr 21 22:55:07 2011 From: gclayton at apple.com (Greg Clayton) Date: Fri, 22 Apr 2011 03:55:07 -0000 Subject: [Lldb-commits] [lldb] r129977 - in /lldb/trunk: include/lldb/Core/UserSettingsController.h include/lldb/Interpreter/NamedOptionValue.h include/lldb/Target/Target.h scripts/build-llvm.pl source/Breakpoint/BreakpointResolverName.cpp source/Commands/CommandObjectImage.cpp source/Commands/CommandObjectRegister.cpp source/Core/Debugger.cpp source/Core/Mangled.cpp source/Core/UserSettingsController.cpp source/Interpreter/NamedOptionValue.cpp source/Target/Process.cpp source/Target/Target.cpp Message-ID: <20110422035507.3C7EF2A6C12C@llvm.org> Author: gclayton Date: Thu Apr 21 22:55:06 2011 New Revision: 129977 URL: http://llvm.org/viewvc/llvm-project?rev=129977&view=rev Log: Did some work on the "register read" command to only show the first register set by default when dumping registers. If you want to see all of the register sets you can use the "--all" option: (lldb) register read --all If you want to just see some register sets, you can currently specify them by index: (lldb) register read --set 0 --set 2 We need to get shorter register set names soon so we can specify the register sets by name without having to type too much. I will make this change soon. You can also have any integer encoded registers resolve the address values back to any code or data from the object files using the "--lookup" option. Below is sample output when stopped in the libc function "puts" with some const strings in registers: Process 8973 stopped * thread #1: tid = 0x2c03, 0x00007fff828fa30f libSystem.B.dylib`puts + 1, stop reason = instruction step into frame #0: 0x00007fff828fa30f libSystem.B.dylib`puts + 1 (lldb) register read --lookup General Purpose Registers: rax = 0x0000000100000e98 "----------------------------------------------------------------------" rbx = 0x0000000000000000 rcx = 0x0000000000000001 rdx = 0x0000000000000000 rdi = 0x0000000100000e98 "----------------------------------------------------------------------" rsi = 0x0000000100800000 rbp = 0x00007fff5fbff710 rsp = 0x00007fff5fbff280 r8 = 0x0000000000000040 r9 = 0x0000000000000000 r10 = 0x0000000000000000 r11 = 0x0000000000000246 r12 = 0x0000000000000000 r13 = 0x0000000000000000 r14 = 0x0000000000000000 r15 = 0x0000000000000000 rip = 0x00007fff828fa30f libSystem.B.dylib`puts + 1 rflags = 0x0000000000000246 cs = 0x0000000000000027 fs = 0x0000000000000000 gs = 0x0000000000000000 As we can see, we see two constant strings and the PC (register "rip") is showing the code it resolves to. I fixed the register "--format" option to work as expected. Added a setting to disable skipping the function prologue when setting breakpoints as a target settings variable: (lldb) settings set target.skip-prologue false Updated the user settings controller boolean value handler funciton to be able to take the default value so it can correctly respond to the eVarSetOperationClear operation. Did some usability work on the OptionValue classes. Fixed the "image lookup" command to correctly respond to the "--verbose" option and display the detailed symbol context information when looking up line table entries and functions by name. This previously was only working for address lookups. Modified: lldb/trunk/include/lldb/Core/UserSettingsController.h lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h lldb/trunk/include/lldb/Target/Target.h lldb/trunk/scripts/build-llvm.pl lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp lldb/trunk/source/Commands/CommandObjectImage.cpp lldb/trunk/source/Commands/CommandObjectRegister.cpp lldb/trunk/source/Core/Debugger.cpp lldb/trunk/source/Core/Mangled.cpp lldb/trunk/source/Core/UserSettingsController.cpp lldb/trunk/source/Interpreter/NamedOptionValue.cpp lldb/trunk/source/Target/Process.cpp lldb/trunk/source/Target/Target.cpp Modified: lldb/trunk/include/lldb/Core/UserSettingsController.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/UserSettingsController.h?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/UserSettingsController.h (original) +++ lldb/trunk/include/lldb/Core/UserSettingsController.h Thu Apr 21 22:55:06 2011 @@ -208,6 +208,7 @@ UpdateBooleanVariable (VarSetOperationType op, bool &bool_var, const char *new_value, + bool clear_value, // Used for op == eVarSetOperationClear Error &err); static void Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h (original) +++ lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Thu Apr 21 22:55:06 2011 @@ -60,11 +60,11 @@ virtual void DumpValue (Stream &strm) = 0; - virtual bool + virtual Error SetValueFromCString (const char *value) = 0; virtual bool - ResetValueToDefault () = 0; + Clear () = 0; //----------------------------------------------------------------- // Subclasses should NOT override these functions as they use the @@ -76,6 +76,18 @@ return 1u << GetType(); } + static uint32_t + ConvertTypeToMask (OptionValue::Type type) + { + return 1u << type; + } + + // Get this value as a uint64_t value if it is encoded as a boolean, + // uint64_t or int64_t. Other types will cause "fail_value" to be + // returned + uint64_t + GetUInt64Value (uint64_t fail_value, bool *success_ptr); + OptionValueBoolean * GetAsBooleanValue (); @@ -89,13 +101,21 @@ GetAsStringValue (); OptionValueFileSpec * - GetAsFileSpecValue() ; + GetAsFileSpecValue(); OptionValueArray * - GetAsArrayValue() ; + GetAsArrayValue(); OptionValueDictionary * - GetAsDictionaryValue() ; + GetAsDictionaryValue(); + + protected: + bool m_value_was_set; // This can be used to see if a value has been set + // by a call to SetValueFromCString(). It is often + // handy to know if an option value was set from + // the command line or as a setting, versus if we + // just have the default value that was already + // populated in the option value. }; @@ -131,13 +151,14 @@ virtual void DumpValue (Stream &strm); - virtual bool + virtual Error SetValueFromCString (const char *value); virtual bool - ResetValueToDefault () + Clear () { m_current_value = m_default_value; + m_value_was_set = false; return true; } @@ -145,6 +166,26 @@ // Subclass specific functions //--------------------------------------------------------------------- + //------------------------------------------------------------------ + /// Convert to bool operator. + /// + /// This allows code to check a OptionValueBoolean in conditions. + /// + /// @code + /// OptionValueBoolean bool_value(...); + /// if (bool_value) + /// { ... + /// @endcode + /// + /// @return + /// /b True this object contains a valid namespace decl, \b + /// false otherwise. + //------------------------------------------------------------------ + operator bool() const + { + return m_current_value; + } + bool GetCurrentValue() const { @@ -180,10 +221,16 @@ class OptionValueSInt64 : public OptionValue { public: + OptionValueSInt64 () : + m_current_value (0), + m_default_value (0) + { + } + OptionValueSInt64 (int64_t current_value, int64_t default_value) : - m_current_value (current_value), - m_default_value (default_value) + m_current_value (current_value), + m_default_value (default_value) { } @@ -205,13 +252,14 @@ virtual void DumpValue (Stream &strm); - virtual bool + virtual Error SetValueFromCString (const char *value); virtual bool - ResetValueToDefault () + Clear () { m_current_value = m_default_value; + m_value_was_set = false; return true; } @@ -254,10 +302,16 @@ class OptionValueUInt64 : public OptionValue { public: + OptionValueUInt64 () : + m_current_value (0), + m_default_value (0) + { + } + OptionValueUInt64 (uint64_t current_value, uint64_t default_value) : - m_current_value (current_value), - m_default_value (default_value) + m_current_value (current_value), + m_default_value (default_value) { } @@ -267,6 +321,14 @@ } //--------------------------------------------------------------------- + // Decode a uint64_t from "value_cstr" return a OptionValueUInt64 object + // inside of a lldb::OptionValueSP object if all goes well. If the + // string isn't a uint64_t value or any other error occurs, return an + // empty lldb::OptionValueSP and fill error in with the correct stuff. + //--------------------------------------------------------------------- + static lldb::OptionValueSP + Create (const char *value_cstr, Error &error); + //--------------------------------------------------------------------- // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- @@ -279,13 +341,14 @@ virtual void DumpValue (Stream &strm); - virtual bool + virtual Error SetValueFromCString (const char *value); virtual bool - ResetValueToDefault () + Clear () { m_current_value = m_default_value; + m_value_was_set = false; return true; } @@ -363,13 +426,14 @@ virtual void DumpValue (Stream &strm); - virtual bool + virtual Error SetValueFromCString (const char *value); virtual bool - ResetValueToDefault () + Clear () { m_current_value = m_default_value; + m_value_was_set = false; return true; } @@ -455,13 +519,14 @@ virtual void DumpValue (Stream &strm); - virtual bool + virtual Error SetValueFromCString (const char *value); virtual bool - ResetValueToDefault () + Clear () { m_current_value = m_default_value; + m_value_was_set = false; return true; } @@ -528,13 +593,14 @@ virtual void DumpValue (Stream &strm); - virtual bool + virtual Error SetValueFromCString (const char *value); virtual bool - ResetValueToDefault () + Clear () { m_values.clear(); + m_value_was_set = false; return true; } @@ -543,7 +609,7 @@ //--------------------------------------------------------------------- uint32_t - GetNumValues() const + GetSize () const { return m_values.size(); } @@ -557,6 +623,11 @@ return value_sp; } + uint64_t + GetUInt64ValueAtIndex (uint32_t idx, + uint64_t fail_value, + bool *success_ptr) const; + bool AppendValue (const lldb::OptionValueSP &value_sp) { @@ -652,13 +723,14 @@ virtual void DumpValue (Stream &strm); - virtual bool + virtual Error SetValueFromCString (const char *value); virtual bool - ResetValueToDefault () + Clear () { m_values.clear(); + m_value_was_set = false; return true; } Modified: lldb/trunk/include/lldb/Target/Target.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Target.h?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/Target.h (original) +++ lldb/trunk/include/lldb/Target/Target.h Thu Apr 21 22:55:06 2011 @@ -71,7 +71,13 @@ { return m_prefer_dynamic_value; } - + + bool + GetSkipPrologue() + { + return m_skip_prologue; + } + protected: void @@ -84,6 +90,7 @@ std::string m_expr_prefix_path; std::string m_expr_prefix_contents; bool m_prefer_dynamic_value; + bool m_skip_prologue; }; Modified: lldb/trunk/scripts/build-llvm.pl URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/build-llvm.pl?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/scripts/build-llvm.pl (original) +++ lldb/trunk/scripts/build-llvm.pl Thu Apr 21 22:55:06 2011 @@ -83,7 +83,7 @@ "$llvm_configuration/lib/libLLVMX86Utils.a", ); -if (-e "$llvm_srcroot/lib") +if ($ENV{CONFIGURATION} ne "BuildAndIntegration" and -e "$llvm_srcroot/lib") { print "Using standard LLVM build directory...\n"; # LLVM in the "lldb" root is a symlink which indicates we are using a Modified: lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp (original) +++ lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp Thu Apr 21 22:55:06 2011 @@ -16,7 +16,7 @@ #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Core/Log.h" #include "lldb/Core/StreamString.h" -#include "lldb/lldb-private-log.h" +#include "lldb/Target/Target.h" using namespace lldb; using namespace lldb_private; @@ -146,6 +146,11 @@ Address break_addr; assert (m_breakpoint != NULL); + if (context.target_sp) + { + skip_prologue = context.target_sp->GetSkipPrologue(); + } + LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (m_class_name) Modified: lldb/trunk/source/Commands/CommandObjectImage.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectImage.cpp?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectImage.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectImage.cpp Thu Apr 21 22:55:06 2011 @@ -324,7 +324,7 @@ static void -DumpSymbolContextList (CommandInterpreter &interpreter, Stream &strm, SymbolContextList &sc_list, bool prepend_addr) +DumpSymbolContextList (CommandInterpreter &interpreter, Stream &strm, SymbolContextList &sc_list, bool prepend_addr, bool verbose) { strm.IndentMore (); uint32_t i; @@ -336,31 +336,50 @@ if (sc_list.GetContextAtIndex(i, sc)) { strm.Indent(); + ExecutionContextScope *exe_scope = interpreter.GetExecutionContext().GetBestExecutionContextScope (); + if (prepend_addr) { if (sc.line_entry.range.GetBaseAddress().IsValid()) { - lldb::addr_t vm_addr = sc.line_entry.range.GetBaseAddress().GetLoadAddress(interpreter.GetExecutionContext().target); - int addr_size = sizeof (addr_t); - Process *process = interpreter.GetExecutionContext().process; - if (process) - addr_size = process->GetTarget().GetArchitecture().GetAddressByteSize(); - if (vm_addr != LLDB_INVALID_ADDRESS) - strm.Address (vm_addr, addr_size); - else - sc.line_entry.range.GetBaseAddress().Dump (&strm, NULL, Address::DumpStyleSectionNameOffset); - + sc.line_entry.range.GetBaseAddress().Dump (&strm, + exe_scope, + Address::DumpStyleLoadAddress, + Address::DumpStyleModuleWithFileAddress); strm.PutCString(" in "); } } - sc.DumpStopContext(&strm, interpreter.GetExecutionContext().process, sc.line_entry.range.GetBaseAddress(), true, true, false); + sc.DumpStopContext(&strm, + exe_scope, + sc.line_entry.range.GetBaseAddress(), + true, + true, + false); + strm.EOL(); + if (verbose) + { + if (sc.line_entry.range.GetBaseAddress().IsValid()) + { + if (sc.line_entry.range.GetBaseAddress().Dump (&strm, + exe_scope, + Address::DumpStyleDetailedSymbolContext)) + strm.PutCString("\n\n"); + } + else if (sc.function->GetAddressRange().GetBaseAddress().IsValid()) + { + if (sc.function->GetAddressRange().GetBaseAddress().Dump (&strm, + exe_scope, + Address::DumpStyleDetailedSymbolContext)) + strm.PutCString("\n\n"); + } + } } } strm.IndentLess (); } static uint32_t -LookupFunctionInModule (CommandInterpreter &interpreter, Stream &strm, Module *module, const char *name, bool name_is_regex) +LookupFunctionInModule (CommandInterpreter &interpreter, Stream &strm, Module *module, const char *name, bool name_is_regex, bool verbose) { if (module && name && name[0]) { @@ -392,7 +411,7 @@ strm.Printf("%u match%s found in ", num_matches, num_matches > 1 ? "es" : ""); DumpFullpath (strm, &module->GetFileSpec(), 0); strm.PutCString(":\n"); - DumpSymbolContextList (interpreter, strm, sc_list, true); + DumpSymbolContextList (interpreter, strm, sc_list, true, verbose); } return num_matches; } @@ -457,7 +476,13 @@ } static uint32_t -LookupFileAndLineInModule (CommandInterpreter &interpreter, Stream &strm, Module *module, const FileSpec &file_spec, uint32_t line, bool check_inlines) +LookupFileAndLineInModule (CommandInterpreter &interpreter, + Stream &strm, + Module *module, + const FileSpec &file_spec, + uint32_t line, + bool check_inlines, + bool verbose) { if (module && file_spec) { @@ -474,7 +499,7 @@ strm << " in "; DumpFullpath (strm, &module->GetFileSpec(), 0); strm.PutCString(":\n"); - DumpSymbolContextList (interpreter, strm, sc_list, true); + DumpSymbolContextList (interpreter, strm, sc_list, true, verbose); return num_matches; } } @@ -1550,7 +1575,8 @@ module, m_options.m_file, m_options.m_line_number, - m_options.m_check_inlines)) + m_options.m_check_inlines, + m_options.m_verbose)) { result.SetStatus(eReturnStatusSuccessFinishResult); return true; @@ -1565,7 +1591,8 @@ result.GetOutputStream(), module, m_options.m_str.c_str(), - m_options.m_use_regex)) + m_options.m_use_regex, + m_options.m_verbose)) { result.SetStatus(eReturnStatusSuccessFinishResult); return true; Modified: lldb/trunk/source/Commands/CommandObjectRegister.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectRegister.cpp?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectRegister.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectRegister.cpp Thu Apr 21 22:55:06 2011 @@ -19,6 +19,7 @@ #include "lldb/Interpreter/Args.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Interpreter/CommandReturnObject.h" +#include "lldb/Interpreter/NamedOptionValue.h" #include "lldb/Interpreter/Options.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/RegisterContext.h" @@ -66,6 +67,85 @@ return &m_options; } + bool + DumpRegister (const ExecutionContext &exe_ctx, + Stream &strm, + RegisterContext *reg_ctx, + const RegisterInfo *reg_info) + { + if (reg_info) + { + uint32_t reg = reg_info->kinds[eRegisterKindLLDB]; + + DataExtractor reg_data; + + if (reg_ctx->ReadRegisterBytes(reg, reg_data)) + { + strm.Indent (); + strm.Printf ("%-12s = ", reg_info ? reg_info->name : ""); + Format format; + if (m_options.format == eFormatDefault) + format = reg_info->format; + else + format = m_options.format; + + reg_data.Dump(&strm, 0, format, reg_info->byte_size, 1, UINT32_MAX, LLDB_INVALID_ADDRESS, 0, 0); + if (m_options.lookup_addresses && ((reg_info->encoding == eEncodingUint) || (reg_info->encoding == eEncodingSint))) + { + addr_t reg_addr = reg_ctx->ReadRegisterAsUnsigned (reg, 0); + if (reg_addr) + { + Address so_reg_addr; + if (exe_ctx.target->GetSectionLoadList().ResolveLoadAddress(reg_addr, so_reg_addr)) + { + strm.PutCString (" "); + so_reg_addr.Dump(&strm, exe_ctx.GetBestExecutionContextScope(), Address::DumpStyleResolvedDescription); + } + else + { + } + } + } + strm.EOL(); + return true; + } + } + return false; + } + + bool + DumpRegisterSet (const ExecutionContext &exe_ctx, + Stream &strm, + RegisterContext *reg_ctx, + uint32_t set_idx) + { + uint32_t unavailable_count = 0; + uint32_t available_count = 0; + const RegisterSet * const reg_set = reg_ctx->GetRegisterSet(set_idx); + if (reg_set) + { + strm.Printf ("%s:\n", reg_set->name); + strm.IndentMore (); + const uint32_t num_registers = reg_set->num_registers; + for (uint32_t reg_idx = 0; reg_idx < num_registers; ++reg_idx) + { + const uint32_t reg = reg_set->registers[reg_idx]; + if (DumpRegister (exe_ctx, strm, reg_ctx, reg_ctx->GetRegisterInfoAtIndex(reg))) + ++available_count; + else + ++unavailable_count; + } + strm.IndentLess (); + if (unavailable_count) + { + strm.Indent (); + strm.Printf("%u registers were unavailable.\n", unavailable_count); + } + strm.EOL(); + } + return available_count > 0; + } + virtual bool Execute ( @@ -73,73 +153,80 @@ CommandReturnObject &result ) { - Stream &output_stream = result.GetOutputStream(); - DataExtractor reg_data; + Stream &strm = result.GetOutputStream(); ExecutionContext exe_ctx(m_interpreter.GetExecutionContext()); - RegisterContext *reg_context = exe_ctx.GetRegisterContext (); + RegisterContext *reg_ctx = exe_ctx.GetRegisterContext (); - if (reg_context) + if (reg_ctx) { const RegisterInfo *reg_info = NULL; if (command.GetArgumentCount() == 0) { uint32_t set_idx; - const uint32_t num_register_sets = reg_context->GetRegisterSetCount(); - for (set_idx = 0; set_idx < num_register_sets; ++set_idx) + + uint32_t num_register_sets = 1; + const uint32_t set_array_size = m_options.set_indexes.GetSize(); + if (set_array_size > 0) { - uint32_t unavailable_count = 0; - const RegisterSet * const reg_set = reg_context->GetRegisterSet(set_idx); - output_stream.Printf ("%s:\n", reg_set->name); - output_stream.IndentMore (); - const uint32_t num_registers = reg_set->num_registers; - for (uint32_t reg_idx = 0; reg_idx < num_registers; ++reg_idx) + for (uint32_t i=0; iregisters[reg_idx]; - reg_info = reg_context->GetRegisterInfoAtIndex(reg); - if (reg_context->ReadRegisterBytes(reg, reg_data)) + set_idx = m_options.set_indexes.GetUInt64ValueAtIndex (i, UINT32_MAX, NULL); + if (set_idx != UINT32_MAX) { - output_stream.Indent (); - output_stream.Printf ("%-12s = ", reg_info ? reg_info->name : ""); - reg_data.Dump(&output_stream, 0, reg_info->format, reg_info->byte_size, 1, UINT32_MAX, LLDB_INVALID_ADDRESS, 0, 0); - output_stream.EOL(); + if (!DumpRegisterSet (exe_ctx, strm, reg_ctx, set_idx)) + { + result.AppendErrorWithFormat ("invalid register set index: %u\n", set_idx); + result.SetStatus (eReturnStatusFailed); + break; + } } else { - ++unavailable_count; + result.AppendError ("invalid register set index\n"); + result.SetStatus (eReturnStatusFailed); + break; } } - if (unavailable_count) + } + else + { + if (m_options.dump_all_sets) + num_register_sets = reg_ctx->GetRegisterSetCount(); + + for (set_idx = 0; set_idx < num_register_sets; ++set_idx) { - output_stream.Indent (); - output_stream.Printf("%u registers were unavailable.\n", unavailable_count); + DumpRegisterSet (exe_ctx, strm, reg_ctx, set_idx); } - output_stream.IndentLess (); - output_stream.EOL(); } } else { - const char *arg_cstr; - for (int arg_idx = 0; (arg_cstr = command.GetArgumentAtIndex(arg_idx)) != NULL; ++arg_idx) + if (m_options.dump_all_sets) { - reg_info = reg_context->GetRegisterInfoByName(arg_cstr); - - if (reg_info) + result.AppendError ("the --all option can't be used when registers names are supplied as arguments\n"); + result.SetStatus (eReturnStatusFailed); + } + else if (m_options.set_indexes.GetSize() > 0) + { + result.AppendError ("the --set option can't be used when registers names are supplied as arguments\n"); + result.SetStatus (eReturnStatusFailed); + } + else + { + const char *arg_cstr; + for (int arg_idx = 0; (arg_cstr = command.GetArgumentAtIndex(arg_idx)) != NULL; ++arg_idx) { - output_stream.Printf("%-12s = ", reg_info->name); - if (reg_context->ReadRegisterBytes(reg_info->kinds[eRegisterKindLLDB], reg_data)) + reg_info = reg_ctx->GetRegisterInfoByName(arg_cstr); + + if (reg_info) { - reg_data.Dump(&output_stream, 0, reg_info->format, reg_info->byte_size, 1, UINT32_MAX, LLDB_INVALID_ADDRESS, 0, 0); + if (!DumpRegister (exe_ctx, strm, reg_ctx, reg_info)) + strm.Printf("%-12s = error: unavailable\n", reg_info->name); } else { - output_stream.PutCString ("error: unavailable"); + result.AppendErrorWithFormat ("Invalid register name '%s'.\n", arg_cstr); } - output_stream.EOL(); - } - else - { - result.AppendErrorWithFormat ("Invalid register name '%s'.\n", arg_cstr); } } } @@ -157,7 +244,10 @@ { public: CommandOptions (CommandInterpreter &interpreter) : - Options(interpreter) + Options(interpreter), + set_indexes (OptionValue::ConvertTypeToMask (OptionValue::eTypeUInt64)), + dump_all_sets (false, false), // Initial and default values are false + lookup_addresses (false, false) // Initial and default values are false { OptionParsingStarting(); } @@ -175,9 +265,25 @@ switch (short_option) { case 'f': - error = Args::StringToFormat (option_arg, m_format); + error = Args::StringToFormat (option_arg, format); + break; + + case 's': + { + OptionValueSP value_sp (OptionValueUInt64::Create (option_arg, error)); + if (value_sp) + set_indexes.AppendValue (value_sp); + } + break; + + case 'a': + dump_all_sets.SetCurrentValue(true); break; - + + case 'l': + lookup_addresses.SetCurrentValue(true); + break; + default: error.SetErrorStringWithFormat("Unrecognized short option '%c'\n", short_option); break; @@ -188,7 +294,10 @@ void OptionParsingStarting () { - m_format = eFormatBytes; + format = eFormatDefault; + set_indexes.Clear(); + dump_all_sets.Clear(); + lookup_addresses.Clear(); } const OptionDefinition* @@ -202,7 +311,10 @@ static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. - lldb::Format m_format; + lldb::Format format; + OptionValueArray set_indexes; + OptionValueBoolean dump_all_sets; + OptionValueBoolean lookup_addresses; }; CommandOptions m_options; @@ -211,13 +323,10 @@ OptionDefinition CommandObjectRegisterRead::CommandOptions::g_option_table[] = { - //{ LLDB_OPT_SET_ALL, false, "language", 'l', required_argument, NULL, 0, "[c|c++|objc|objc++]", "Sets the language to use when parsing the expression."}, - //{ LLDB_OPT_SET_1, false, "format", 'f', required_argument, NULL, 0, "[ [bool|b] | [bin] | [char|c] | [oct|o] | [dec|i|d|u] | [hex|x] | [float|f] | [cstr|s] ]", "Specify the format that the expression output should use."}, - { LLDB_OPT_SET_1, false, "format", 'f', required_argument, NULL, 0, eArgTypeExprFormat, "Specify the format that the expression output should use."}, - { LLDB_OPT_SET_2, false, "object-description", 'o', no_argument, NULL, 0, eArgTypeNone, "Print the object description of the value resulting from the expression."}, - { LLDB_OPT_SET_ALL, false, "unwind-on-error", 'u', required_argument, NULL, 0, eArgTypeBoolean, "Clean up program state if the expression causes a crash, breakpoint hit or signal."}, - { LLDB_OPT_SET_ALL, false, "debug", 'g', no_argument, NULL, 0, eArgTypeNone, "Enable verbose debug logging of the expression parsing and evaluation."}, - { LLDB_OPT_SET_ALL, false, "use-ir", 'i', no_argument, NULL, 0, eArgTypeNone, "[Temporary] Instructs the expression evaluator to use IR instead of ASTs."}, + { LLDB_OPT_SET_ALL, false, "format", 'f', required_argument, NULL, 0, eArgTypeExprFormat, "Specify the format to use when dumping register values."}, + { LLDB_OPT_SET_ALL, false, "lookup", 'l', no_argument , NULL, 0, eArgTypeNone , "Lookup the register values as addresses and show that each value maps to in the address space."}, + { LLDB_OPT_SET_1 , false, "set" , 's', required_argument, NULL, 0, eArgTypeIndex , "Specify which register sets to dump by index."}, + { LLDB_OPT_SET_2 , false, "all" , 'a', no_argument , NULL, 0, eArgTypeNone , "Show all register sets."}, { 0, false, NULL, 0, 0, NULL, NULL, eArgTypeNone, NULL } }; @@ -275,9 +384,9 @@ { DataExtractor reg_data; ExecutionContext exe_ctx(m_interpreter.GetExecutionContext()); - RegisterContext *reg_context = exe_ctx.GetRegisterContext (); + RegisterContext *reg_ctx = exe_ctx.GetRegisterContext (); - if (reg_context) + if (reg_ctx) { if (command.GetArgumentCount() != 2) { @@ -288,7 +397,7 @@ { const char *reg_name = command.GetArgumentAtIndex(0); const char *value_str = command.GetArgumentAtIndex(1); - const RegisterInfo *reg_info = reg_context->GetRegisterInfoByName(reg_name); + const RegisterInfo *reg_info = reg_ctx->GetRegisterInfoByName(reg_name); if (reg_info) { @@ -296,7 +405,7 @@ Error error(scalar.SetValueFromCString (value_str, reg_info->encoding, reg_info->byte_size)); if (error.Success()) { - if (reg_context->WriteRegisterValue(reg_info->kinds[eRegisterKindLLDB], scalar)) + if (reg_ctx->WriteRegisterValue(reg_info->kinds[eRegisterKindLLDB], scalar)) { result.SetStatus (eReturnStatusSuccessFinishNoResult); return true; Modified: lldb/trunk/source/Core/Debugger.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Debugger.cpp?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/source/Core/Debugger.cpp (original) +++ lldb/trunk/source/Core/Debugger.cpp Thu Apr 21 22:55:06 2011 @@ -1439,11 +1439,11 @@ } else if (var_name == UseExternalEditorVarName ()) { - UserSettingsController::UpdateBooleanVariable (op, m_use_external_editor, value, err); + UserSettingsController::UpdateBooleanVariable (op, m_use_external_editor, value, false, err); } else if (var_name == AutoConfirmName ()) { - UserSettingsController::UpdateBooleanVariable (op, m_auto_confirm_on, value, err); + UserSettingsController::UpdateBooleanVariable (op, m_auto_confirm_on, value, false, err); } } Modified: lldb/trunk/source/Core/Mangled.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Mangled.cpp?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/source/Core/Mangled.cpp (original) +++ lldb/trunk/source/Core/Mangled.cpp Thu Apr 21 22:55:06 2011 @@ -109,15 +109,23 @@ void Mangled::SetValue (const char *s, bool mangled) { - m_mangled.Clear(); - m_demangled.Clear(); - if (s) { if (mangled) + { + m_demangled.Clear(); m_mangled.SetCString (s); + } else + { m_demangled.SetCString(s); + m_mangled.Clear(); + } + } + else + { + m_demangled.Clear(); + m_mangled.Clear(); } } Modified: lldb/trunk/source/Core/UserSettingsController.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/UserSettingsController.cpp?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/source/Core/UserSettingsController.cpp (original) +++ lldb/trunk/source/Core/UserSettingsController.cpp Thu Apr 21 22:55:06 2011 @@ -2028,32 +2028,51 @@ void UserSettingsController::UpdateBooleanVariable (VarSetOperationType op, - bool &bool_var, - const char *new_value, + bool &bool_value, + const char *value_cstr, + bool clear_value, Error &err) { - if (op != eVarSetOperationAssign) + switch (op) + { + case eVarSetOperationReplace: + case eVarSetOperationInsertBefore: + case eVarSetOperationInsertAfter: + case eVarSetOperationRemove: + case eVarSetOperationAppend: + case eVarSetOperationInvalid: + default: err.SetErrorString ("Invalid operation for Boolean variable. Cannot update value.\n"); + break; - if (new_value && new_value[0]) - { - if ((::strcasecmp(new_value, "true") == 0) || - (::strcasecmp(new_value, "yes") == 0) || - (::strcasecmp(new_value, "on") == 0) || - (::strcasecmp(new_value, "1") == 0)) - bool_var = true; - else - if ((::strcasecmp(new_value, "false") == 0) || - (::strcasecmp(new_value, "no") == 0) || - (::strcasecmp(new_value, "off") == 0) || - (::strcasecmp(new_value, "0") == 0)) - bool_var = false; - else - err.SetErrorStringWithFormat ("Invalid boolean value '%s'\n", new_value); + case eVarSetOperationClear: + err.Clear(); + bool_value = clear_value; + break; + + case eVarSetOperationAssign: + { + bool success = false; + + + if (value_cstr == NULL) + err.SetErrorStringWithFormat ("invalid boolean string value (NULL)\n", value_cstr); + else if (value_cstr[0] == '\0') + err.SetErrorStringWithFormat ("invalid boolean string value (empty)\n", value_cstr); + else + { + bool new_value = Args::StringToBoolean (value_cstr, false, &success); + if (success) + { + err.Clear(); + bool_value = new_value; + } + else + err.SetErrorStringWithFormat ("invalid boolean string value: '%s'\n", value_cstr); + } + } + break; } - else - err.SetErrorString ("Invalid value. Cannot perform update.\n"); - } void Modified: lldb/trunk/source/Interpreter/NamedOptionValue.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/NamedOptionValue.cpp?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/NamedOptionValue.cpp (original) +++ lldb/trunk/source/Interpreter/NamedOptionValue.cpp Thu Apr 21 22:55:06 2011 @@ -23,6 +23,29 @@ //------------------------------------------------------------------------- // OptionValue //------------------------------------------------------------------------- + +// Get this value as a uint64_t value if it is encoded as a boolean, +// uint64_t or int64_t. Other types will cause "fail_value" to be +// returned +uint64_t +OptionValue::GetUInt64Value (uint64_t fail_value, bool *success_ptr) +{ + if (success_ptr) + *success_ptr = true; + switch (GetType()) + { + case OptionValue::eTypeBoolean: return static_cast(this)->GetCurrentValue(); + case OptionValue::eTypeSInt64: return static_cast(this)->GetCurrentValue(); + case OptionValue::eTypeUInt64: return static_cast(this)->GetCurrentValue(); + default: + break; + } + if (success_ptr) + *success_ptr = false; + return fail_value; +} + + OptionValueBoolean * OptionValue::GetAsBooleanValue () { @@ -105,17 +128,22 @@ strm.PutCString (m_current_value ? "true" : "false"); } -bool +Error OptionValueBoolean::SetValueFromCString (const char *value_cstr) { + Error error; bool success = false; bool value = Args::StringToBoolean(value_cstr, false, &success); if (success) { + m_value_was_set = true; m_current_value = value; - return true; } - return false; + else + { + error.SetErrorStringWithFormat ("invalid boolean string value: '%s'\n", value_cstr); + } + return error; } //------------------------------------------------------------------------- @@ -127,39 +155,62 @@ strm.Printf ("%lli", m_current_value); } -bool +Error OptionValueSInt64::SetValueFromCString (const char *value_cstr) { + + Error error; bool success = false; int64_t value = Args::StringToSInt64 (value_cstr, 0, 0, &success); if (success) { + m_value_was_set = true; m_current_value = value; - return true; } - return false; + else + { + error.SetErrorStringWithFormat ("invalid int64_t string value: '%s'\n", value_cstr); + } + return error; } //------------------------------------------------------------------------- // OptionValueUInt64 //------------------------------------------------------------------------- + +lldb::OptionValueSP +OptionValueUInt64::Create (const char *value_cstr, Error &error) +{ + lldb::OptionValueSP value_sp (new OptionValueUInt64()); + error = value_sp->SetValueFromCString (value_cstr); + if (error.Fail()) + value_sp.reset(); + return value_sp; +} + + void OptionValueUInt64::DumpValue (Stream &strm) { strm.Printf ("0x%llx", m_current_value); } -bool +Error OptionValueUInt64::SetValueFromCString (const char *value_cstr) { + Error error; bool success = false; uint64_t value = Args::StringToUInt64 (value_cstr, 0, 0, &success); if (success) { + m_value_was_set = true; m_current_value = value; - return true; } - return false; + else + { + error.SetErrorStringWithFormat ("invalid uint64_t string value: '%s'\n", value_cstr); + } + return error; } //------------------------------------------------------------------------- @@ -171,11 +222,12 @@ strm.Printf ("\"%s\"", m_current_value.c_str()); } -bool +Error OptionValueString::SetValueFromCString (const char *value_cstr) { + m_value_was_set = true; SetCurrentValue (value_cstr); - return true; + return Error (); } @@ -202,14 +254,15 @@ } } -bool +Error OptionValueFileSpec::SetValueFromCString (const char *value_cstr) { if (value_cstr && value_cstr[0]) m_current_value.SetFile(value_cstr, false); else m_current_value.Clear(); - return true; + m_value_was_set = true; + return Error(); } @@ -227,13 +280,25 @@ } } -bool +Error OptionValueArray::SetValueFromCString (const char *value_cstr) { - // We must be able to set this using the array specific functions - return false; + Error error; + error.SetErrorStringWithFormat ("array option values don't yet support being set by string: '%s'\n", value_cstr); + return error; +} + + +uint64_t +OptionValueArray::GetUInt64ValueAtIndex (uint32_t idx, uint64_t fail_value, bool *success_ptr) const +{ + if (idx < m_values.size()) + return m_values[idx]->GetUInt64Value (fail_value, success_ptr); + return fail_value; } + + //------------------------------------------------------------------------- // OptionValueDictionary //------------------------------------------------------------------------- @@ -249,11 +314,12 @@ } } -bool +Error OptionValueDictionary::SetValueFromCString (const char *value_cstr) { - // We must be able to set this using the array specific functions - return false; + Error error; + error.SetErrorStringWithFormat ("dictionary option values don't yet support being set by string: '%s'\n", value_cstr); + return error; } lldb::OptionValueSP Modified: lldb/trunk/source/Target/Process.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/source/Target/Process.cpp (original) +++ lldb/trunk/source/Target/Process.cpp Thu Apr 21 22:55:06 2011 @@ -4062,9 +4062,9 @@ else if (var_name == ErrorPathVarName()) UserSettingsController::UpdateStringVariable (op, m_error_path, value, err); else if (var_name == DisableASLRVarName()) - UserSettingsController::UpdateBooleanVariable (op, m_disable_aslr, value, err); + UserSettingsController::UpdateBooleanVariable (op, m_disable_aslr, value, true, err); else if (var_name == DisableSTDIOVarName ()) - UserSettingsController::UpdateBooleanVariable (op, m_disable_stdio, value, err); + UserSettingsController::UpdateBooleanVariable (op, m_disable_stdio, value, false, err); } void Modified: lldb/trunk/source/Target/Target.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=129977&r1=129976&r2=129977&view=diff ============================================================================== --- lldb/trunk/source/Target/Target.cpp (original) +++ lldb/trunk/source/Target/Target.cpp Thu Apr 21 22:55:06 2011 @@ -1290,6 +1290,7 @@ #define TSC_DEFAULT_ARCH "default-arch" #define TSC_EXPR_PREFIX "expr-prefix" #define TSC_PREFER_DYNAMIC "prefer-dynamic-value" +#define TSC_SKIP_PROLOGUE "skip-prologue" static const ConstString & @@ -1315,6 +1316,15 @@ } +static const ConstString & +GetSettingNameForSkipPrologue () +{ + static ConstString g_const_string (TSC_SKIP_PROLOGUE); + return g_const_string; +} + + + bool Target::SettingsController::SetGlobalVariable (const ConstString &var_name, const char *index_value, @@ -1364,7 +1374,8 @@ InstanceSettings (owner, name ? name : InstanceSettings::InvalidName().AsCString(), live_instance), m_expr_prefix_path (), m_expr_prefix_contents (), - m_prefer_dynamic_value (true) + m_prefer_dynamic_value (true), + m_skip_prologue (true) { // CopyInstanceSettings is a pure virtual function in InstanceSettings; it therefore cannot be called // until the vtables for TargetInstanceSettings are properly set up, i.e. AFTER all the initializers. @@ -1381,7 +1392,6 @@ { const lldb::InstanceSettingsSP &pending_settings = m_owner.FindPendingSettings (m_instance_name); CopyInstanceSettings (pending_settings,false); - //m_owner.RemovePendingSettings (m_instance_name); } } @@ -1392,7 +1402,6 @@ { const lldb::InstanceSettingsSP &pending_settings = m_owner.FindPendingSettings (m_instance_name); CopyInstanceSettings (pending_settings,false); - //m_owner.RemovePendingSettings (m_instance_name); } } @@ -1464,36 +1473,11 @@ } else if (var_name == GetSettingNameForPreferDynamicValue()) { - switch (op) - { - default: - err.SetErrorToGenericError (); - err.SetErrorString ("Unrecognized operation. Cannot update value.\n"); - return; - case eVarSetOperationAssign: - { - bool success; - bool result = Args::StringToBoolean(value, false, &success); - - if (success) - { - m_prefer_dynamic_value = result; - } - else - { - err.SetErrorStringWithFormat ("Bad value \"%s\" for %s, should be Boolean.", - value, - GetSettingNameForPreferDynamicValue().AsCString()); - } - return; - } - case eVarSetOperationClear: - m_prefer_dynamic_value = true; - case eVarSetOperationAppend: - err.SetErrorToGenericError (); - err.SetErrorString ("Cannot append to a bool.\n"); - return; - } + UserSettingsController::UpdateBooleanVariable (op, m_prefer_dynamic_value, value, true, err); + } + else if (var_name == GetSettingNameForSkipPrologue()) + { + UserSettingsController::UpdateBooleanVariable (op, m_skip_prologue, value, true, err); } } @@ -1527,6 +1511,13 @@ else value.AppendString ("false"); } + else if (var_name == GetSettingNameForSkipPrologue()) + { + if (m_skip_prologue) + value.AppendString ("true"); + else + value.AppendString ("false"); + } else { if (err) @@ -1570,5 +1561,6 @@ // ================= ================== =========== ==== ====== ====== ========================================================================= { TSC_EXPR_PREFIX , eSetVarTypeString , NULL , NULL, false, false, "Path to a file containing expressions to be prepended to all expressions." }, { TSC_PREFER_DYNAMIC, eSetVarTypeBoolean ,"true" , NULL, false, false, "Should printed values be shown as their dynamic value." }, + { TSC_SKIP_PROLOGUE , eSetVarTypeBoolean ,"true" , NULL, false, false, "Skip function prologues when setting breakpoints by name." }, { NULL , eSetVarTypeNone , NULL , NULL, false, false, NULL } }; From ctice at apple.com Fri Apr 22 00:08:45 2011 From: ctice at apple.com (Caroline Tice) Date: Fri, 22 Apr 2011 05:08:45 -0000 Subject: [Lldb-commits] [lldb] r129981 - in /lldb/trunk: include/lldb/Core/Disassembler.h include/lldb/Core/EmulateInstruction.h include/lldb/Interpreter/NamedOptionValue.h source/Core/Disassembler.cpp source/Interpreter/NamedOptionValue.cpp source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp source/Plugins/Instruction/ARM/EmulateInstructionARM.h source/Plugins/Instruction/ARM/EmulationStateARM.cpp source/Plugins/Instruction/ARM/EmulationStateARM.h Message-ID: <20110422050846.1893D2A6C12C@llvm.org> Author: ctice Date: Fri Apr 22 00:08:45 2011 New Revision: 129981 URL: http://llvm.org/viewvc/llvm-project?rev=129981&view=rev Log: Change code for reading emulation data files to read the new file format. (The newly formatted files will go in as a separate commit in a few minutes). Modified: lldb/trunk/include/lldb/Core/Disassembler.h lldb/trunk/include/lldb/Core/EmulateInstruction.h lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h lldb/trunk/source/Core/Disassembler.cpp lldb/trunk/source/Interpreter/NamedOptionValue.cpp lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.cpp lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.h Modified: lldb/trunk/include/lldb/Core/Disassembler.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Disassembler.h?rev=129981&r1=129980&r2=129981&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/Disassembler.h (original) +++ lldb/trunk/include/lldb/Core/Disassembler.h Fri Apr 22 00:08:45 2011 @@ -22,6 +22,7 @@ #include "lldb/Core/EmulateInstruction.h" #include "lldb/Core/Opcode.h" #include "lldb/Core/PluginInterface.h" +#include "lldb/Interpreter/NamedOptionValue.h" namespace lldb_private { @@ -71,6 +72,12 @@ virtual void SetDescription (const char *) {}; // May be overridden in sub-classes that have descriptions. + lldb::OptionValueSP + ReadArray (FILE *in_file, Stream *out_stream, OptionValue::Type data_type); + + lldb::OptionValueSP + ReadDictionary (FILE *in_file, Stream *out_stream); + bool DumpEmulation (const ArchSpec &arch); Modified: lldb/trunk/include/lldb/Core/EmulateInstruction.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/EmulateInstruction.h?rev=129981&r1=129980&r2=129981&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/EmulateInstruction.h (original) +++ lldb/trunk/include/lldb/Core/EmulateInstruction.h Fri Apr 22 00:08:45 2011 @@ -16,6 +16,7 @@ #include "lldb/Core/ArchSpec.h" #include "lldb/Core/PluginInterface.h" #include "lldb/Core/Opcode.h" +#include "lldb/Interpreter/NamedOptionValue.h" //---------------------------------------------------------------------- /// @class EmulateInstruction EmulateInstruction.h "lldb/Core/EmulateInstruction.h" @@ -418,7 +419,7 @@ EvaluateInstruction () = 0; virtual bool - TestEmulation (Stream *out_stream, FILE *test_file, ArchSpec &arch) = 0; + TestEmulation (Stream *out_stream, ArchSpec &arch, OptionValueDictionary *test_data) = 0; bool GetAdvancePC () { return m_advance_pc; } Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h?rev=129981&r1=129980&r2=129981&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h (original) +++ lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Fri Apr 22 00:08:45 2011 @@ -109,6 +109,12 @@ OptionValueDictionary * GetAsDictionaryValue(); + const char * + GetStringValue (); + + uint64_t + GetUInt64Value (); + protected: bool m_value_was_set; // This can be used to see if a value has been set // by a call to SetValueFromCString(). It is often @@ -116,6 +122,7 @@ // the command line or as a setting, versus if we // just have the default value that was already // populated in the option value. + }; Modified: lldb/trunk/source/Core/Disassembler.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Disassembler.cpp?rev=129981&r1=129980&r2=129981&view=diff ============================================================================== --- lldb/trunk/source/Core/Disassembler.cpp (original) +++ lldb/trunk/source/Core/Disassembler.cpp Fri Apr 22 00:08:45 2011 @@ -21,7 +21,9 @@ #include "lldb/Core/EmulateInstruction.h" #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" +#include "lldb/Core/RegularExpression.h" #include "lldb/Core/Timer.h" +#include "lldb/Interpreter/NamedOptionValue.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" @@ -502,6 +504,187 @@ return false; } +OptionValueSP +Instruction::ReadArray (FILE *in_file, Stream *out_stream, OptionValue::Type data_type) +{ + bool done = false; + char buffer[1024]; + + OptionValueSP option_value_sp (new OptionValueArray (1u << data_type)); + + int idx = 0; + while (!done) + { + if (!fgets (buffer, 1023, in_file)) + { + out_stream->Printf ("Instruction::ReadArray: Erroe reading file (fgets).\n"); + option_value_sp.reset (); + return option_value_sp; + } + + std::string line (buffer); + + int len = line.size(); + if (line[len-1] == '\n') + { + line[len-1] = '\0'; + line.resize (len-1); + } + + if ((line.size() == 1) && line[0] == ']') + { + done = true; + line.clear(); + } + + if (line.size() > 0) + { + std::string value; + RegularExpression reg_exp ("^[ \t]*([^ \t]+)[ \t]*$"); + bool reg_exp_success = reg_exp.Execute (line.c_str(), 1); + if (reg_exp_success) + reg_exp.GetMatchAtIndex (line.c_str(), 1, value); + else + value = line; + + OptionValueSP data_value_sp; + switch (data_type) + { + case OptionValue::eTypeUInt64: + data_value_sp.reset (new OptionValueUInt64 (0, 0)); + data_value_sp->SetValueFromCString (value.c_str()); + break; + // Other types can be added later as needed. + default: + data_value_sp.reset (new OptionValueString (value.c_str(), "")); + break; + } + + option_value_sp->GetAsArrayValue()->InsertValue (idx, data_value_sp); + ++idx; + } + } + + return option_value_sp; +} + +OptionValueSP +Instruction::ReadDictionary (FILE *in_file, Stream *out_stream) +{ + bool done = false; + char buffer[1024]; + + OptionValueSP option_value_sp (new OptionValueDictionary()); + static ConstString encoding_key ("data_encoding"); + OptionValue::Type data_type = OptionValue::eTypeInvalid; + + + while (!done) + { + // Read the next line in the file + if (!fgets (buffer, 1023, in_file)) + { + out_stream->Printf ("Instruction::ReadDictionary: Error reading file (fgets).\n"); + option_value_sp.reset (); + return option_value_sp; + } + + // Check to see if the line contains the end-of-dictionary marker ("}") + std::string line (buffer); + + int len = line.size(); + if (line[len-1] == '\n') + { + line[len-1] = '\0'; + line.resize (len-1); + } + + if ((line.size() == 1) && (line[0] == '}')) + { + done = true; + line.clear(); + } + + // Try to find a key-value pair in the current line and add it to the dictionary. + if (line.size() > 0) + { + RegularExpression reg_exp ("^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t]*=[ \t]*(.*)[ \t]*$"); + bool reg_exp_success = reg_exp.Execute (line.c_str(), 2); + std::string key; + std::string value; + if (reg_exp_success) + { + reg_exp.GetMatchAtIndex (line.c_str(), 1, key); + reg_exp.GetMatchAtIndex (line.c_str(), 2, value); + } + else + { + out_stream->Printf ("Instruction::ReadDictionary: Failure executing regular expression.\n"); + option_value_sp.reset(); + return option_value_sp; + } + + ConstString const_key (key.c_str()); + // Check value to see if it's the start of an array or dictionary. + + lldb::OptionValueSP value_sp; + assert (value.empty() == false); + assert (key.empty() == false); + + if (value[0] == '{') + { + assert (value.size() == 1); + // value is a dictionary + value_sp = ReadDictionary (in_file, out_stream); + if (value_sp.get() == NULL) + { + option_value_sp.reset (); + return option_value_sp; + } + } + else if (value[0] == '[') + { + assert (value.size() == 1); + // value is an array + value_sp = ReadArray (in_file, out_stream, data_type); + if (value_sp.get() == NULL) + { + option_value_sp.reset (); + return option_value_sp; + } + // We've used the data_type to read an array; re-set the type to Invalid + data_type = OptionValue::eTypeInvalid; + } + else if ((value[0] == '0') && (value[1] == 'x')) + { + value_sp.reset (new OptionValueUInt64 (0, 0)); + value_sp->SetValueFromCString (value.c_str()); + } + else + { + int len = value.size(); + if ((value[0] == '"') && (value[len-1] == '"')) + value = value.substr (1, len-2); + value_sp.reset (new OptionValueString (value.c_str(), "")); + } + + + + if (const_key == encoding_key) + { + // A 'data_encoding=..." is NOT a normal key-value pair; it is meta-data indicating the + // data type of an upcoming array (usually the next bit of data to be read in). + if (strcmp (value.c_str(), "uint32_t") == 0) + data_type = OptionValue::eTypeUInt64; + } + else + option_value_sp->GetAsDictionaryValue()->SetValueForKey (const_key, value_sp, false); + } + } + + return option_value_sp; +} + bool Instruction::TestEmulation (Stream *out_stream, const char *file_name) { @@ -521,33 +704,63 @@ return false; } - ArchSpec arch; char buffer[256]; - if (!fgets (buffer,255, test_file)) // Read/skip first line of file, which should be a comment line (description). + if (!fgets (buffer, 255, test_file)) { - out_stream->Printf ("Instruction::TestEmulation: Read comment line failed."); + out_stream->Printf ("Instruction::TestEmulation: Error reading first line of test file.\n"); fclose (test_file); return false; } - SetDescription (buffer); - - if (fscanf (test_file, "%s", buffer) != 1) // Read the arch or arch-triple from the file + + if (strncmp (buffer, "InstructionEmulationState={", 27) != 0) + { + out_stream->Printf ("Instructin::TestEmulation: Test file does not contain emulation state dictionary\n"); + fclose (test_file); + return false; + } + + // Read all the test information from the test file into an OptionValueDictionary. + + OptionValueSP data_dictionary_sp (ReadDictionary (test_file, out_stream)); + if (data_dictionary_sp.get() == NULL) { - out_stream->Printf ("Instruction::TestEmulation: Read arch failed."); + out_stream->Printf ("Instruction::TestEmulation: Error reading Dictionary Object.\n"); fclose (test_file); return false; } + + fclose (test_file); + + OptionValueDictionary *data_dictionary = data_dictionary_sp->GetAsDictionaryValue(); + static ConstString description_key ("assembly_string"); + static ConstString triple_key ("triple"); + + OptionValueSP value_sp = data_dictionary->GetValueForKey (description_key); + + if (value_sp.get() == NULL) + { + out_stream->Printf ("Instruction::TestEmulation: Test file does not contain description string.\n"); + return false; + } + + SetDescription (value_sp->GetStringValue()); + + + value_sp = data_dictionary->GetValueForKey (triple_key); + if (value_sp.get() == NULL) + { + out_stream->Printf ("Instruction::TestEmulation: Test file does not contain triple.\n"); + return false; + } - const char *cptr = buffer; - arch.SetTriple (llvm::Triple (cptr)); + ArchSpec arch; + arch.SetTriple (llvm::Triple (value_sp->GetStringValue())); bool success = false; std::auto_ptr insn_emulator_ap (EmulateInstruction::FindPlugin (arch, NULL)); if (insn_emulator_ap.get()) - success = insn_emulator_ap->TestEmulation (out_stream, test_file, arch); + success = insn_emulator_ap->TestEmulation (out_stream, arch, data_dictionary); - fclose (test_file); - if (success) out_stream->Printf ("Emulation test succeeded."); else Modified: lldb/trunk/source/Interpreter/NamedOptionValue.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/NamedOptionValue.cpp?rev=129981&r1=129980&r2=129981&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/NamedOptionValue.cpp (original) +++ lldb/trunk/source/Interpreter/NamedOptionValue.cpp Fri Apr 22 00:08:45 2011 @@ -102,6 +102,21 @@ return NULL; } +const char * +OptionValue::GetStringValue () +{ + if (GetType () == OptionValue::eTypeString) + return static_cast(this)->GetCurrentValue(); + return NULL; +} + +uint64_t +OptionValue::GetUInt64Value () +{ + if (GetType () == OptionValue::eTypeUInt64) + return static_cast(this)->GetCurrentValue(); + return 0; +} //------------------------------------------------------------------------- // OptionValueCollection Modified: lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp?rev=129981&r1=129980&r2=129981&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp (original) +++ lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp Fri Apr 22 00:08:45 2011 @@ -13309,25 +13309,31 @@ } bool -EmulateInstructionARM::TestEmulation (Stream *out_stream, FILE *test_file, ArchSpec &arch) +EmulateInstructionARM::TestEmulation (Stream *out_stream, ArchSpec &arch, OptionValueDictionary *test_data) { - if (!test_file) + if (!test_data) { - out_stream->Printf ("TestEmulation: Missing test file.\n"); + out_stream->Printf ("TestEmulation: Missing test data.\n"); return false; } + + static ConstString opcode_key ("opcode"); + static ConstString before_key ("before_state"); + static ConstString after_key ("after_state"); + + OptionValueSP value_sp = test_data->GetValueForKey (opcode_key); uint32_t test_opcode; - if (fscanf (test_file, "%x", &test_opcode) != 1) + if ((value_sp.get() == NULL) || (value_sp->GetType() != OptionValue::eTypeUInt64)) { - out_stream->Printf ("Test Emulation: Error reading opcode from test file.\n"); + out_stream->Printf ("TestEmulation: Error reading opcode from test file.\n"); return false; } + test_opcode = value_sp->GetUInt64Value (); - char buffer[256]; - fgets (buffer, 255, test_file); // consume the newline after reading the opcode. - - SetAdvancePC (true); + // If the instruction emulation does not directly update the PC, advance the PC to the next instruction after + // performing the emulation. + SetAdvancePC (true); if (arch.GetTriple().getArch() == llvm::Triple::arm) { @@ -13345,60 +13351,41 @@ } else { - out_stream->Printf ("Test Emulation: Invalid arch.\n"); + out_stream->Printf ("TestEmulation: Invalid arch.\n"); return false; } - EmulationStateARM before_state; EmulationStateARM after_state; - // Read Memory info & load into before_state - if (!fgets (buffer, 255, test_file)) + value_sp = test_data->GetValueForKey (before_key); + if ((value_sp.get() == NULL) || (value_sp->GetType() != OptionValue::eTypeDictionary)) { - out_stream->Printf ("Test Emulation: Error attempting to read from test file.\n"); + out_stream->Printf ("TestEmulation: Failed to find 'before' state.\n"); return false; } - - if (strncmp (buffer, "Memory-Begin", 12) != 0) + + OptionValueDictionary *state_dictionary = value_sp->GetAsDictionaryValue (); + if (!before_state.LoadStateFromDictionary (state_dictionary)) { - out_stream->Printf ("Test Emulation: Cannot find Memory-Begin in test file.\n"); + out_stream->Printf ("TestEmulation: Failed loading 'before' state.\n"); return false; } - bool done = false; - while (!done) + value_sp = test_data->GetValueForKey (after_key); + if ((value_sp.get() == NULL) || (value_sp->GetType() != OptionValue::eTypeDictionary)) { - if (fgets (buffer, 255, test_file)) - { - if (strncmp (buffer, "Memory-End", 10) == 0) - done = true; - else - { - uint32_t addr; - uint32_t value; - if (sscanf (buffer, "%x %x", &addr, &value) == 2) - before_state.StoreToPseudoAddress ((addr_t) addr, (uint64_t) value, 4); - else - { - out_stream->Printf ("Test Emulation: Error attempting to sscanf address/value pair.\n"); - return false; - } - } - } - else - { - out_stream->Printf ("Test Emulation: Error attemping to read test file.\n"); - return false; - } + out_stream->Printf ("TestEmulation: Failed to find 'after' state.\n"); + return false; } - - if (!EmulationStateARM::LoadRegisterStatesFromTestFile (test_file, before_state, after_state)) + + state_dictionary = value_sp->GetAsDictionaryValue (); + if (!after_state.LoadStateFromDictionary (state_dictionary)) { - out_stream->Printf ("Test Emulation: Error occurred while attempting to load the register data.\n"); + out_stream->Printf ("TestEmulation: Failed loading 'after' state.\n"); return false; } - + SetBaton ((void *) &before_state); SetCallbacks (&EmulationStateARM::ReadPseudoMemory, &EmulationStateARM::WritePseudoMemory, @@ -13408,11 +13395,14 @@ bool success = EvaluateInstruction (); if (!success) { - out_stream->Printf ("Test Emulation: EvaluateInstruction() failed.\n"); + out_stream->Printf ("TestEmulation: EvaluateInstruction() failed.\n"); return false; } success = before_state.CompareState (after_state); + if (!success) + out_stream->Printf ("TestEmulation: 'before' and 'after' states do not match.\n"); + return success; } Modified: lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h?rev=129981&r1=129980&r2=129981&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h (original) +++ lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.h Fri Apr 22 00:08:45 2011 @@ -12,6 +12,7 @@ #include "lldb/Core/EmulateInstruction.h" #include "lldb/Core/Error.h" +#include "lldb/Interpreter/NamedOptionValue.h" #include "Plugins/Process/Utility/ARMDefines.h" namespace lldb_private { @@ -150,7 +151,7 @@ EvaluateInstruction (); virtual bool - TestEmulation (Stream *out_stream, FILE *test_file, ArchSpec &arch); + TestEmulation (Stream *out_stream, ArchSpec &arch, OptionValueDictionary *test_data); uint32_t ArchVersion(); Modified: lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.cpp?rev=129981&r1=129980&r2=129981&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.cpp (original) +++ lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.cpp Fri Apr 22 00:08:45 2011 @@ -315,82 +315,6 @@ } bool -EmulationStateARM::LoadState (FILE *test_file) -{ - if (!test_file) - return false; - - uint32_t num_regs; - uint32_t value32; - uint64_t value64; - - /* Load general register state */ - if (fscanf (test_file, "%d", &num_regs) != 1) - return false; - - - for (int i = 0; i < num_regs; ++i) - { - if (fscanf (test_file, "%x", &value32) == 1) - { - if (i < 17) // We only have 17 general registers, but if for some reason the file contains more - // we need to read them all, to get to the next set of register values. - m_gpr[i] = value32; - } - else - return false; - } - - /* Load d register state */ - if (fscanf (test_file, "%d", &num_regs) != 1) - return false; - - for (int i = 0; i < num_regs; ++i) - { - if (fscanf (test_file, "%x", &value64) == 1) - { - if (i < 32) - { - if (i < 16) - m_vfp_regs.sd_regs[i].d_reg = value64; - else - m_vfp_regs.d_regs[i - 16] = value64; - } - } - else - return false; - } - - /* Load s register state */ - if (fscanf (test_file, "%d", &num_regs) != 1) - return false; - - for (int i = 0; i < num_regs; ++i) - { - if (fscanf (test_file, "%x", &value32) == 1) - m_vfp_regs.sd_regs[i / 2].s_reg[i % 2] = value32; - else - return false; - } - - return true; -} - -bool -EmulationStateARM::LoadRegisterStatesFromTestFile (FILE *test_file, - EmulationStateARM &before_state, - EmulationStateARM &after_state) -{ - if (test_file) - { - if (before_state.LoadState (test_file)) - return after_state.LoadState (test_file); - } - - return false; -} - -bool EmulationStateARM::CompareState (EmulationStateARM &other_state) { bool match = true; @@ -426,3 +350,93 @@ return match; } + +bool +EmulationStateARM::LoadStateFromDictionary (OptionValueDictionary *test_data) +{ + static ConstString memory_key ("memory"); + static ConstString registers_key ("registers"); + + if (!test_data) + return false; + + OptionValueSP value_sp = test_data->GetValueForKey (memory_key); + + // Load memory, if present. + + if (value_sp.get() != NULL) + { + static ConstString address_key ("address"); + static ConstString data_key ("data"); + uint64_t start_address = 0; + + OptionValueDictionary *mem_dict = value_sp->GetAsDictionaryValue(); + value_sp = mem_dict->GetValueForKey (address_key); + if (value_sp.get() == NULL) + return false; + else + start_address = value_sp->GetUInt64Value (); + + value_sp = mem_dict->GetValueForKey (data_key); + OptionValueArray *mem_array = value_sp->GetAsArrayValue(); + if (!mem_array) + return false; + + uint32_t num_elts = mem_array->GetSize(); + uint32_t address = (uint32_t) start_address; + + for (int i = 0; i < num_elts; ++i) + { + value_sp = mem_array->GetValueAtIndex (i); + if (value_sp.get() == NULL) + return false; + uint64_t value = value_sp->GetUInt64Value(); + StoreToPseudoAddress (address, value, 4); + address = address + 4; + } + } + + value_sp = test_data->GetValueForKey (registers_key); + if (value_sp.get() == NULL) + return false; + + + // Load General Registers + + OptionValueDictionary *reg_dict = value_sp->GetAsDictionaryValue (); + + StreamString sstr; + for (int i = 0; i < 16; ++i) + { + sstr.Clear(); + sstr.Printf ("r%d", i); + ConstString reg_name (sstr.GetData()); + value_sp = reg_dict->GetValueForKey (reg_name); + if (value_sp.get() == NULL) + return false; + uint64_t reg_value = value_sp->GetUInt64Value(); + StorePseudoRegisterValue (dwarf_r0 + i, reg_value); + } + + static ConstString cpsr_name ("cpsr"); + value_sp = reg_dict->GetValueForKey (cpsr_name); + if (value_sp.get() == NULL) + return false; + StorePseudoRegisterValue (dwarf_cpsr, value_sp->GetUInt64Value()); + + // Load s/d Registers + for (int i = 0; i < 32; ++i) + { + sstr.Clear(); + sstr.Printf ("s%d", i); + ConstString reg_name (sstr.GetData()); + value_sp = reg_dict->GetValueForKey (reg_name); + if (value_sp.get() == NULL) + return false; + uint64_t reg_value = value_sp->GetUInt64Value(); + StorePseudoRegisterValue (dwarf_s0 + i, reg_value); + } + + return true; +} + Modified: lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.h?rev=129981&r1=129980&r2=129981&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.h (original) +++ lldb/trunk/source/Plugins/Instruction/ARM/EmulationStateARM.h Fri Apr 22 00:08:45 2011 @@ -14,6 +14,7 @@ #include "lldb/Core/EmulateInstruction.h" #include "lldb/Core/Opcode.h" +#include "lldb/Interpreter/NamedOptionValue.h" namespace lldb_private { @@ -47,11 +48,8 @@ LoadPseudoRegistersFromFrame (StackFrame &frame); bool - LoadState (FILE *test_file); - - static bool - LoadRegisterStatesFromTestFile (FILE *test_file, EmulationStateARM &before_state, EmulationStateARM &after_state); - + LoadStateFromDictionary (OptionValueDictionary *test_data); + bool CompareState (EmulationStateARM &other_state); From ctice at apple.com Fri Apr 22 11:03:05 2011 From: ctice at apple.com (Caroline Tice) Date: Fri, 22 Apr 2011 16:03:05 -0000 Subject: [Lldb-commits] [lldb] r129991 - /lldb/trunk/test/arm_emulation/new-test-files/ Message-ID: <20110422160307.1F8EF2A6C12C@llvm.org> Author: ctice Date: Fri Apr 22 11:03:05 2011 New Revision: 129991 URL: http://llvm.org/viewvc/llvm-project?rev=129991&view=rev Log: Reformat the emulation test data files. Added: lldb/trunk/test/arm_emulation/new-test-files/ lldb/trunk/test/arm_emulation/new-test-files/test-add-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-10-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-11-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-12-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-3-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-4-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-4-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-5-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-5-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-6-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-6-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-7-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-7-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-8-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-8-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-add-9-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-bic-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-bic-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-3-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-4-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-5-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-6-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-7-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-8-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-10-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-11-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-12-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-13-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-14-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-15-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-16-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-17-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-18-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-19-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-20-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-21-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-22-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-23-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-24-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-25-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-26-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-27-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-28-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-29-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-3-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-30-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-31-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-4-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-4-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-5-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-5-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-6-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-6-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-7-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-8-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mov-9-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-moveq-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-movs-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mvn-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mvn-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mvn-3-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-mvn-4-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-pop-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-pop-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-pop-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-pop-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-pop-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-push-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-push-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-push-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-push-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-push-3-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-push-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-str-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-str-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-str-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-str-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-str-3-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-str-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-str-4-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-str-4-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-str-5-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-strb-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-strb-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-strbt-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-strd-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-strt-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-10-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-2-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-3-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-4-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-4-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-5-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-5-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-6-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-6-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-8-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-sub-9-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-subs-1-arm.dat lldb/trunk/test/arm_emulation/new-test-files/test-subs-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-subs-10-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-subs-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-subs-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-subs-4-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-subs-5-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-subs-6-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-subs-8-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-subs-9-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat lldb/trunk/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r0, r0, r15" +triple=arm-apple-darwin +opcode=0xe080000f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00003000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r0, r13, #0" +triple=thumb-apple-darwin +opcode=0xa800 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-10-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-10-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-10-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-10-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add sp, r13" +triple=thumb-apple-darwin +opcode=0x44ed +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x5fbffca0 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-11-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-11-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-11-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-11-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add sp, r15" +triple=thumb-apple-darwin +opcode=0x44fd +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fe02e50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-12-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-12-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-12-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-12-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add sp, r8" +triple=thumb-apple-darwin +opcode=0x44c5 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r0, r13, #0" +triple=arm-apple-darwin +opcode=0xe28d0000 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r0, sp, r0" +triple=thumb-apple-darwin +opcode=0x4468 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-3-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-3-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r0, r1, r0, lsl #2" +triple=arm-apple-darwin +opcode=0xe0810100 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000001 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add.w r10, r13, #31" +triple=thumb-apple-darwin +opcode=0xf10d0a1f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe40 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe40 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe40 +r8=0x00000008 +r9=0x00000009 +r10=0x2fdffe5f +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe40 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-4-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-4-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r0, r2, r7, lsl r1" +triple=arm-apple-darwin +opcode=0xe0820117 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe40 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe40 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x5fbffc82 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe40 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe40 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-4-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-4-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r3, r13, #16" +triple=thumb-apple-darwin +opcode=0xab04 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x2fdffe58 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-5-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-5-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-5-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-5-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r10, r13, #31" +triple=arm-apple-darwin +opcode=0xe28da01f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x2fdffe6f +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-5-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-5-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-5-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-5-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r3, sp, r3" +triple=thumb-apple-darwin +opcode=0x446b +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x2fdffe53 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-6-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-6-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-6-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-6-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r12, r13, #24" +triple=arm-apple-darwin +opcode=0xe28dc018 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x2fdffe68 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-6-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-6-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-6-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-6-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r5, r13, #32" +triple=thumb-apple-darwin +opcode=0xad08 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x2fdffe68 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-7-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-7-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-7-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-7-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add r6, sp, #8" +triple=arm-apple-darwin +opcode=0xe28d6008 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x2fdffe68 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-7-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-7-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-7-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-7-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add sp, #16" +triple=thumb-apple-darwin +opcode=0xb004 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe68 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-8-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-8-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-8-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-8-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add sp, r8" +triple=arm-apple-darwin +opcode=0xe08dd008 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe68 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-8-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-8-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-8-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-8-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add sp, #4" +triple=thumb-apple-darwin +opcode=0xb001 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe5c +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-add-9-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-add-9-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-add-9-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-add-9-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="add sp, r10" +triple=thumb-apple-darwin +opcode=0x44d5 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe5a +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-bic-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-bic-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-bic-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-bic-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="bic r4, r9" +triple=arm-apple-darwin +opcode=0xe1c44009 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-bic-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-bic-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-bic-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-bic-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="bics r4, r6" +triple=thumb-apple-darwin +opcode=0x43b4 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000000 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,119 @@ +InstructionEmulationState={ +assembly_string="ldmia r0!, {r1, r3}" +triple=arm-apple-darwin +opcode=0xe8b0000a +before_state={ +memory={ +address=0x2fdffe50 +data_encoding=uint32_t +data=[ + 0x0 + 0x2e7c +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x0000001f +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x00000000 +r2=0x2fdffe70 +r3=0x00002e7c +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,119 @@ +InstructionEmulationState={ +assembly_string="ldmia r0!, {r1, r3}" +triple=thumb-apple-darwin +opcode=0xc80a +before_state={ +memory={ +address=0x2fdffe40 +data_encoding=uint32_t +data=[ +0x0 +0x2f84 +] +} +registers={ +r0=0x2fdffe40 +r1=0x2fdffe50 +r2=0x2fdffe60 +r3=0x2fdffe70 +r4=0x2fdffe80 +r5=0x2fdffe90 +r6=0x2fdffea0 +r7=0x2fdffe40 +r8=0x2fdffec0 +r9=0x2fdffed0 +r10=0x2fdffee0 +r11=0x2fdffef0 +r12=0x2fdfff00 +r13=0x2fdffe40 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe48 +r1=0x00000000 +r2=0x2fdffe60 +r3=0x00002f84 +r4=0x2fdffe80 +r5=0x2fdffe90 +r6=0x2fdffea0 +r7=0x2fdffe40 +r8=0x2fdffec0 +r9=0x2fdffed0 +r10=0x2fdffee0 +r11=0x2fdffef0 +r12=0x2fdfff00 +r13=0x2fdffe40 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,123 @@ +InstructionEmulationState={ +assembly_string="ldmia r0!, {r2, r4, r6, r8, r10, r12}" +triple=arm-apple-darwin +opcode=0xe8b01554 +before_state={ +memory={ +address=0x2fdffe20 +data_encoding=uint32_t +data=[ +0x0 +0x2e7c +0x1 +0x2fdffe84 +0x0 +0x0 +] +} +registers={ +r0=0x2fdffe20 +r1=0x2fdffe30 +r2=0x2fdffe40 +r3=0x0000001f +r4=0x2fdffe60 +r5=0x2fdffe70 +r6=0x2fdffe80 +r7=0x2fdffe20 +r8=0x2fdffea0 +r9=0x2fdffeb0 +r10=0x2fdffec0 +r11=0x2fdffed0 +r12=0x2fdffee0 +r13=0x2fdffe20 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe38 +r1=0x2fdffe30 +r2=0x00000000 +r3=0x0000001f +r4=0x00002e7c +r5=0x2fdffe70 +r6=0x00000001 +r7=0x2fdffe20 +r8=0x2fdffe84 +r9=0x2fdffeb0 +r10=0x00000000 +r11=0x2fdffed0 +r12=0x00000000 +r13=0x2fdffe20 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,123 @@ +InstructionEmulationState={ +assembly_string="ldmia.w r0!,{r2,r4,r6,r8,r10,r12}" +triple=thumb-apple-darwin +opcode=0xe8b01554 +before_state={ +memory={ +address=0x2fdffe50 +data_encoding=uint32_t +data=[ +0x0 +0x2f80 +0x1 +0x2fdffeac +0x0 +0x0 +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe68 +r1=0x2fdffe60 +r2=0x00000000 +r3=0x2fdffe80 +r4=0x00002f80 +r5=0x2fdffea0 +r6=0x00000001 +r7=0x2fdffe50 +r8=0x2fdffeac +r9=0x2fdffee0 +r10=0x00000000 +r11=0x2fdfff00 +r12=0x00000000 +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,119 @@ +InstructionEmulationState={ +assembly_string="ldmia r14!, {r1, r3}" +triple=arm-apple-darwin +opcode=0xe8be000a +before_state={ +memory={ +address=0x2e7c +data_encoding=uint32_t +data=[ +0xe59fc00c +0xe08fc00c +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x0000001f +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0xe59fc00c +r2=0x2fdffe70 +r3=0xe08fc00c +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e84 +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,119 @@ +InstructionEmulationState={ +assembly_string="ldmia.w r14!, {r1, r3}" +triple=thumb-apple-darwin +opcode=0xe8be000a +before_state={ +memory={ +address=0x2f80 +data_encoding=uint32_t +data=[ +0xe59fc00c +0xe08fc00c +] +} +registers={ +r0=0x2fdffe78 +r1=0x2fdffe88 +r2=0x2fdffe98 +r3=0x2fdffea8 +r4=0x2fdffeb8 +r5=0x2fdffec8 +r6=0x2fdffed8 +r7=0x2fdffe78 +r8=0x2fdffef8 +r9=0x2fdfff08 +r10=0x2fdfff18 +r11=0x2fdfff28 +r12=0x2fdfff38 +r13=0x2fdffe78 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe78 +r1=0xe59fc00c +r2=0x2fdffe98 +r3=0xe08fc00c +r4=0x2fdffeb8 +r5=0x2fdffec8 +r6=0x2fdffed8 +r7=0x2fdffe78 +r8=0x2fdffef8 +r9=0x2fdfff08 +r10=0x2fdfff18 +r11=0x2fdfff28 +r12=0x2fdfff38 +r13=0x2fdffe78 +r14=0x00002f88 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r0, [pc, #+24]" +triple=arm-apple-darwin +opcode=0xe59f0018 +before_state={ +memory={ +address=0x3018 +data_encoding=uint32_t +data=[ +0x3030 +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00003030 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r0, [pc, #12]" +triple=thumb-apple-darwin +opcode=0x4803 +before_state={ +memory={ +address=0x300c +data_encoding=uint32_t +data=[ +0x3024 +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00003024 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr.w r10,[ pc, #4]" +triple=thumb-apple-darwin +opcode=0xf8dfa004 +before_state={ +memory={ +address=0x3000 +data_encoding=uint32_t +data=[ +0x2fe01000 +] +} +registers={ +r0=0x2fdffe48 +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x2fdffe78 +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe48 +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x2fdffe78 +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fe01000 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr.w r8, [pc , #0]" +triple=thumb-apple-darwin +opcode=0xf8df8000 +before_state={ +memory={ +address=0x2ffc +data_encoding=uint32_t +data=[ +0xa0e1defe +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0xa0e1defe +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr.w r9, [pc, #-4]" +triple=thumb-apple-darwin +opcode=0xf85f9004 +before_state={ +memory={ +address=0x2fec +data_encoding=uint32_t +data=[ +0x9004f85f +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x9004f85f +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r0, [pc, #256]" +triple=arm-apple-darwin +opcode=0xe59f0100 +before_state={ +memory={ +address=0x3100 +data_encoding=uint32_t +data=[ +0x0 +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r0, [pc, #+24]" +triple=thumb-apple-darwin +opcode=0x4806 +before_state={ +memory={ +address=0x3018 +data_encoding=uint32_t +data=[ +0x3030 +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00003030 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-3-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-3-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r0, [r13, #+24]" +triple=arm-apple-darwin +opcode=0xe59d0018 +before_state={ +memory={ +address=0x2fdffe70 +data_encoding=uint32_t +data=[ +0x2fdffe80 +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe80 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r0, [pc, #256]" +triple=thumb-apple-darwin +opcode=0x4840 +before_state={ +memory={ +address=0x3100 +data_encoding=uint32_t +data=[ +0x0 +] +} +registers={ +r0=0x2fdffe48 +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x2fdffe78 +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x2fdffe78 +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-4-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-4-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r1, [r5, #16]" +triple=arm-apple-darwin +opcode=0xe5951010 +before_state={ +memory={ +address=0x2fdffeb8 +data_encoding=uint32_t +data=[ +0x7365742d +] +} +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x7365742d +r2=0x2fdffe78 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r0, [r13, #+24]" +triple=thumb-apple-darwin +opcode=0x9806 +before_state={ +memory={ +address=0x2fdffe60 +data_encoding=uint32_t +data=[ +0x2fdffe70 +] +} +registers={ +r0=0x2fdffe48 +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x2fdffe78 +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe70 +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x2fdffe78 +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-5-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-5-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-5-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-5-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r2, [r0]" +triple=arm-apple-darwin +opcode=0xe5902000 +before_state={ +memory={ +address=0x2fdffe60 +data_encoding=uint32_t +data=[ +0x0 +] +} +registers={ +r0=0x2fdffe60 +r1=0x2fdffe70 +r2=0x2fdffe80 +r3=0x0000001f +r4=0x2fdffea0 +r5=0x2fdffeb0 +r6=0x2fdffec0 +r7=0x2fdffe60 +r8=0x2fdffee0 +r9=0x2fdffef0 +r10=0x2fdfff00 +r11=0x2fdfff10 +r12=0x2fdfff20 +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe60 +r1=0x2fdffe70 +r2=0x00000000 +r3=0x0000001f +r4=0x2fdffea0 +r5=0x2fdffeb0 +r6=0x2fdffec0 +r7=0x2fdffe60 +r8=0x2fdffee0 +r9=0x2fdffef0 +r10=0x2fdfff00 +r11=0x2fdfff10 +r12=0x2fdfff20 +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r1, [pc, #0]" +triple=thumb-apple-darwin +opcode=0x4900 +before_state={ +memory={ +address=0x3000 +data_encoding=uint32_t +data=[ +0x2fe01000 +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fe01000 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-6-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-6-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-6-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-6-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r2, [r6], +r8, lsl #2" +triple=arm-apple-darwin +opcode=0xe6962108 +before_state={ +memory={ +address=0x2fdffea8 +data_encoding=uint32_t +data=[ +0x7365742d +] +} +registers={ +r0=0x2fdffe48 +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x0000001f +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe48 +r1=0x2fdffe58 +r2=0x7365742d +r3=0x0000001f +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0xef5ff9c8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r1, [r5, #16]" +triple=thumb-apple-darwin +opcode=0x6929 +before_state={ +memory={ +address=0x2fdffeb0 +data_encoding=uint32_t +data=[ +0x65742d62 +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x65742d62 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-7-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-7-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-7-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-7-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r2, [sp, #24]" +triple=arm-apple-darwin +opcode=0xe59d2018 +before_state={ +memory={ +address=0x2fdffe70 +data_encoding=uint32_t +data=[ +0x0 +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000000 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r2, [r0]" +triple=thumb-apple-darwin +opcode=0x6802 +before_state={ +memory={ +address=0x2fdffe58 +data_encoding=uint32_t +data=[ +0x0 +] +} +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x2fdffe88 +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x00000000 +r3=0x2fdffe88 +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-8-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-8-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-8-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-8-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r3, [r11, #-8]" +triple=arm-apple-darwin +opcode=0xe51b3008 +before_state={ +memory={ +address=0x2fdfff00 +data_encoding=uint32_t +data=[ +0x63387830 +] +} +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x63387830 +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr r2, [sp, #24]" +triple=thumb-apple-darwin +opcode=0x9a06 +before_state={ +memory={ +address=0x2fdffe68 +data_encoding=uint32_t +data=[ +0x2fdffe78 +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe78 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldr.w r3, [r11, #8]" +triple=thumb-apple-darwin +opcode=0xf8db3008 +before_state={ +memory={ +address=0x2fdfff08 +data_encoding=uint32_t +data=[ +0x62343134 +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x62343134 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,119 @@ +InstructionEmulationState={ +assembly_string="ldrd r0, r1, [r12, #+4]" +triple=arm-apple-darwin +opcode=0xe1cc00d4 +before_state={ +memory={ +address=0x2fdfff14 +data_encoding=uint32_t +data=[ +0x30313038 +0x31623039 +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x0000001f +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x30313038 +r1=0x31623039 +r2=0x2fdffe70 +r3=0x0000001f +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,119 @@ +InstructionEmulationState={ +assembly_string="ldrd r0, r1, [r12, #+4]" +triple=thumb-apple-darwin +opcode=0xe9dc0101 +before_state={ +memory={ +address=0x2fdfff3c +data_encoding=uint32_t +data=[ +0x0 +0x0 +] +} +registers={ +r0=0x2fdffe78 +r1=0x2fdffe88 +r2=0x2fdffe98 +r3=0x2fdffea8 +r4=0x2fdffeb8 +r5=0x2fdffec8 +r6=0x2fdffed8 +r7=0x2fdffe78 +r8=0x2fdffef8 +r9=0x2fdfff08 +r10=0x2fdfff18 +r11=0x2fdfff28 +r12=0x2fdfff38 +r13=0x2fdffe78 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000000 +r2=0x2fdffe98 +r3=0x2fdffea8 +r4=0x2fdffeb8 +r5=0x2fdffec8 +r6=0x2fdffed8 +r7=0x2fdffe78 +r8=0x2fdffef8 +r9=0x2fdfff08 +r10=0x2fdfff18 +r11=0x2fdfff28 +r12=0x2fdfff38 +r13=0x2fdffe78 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,119 @@ +InstructionEmulationState={ +assembly_string="ldrd r4, r5, [pc, #-0]" +triple=thumb-apple-darwin +opcode=0xe9df4500 +before_state={ +memory={ +address=0x2ffc +data_encoding=uint32_t +data=[ +0xa0e1defe +0x2fe01000 +] +} +registers={ +r0=0x2fdffe78 +r1=0x2fdffe88 +r2=0x2fdffe98 +r3=0x2fdffea8 +r4=0x2fdffeb8 +r5=0x2fdffec8 +r6=0x2fdffed8 +r7=0x2fdffe78 +r8=0x2fdffef8 +r9=0x2fdfff08 +r10=0x2fdfff18 +r11=0x2fdfff28 +r12=0x2fdfff38 +r13=0x2fdffe78 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe78 +r1=0x2fdffe88 +r2=0x2fdffe98 +r3=0x2fdffea8 +r4=0xa0e1defe +r5=0x2fe01000 +r6=0x2fdffed8 +r7=0x2fdffe78 +r8=0x2fdffef8 +r9=0x2fdfff08 +r10=0x2fdfff18 +r11=0x2fdfff28 +r12=0x2fdfff38 +r13=0x2fdffe78 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldrh r0, [r2, #16]" +triple=thumb-apple-darwin +opcode=0x8a10 +before_state={ +memory={ +address=0x2fdffe78 +data_encoding=uint32_t +data=[ +0x762f +] +} +registers={ +r0=0x2fdffe48 +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x2fdffe78 +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x0000762f +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x2fdffe78 +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldrsh r0, [r2], #+15" +triple=arm-apple-darwin +opcode=0xe0d200ff +before_state={ +memory={ +address=0x2fdffe70 +data_encoding=uint32_t +data=[ +0xfffffeeb +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x0000001f +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0xfffffeeb +r1=0x2fdffe60 +r2=0x2fdffe7f +r3=0x0000001f +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="ldrsh r14, [r2], #+15" +triple=arm-apple-darwin +opcode=0xe0d2e0ff +before_state={ +memory={ +address=0x2fdffe70 +data_encoding=uint32_t +data=[ +0xfffffeec +] +} +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x0000001f +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe7f +r3=0x0000001f +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0xfffffeec +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r12, #256" +triple=arm-apple-darwin +opcode=0xe3a0cc01 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x00000100 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov ip, pc" +triple=thumb-apple-darwin +opcode=0x46fc +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x00003000 +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-10-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-10-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-10-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-10-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r0, r15" +triple=thumb-apple-darwin +opcode=0x4678 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00003000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-11-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-11-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-11-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-11-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r0, r7" +triple=thumb-apple-darwin +opcode=0x4638 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-12-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-12-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-12-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-12-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov.w r12, #256" +triple=thumb-apple-darwin +opcode=0xf44f7c80 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x00000100 +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-13-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-13-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-13-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-13-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r12, r13" +triple=thumb-apple-darwin +opcode=0x46ec +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x2fdffe50 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-14-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-14-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-14-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-14-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r14, r2" +triple=thumb-apple-darwin +opcode=0x4696 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00000002 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-15-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-15-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-15-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-15-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r1, r14" +triple=thumb-apple-darwin +opcode=0x4671 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00002f84 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-16-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-16-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-16-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-16-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r2, ip" +triple=thumb-apple-darwin +opcode=0x4662 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x0000000c +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-17-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-17-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-17-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-17-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r2, r13" +triple=thumb-apple-darwin +opcode=0x466a +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x2fdffe50 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-18-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-18-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-18-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-18-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r2, r9" +triple=thumb-apple-darwin +opcode=0x464a +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000009 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-19-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-19-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-19-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-19-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r3, r12" +triple=thumb-apple-darwin +opcode=0x4663 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000000c +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r12, r13" +triple=arm-apple-darwin +opcode=0xe1a0c00d +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x2fdffe58 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov ip, r8" +triple=thumb-apple-darwin +opcode=0x46c4 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x00000008 +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-20-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-20-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-20-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-20-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r3, r13" +triple=thumb-apple-darwin +opcode=0x466b +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x2fdffe50 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-21-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-21-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-21-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-21-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r3, sp" +triple=thumb-apple-darwin +opcode=0x466b +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x2fdffe58 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-22-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-22-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-22-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-22-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r4, r11" +triple=thumb-apple-darwin +opcode=0x465c +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x0000000b +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-23-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-23-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-23-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-23-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r5, r10" +triple=thumb-apple-darwin +opcode=0x4655 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x0000000a +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-24-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-24-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-24-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-24-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r6, r9" +triple=thumb-apple-darwin +opcode=0x464e +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000009 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-25-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-25-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-25-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-25-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r7, lr" +triple=thumb-apple-darwin +opcode=0x4677 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x00002f84 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-26-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-26-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-26-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-26-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r7, r8" +triple=thumb-apple-darwin +opcode=0x4647 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x00000008 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-27-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-27-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-27-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-27-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r9, pc" +triple=thumb-apple-darwin +opcode=0x46f9 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00003000 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-28-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-28-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-28-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-28-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov sp, ip" +triple=thumb-apple-darwin +opcode=0x46e5 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x0000000c +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-29-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-29-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-29-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-29-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov sp, pc" +triple=thumb-apple-darwin +opcode=0x46fd +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x00003000 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-3-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-3-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r14, r2" +triple=arm-apple-darwin +opcode=0xe1a0e002 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00000002 +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov ip, sp" +triple=thumb-apple-darwin +opcode=0x46ec +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x2fdffe58 +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-30-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-30-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-30-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-30-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov sp, r7" +triple=thumb-apple-darwin +opcode=0x46bd +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-31-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-31-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-31-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-31-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="movs r3, #1" +triple=thumb-apple-darwin +opcode=0x2301 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000001 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x20000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-4-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-4-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r2, r9" +triple=arm-apple-darwin +opcode=0xe1a02009 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000009 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-4-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-4-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov lr, pc" +triple=thumb-apple-darwin +opcode=0x46fe +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00003000 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-5-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-5-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-5-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-5-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r3, #2147483648" +triple=arm-apple-darwin +opcode=0xe3a03102 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe38 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe38 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x80000000 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe38 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe38 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-5-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-5-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-5-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-5-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov lr, r2" +triple=thumb-apple-darwin +opcode=0x4696 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00000002 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-6-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-6-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-6-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-6-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov r3, r13" +triple=arm-apple-darwin +opcode=0xe1a0300d +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x2fdffe60 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-6-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-6-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-6-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-6-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov pc, ip" +triple=thumb-apple-darwin +opcode=0x46e7 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x0000000c +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-7-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-7-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-7-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-7-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov pc, lr" +triple=thumb-apple-darwin +opcode=0x46f7 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002f84 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-8-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-8-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-8-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-8-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov pc, r4" +triple=thumb-apple-darwin +opcode=0x46a7 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00000004 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mov-9-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mov-9-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mov-9-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mov-9-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mov pc, sp" +triple=thumb-apple-darwin +opcode=0x46ef +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x2fdffe58 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-moveq-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-moveq-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-moveq-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-moveq-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="moveq r3, #1" +triple=arm-apple-darwin +opcode=0x3a03001 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000001 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-movs-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-movs-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-movs-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-movs-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="movs r12, r13" +triple=arm-apple-darwin +opcode=0xe1b0c00d +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x2fdffe58 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x20000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mvn-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mvn-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mvn-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mvn-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mvn r14, #1" +triple=arm-apple-darwin +opcode=0xe3e0e001 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0xfffffffe +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mvn r0, #1" +triple=thumb-apple-darwin +opcode=0xf06f0001 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe98 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe98 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0xfffffffe +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe98 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe98 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mvn-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mvn-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mvn-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mvn-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mvn r0, #1" +triple=arm-apple-darwin +opcode=0xe3e00001 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe68 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe68 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0xfffffffe +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe68 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe68 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mvn r0, #31" +triple=thumb-apple-darwin +opcode=0xf06f001f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe90 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe90 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0xffffffe0 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe90 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe90 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mvn-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mvn-3-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mvn-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mvn-3-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mvn r0, #31" +triple=arm-apple-darwin +opcode=0xe3e0001f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0xffffffe0 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mvn r14, #1" +triple=thumb-apple-darwin +opcode=0xf06f0e01 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe90 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe90 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe90 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe90 +r14=0xfffffffe +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mvn-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mvn-4-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mvn-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mvn-4-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mvn r3, r8" +triple=arm-apple-darwin +opcode=0xe1e03008 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0xfffffff7 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="mvns r3, r8" +triple=thumb-apple-darwin +opcode=0xea7f0308 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe90 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe90 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0xfffffff7 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe90 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe90 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0xa0000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-pop-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-pop-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-pop-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-pop-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,121 @@ +InstructionEmulationState={ +assembly_string="pop {r3, r4, r8, r10}" +triple=arm-apple-darwin +opcode=0xe8bd0518 +before_state={ +memory={ +address=0x2fdffe50 +data_encoding=uint32_t +data=[ +0x0 +0x2e7c +0x1 +0x2fdffeac +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000000 +r4=0x00002e7c +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000001 +r9=0x00000009 +r10=0x2fdffeac +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-pop-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-pop-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-pop-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-pop-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,121 @@ +InstructionEmulationState={ +assembly_string="pop.w {r3, r4, r8, r10}" +triple=thumb-apple-darwin +opcode=0xe8bd0518 +before_state={ +memory={ +address=0x2fdffe38 +data_encoding=uint32_t +data=[ +0x0 +0x2f80 +0x1000 +0x1 +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe38 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe38 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000000 +r4=0x00002f80 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe38 +r8=0x00001000 +r9=0x00000009 +r10=0x00000001 +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-pop-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-pop-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-pop-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-pop-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="pop {r9}" +triple=arm-apple-darwin +opcode=0xe8bd0200 +before_state={ +memory={ +address=0x2fdffe70 +data_encoding=uint32_t +data=[ +0x0 +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe70 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe70 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe70 +r8=0x00000008 +r9=0x00000000 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe74 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-pop-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-pop-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-pop-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-pop-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="pop {r3}" +triple=thumb-apple-darwin +opcode=0xbc08 +before_state={ +memory={ +address=0x2fdffe60 +data_encoding=uint32_t +data=[ +0x0 +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000000 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe64 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-pop-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-pop-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-pop-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-pop-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="pop {r6}" +triple=thumb-apple-darwin +opcode=0xbc40 +before_state={ +memory={ +address=0x2fdffe60 +data_encoding=uint32_t +data=[ +0x0 +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000000 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe64 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-push-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-push-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-push-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-push-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="push {r0, r1, r2, r3, r7, r14}" +triple=arm-apple-darwin +opcode=0xe92d408f +before_state={ +registers={ +r0=0x2fdffe30 +r1=0x2fdffe40 +r2=0x2fdffe50 +r3=0x0000001f +r4=0x2fdffe70 +r5=0x2fdffe80 +r6=0x2fdffe90 +r7=0x2fdffe30 +r8=0x2fdffeb0 +r9=0x2fdffec0 +r10=0x2fdffed0 +r11=0x2fdffee0 +r12=0x2fdffef0 +r13=0x2fdffe30 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe30 +r1=0x2fdffe40 +r2=0x2fdffe50 +r3=0x0000001f +r4=0x2fdffe70 +r5=0x2fdffe80 +r6=0x2fdffe90 +r7=0x2fdffe30 +r8=0x2fdffeb0 +r9=0x2fdffec0 +r10=0x2fdffed0 +r11=0x2fdffee0 +r12=0x2fdffef0 +r13=0x2fdffe18 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-push-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-push-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-push-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-push-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="push {r0, r1, r2, r3, r7, r14}" +triple=thumb-apple-darwin +opcode=0xb58f +before_state={ +registers={ +r0=0x2fdffe28 +r1=0x2fdffe38 +r2=0x2fdffe48 +r3=0x2fdffe58 +r4=0x2fdffe68 +r5=0x2fdffe78 +r6=0x2fdffe88 +r7=0x2fdffe28 +r8=0x2fdffea8 +r9=0x2fdffeb8 +r10=0x2fdffec8 +r11=0x2fdffed8 +r12=0x2fdffee8 +r13=0x2fdffe28 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe28 +r1=0x2fdffe38 +r2=0x2fdffe48 +r3=0x2fdffe58 +r4=0x2fdffe68 +r5=0x2fdffe78 +r6=0x2fdffe88 +r7=0x2fdffe28 +r8=0x2fdffea8 +r9=0x2fdffeb8 +r10=0x2fdffec8 +r11=0x2fdffed8 +r12=0x2fdffee8 +r13=0x2fdffe10 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-push-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-push-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-push-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-push-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="push {r6}" +triple=arm-apple-darwin +opcode=0xe92d0040 +before_state={ +registers={ +r0=0x2fdffe68 +r1=0x2fdffe78 +r2=0x2fdffe88 +r3=0x0000001f +r4=0x2fdffea8 +r5=0x2fdffeb8 +r6=0x2fdffec8 +r7=0x2fdffe68 +r8=0x2fdffee8 +r9=0x2fdffef8 +r10=0x2fdfff08 +r11=0x2fdfff18 +r12=0x2fdfff28 +r13=0x2fdffe68 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe68 +r1=0x2fdffe78 +r2=0x2fdffe88 +r3=0x0000001f +r4=0x2fdffea8 +r5=0x2fdffeb8 +r6=0x2fdffec8 +r7=0x2fdffe68 +r8=0x2fdffee8 +r9=0x2fdffef8 +r10=0x2fdfff08 +r11=0x2fdfff18 +r12=0x2fdfff28 +r13=0x2fdffe64 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-push-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-push-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-push-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-push-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="push {r6}" +triple=thumb-apple-darwin +opcode=0xb440 +before_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x2fdffe88 +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x2fdffe88 +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe54 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-push-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-push-3-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-push-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-push-3-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="push {r7, r14}" +triple=arm-apple-darwin +opcode=0xe92d4080 +before_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-push-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-push-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-push-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-push-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="push {r7, r14}" +triple=thumb-apple-darwin +opcode=0xb580 +before_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-str-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-str-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-str-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-str-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="str r0, [r13]" +triple=arm-apple-darwin +opcode=0xe58d0000 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-str-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-str-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-str-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-str-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="str r0, [r13]" +triple=thumb-apple-darwin +opcode=0x9000 +before_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-str-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-str-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-str-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-str-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="str r1, [r0, #+4]" +triple=arm-apple-darwin +opcode=0xe5801004 +before_state={ +registers={ +r0=0x2fdffe60 +r1=0x2fdffe70 +r2=0x2fdffe80 +r3=0x0000001f +r4=0x2fdffea0 +r5=0x2fdffeb0 +r6=0x2fdffec0 +r7=0x2fdffe60 +r8=0x2fdffee0 +r9=0x2fdffef0 +r10=0x2fdfff00 +r11=0x2fdfff10 +r12=0x2fdfff20 +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe60 +r1=0x2fdffe70 +r2=0x2fdffe80 +r3=0x0000001f +r4=0x2fdffea0 +r5=0x2fdffeb0 +r6=0x2fdffec0 +r7=0x2fdffe60 +r8=0x2fdffee0 +r9=0x2fdffef0 +r10=0x2fdfff00 +r11=0x2fdfff10 +r12=0x2fdfff20 +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-str-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-str-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-str-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-str-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="str r0, [sp, #0]" +triple=thumb-apple-darwin +opcode=0x9000 +before_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-str-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-str-3-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-str-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-str-3-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="str r2, [r0]" +triple=arm-apple-darwin +opcode=0xe5802000 +before_state={ +registers={ +r0=0x2fdffe60 +r1=0x2fdffe70 +r2=0x2fdffe80 +r3=0x0000001f +r4=0x2fdffea0 +r5=0x2fdffeb0 +r6=0x2fdffec0 +r7=0x2fdffe60 +r8=0x2fdffee0 +r9=0x2fdffef0 +r10=0x2fdfff00 +r11=0x2fdfff10 +r12=0x2fdfff20 +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe60 +r1=0x2fdffe70 +r2=0x2fdffe80 +r3=0x0000001f +r4=0x2fdffea0 +r5=0x2fdffeb0 +r6=0x2fdffec0 +r7=0x2fdffe60 +r8=0x2fdffee0 +r9=0x2fdffef0 +r10=0x2fdfff00 +r11=0x2fdfff10 +r12=0x2fdfff20 +r13=0x2fdffe60 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-str-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-str-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-str-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-str-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="str r1, [sp, #32]" +triple=thumb-apple-darwin +opcode=0x9108 +before_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x2fdffe80 +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-str-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-str-4-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-str-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-str-4-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="str r2, [r13, #+4]" +triple=arm-apple-darwin +opcode=0xe58d2004 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-str-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-str-4-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-str-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-str-4-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="str.w r7, [r13, #-12]!" +triple=thumb-apple-darwin +opcode=0xf84d7d0c +before_state={ +registers={ +r0=0x2fdffe48 +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x2fdffe78 +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe48 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe48 +r1=0x2fdffe58 +r2=0x2fdffe68 +r3=0x2fdffe78 +r4=0x2fdffe88 +r5=0x2fdffe98 +r6=0x2fdffea8 +r7=0x2fdffe48 +r8=0x2fdffec8 +r9=0x2fdffed8 +r10=0x2fdffee8 +r11=0x2fdffef8 +r12=0x2fdfff08 +r13=0x2fdffe3c +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-str-5-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-str-5-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-str-5-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-str-5-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="str r7, [r13, #-12]!" +triple=arm-apple-darwin +opcode=0xe52d700c +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe4c +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-strb-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-strb-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-strb-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-strb-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="strb r0, [r2], #+15" +triple=arm-apple-darwin +opcode=0xe4c2000f +before_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe87 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-strb-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-strb-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-strb-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-strb-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="strb r3, [r0, #+8]" +triple=arm-apple-darwin +opcode=0xe5c03008 +before_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-strbt-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-strbt-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-strbt-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-strbt-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="strbt r14, [r2], #+15" +triple=arm-apple-darwin +opcode=0xe4e2e00f +before_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe70 +r3=0x0000001f +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x2fdffe60 +r2=0x2fdffe7f +r3=0x0000001f +r4=0x2fdffe90 +r5=0x2fdffea0 +r6=0x2fdffeb0 +r7=0x2fdffe50 +r8=0x2fdffed0 +r9=0x2fdffee0 +r10=0x2fdffef0 +r11=0x2fdfff00 +r12=0x2fdfff10 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-strd-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-strd-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-strd-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-strd-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="strd r10, r11, [r6, #+28]" +triple=thumb-apple-darwin +opcode=0xe9c6ab07 +before_state={ +registers={ +r0=0x2fdffe70 +r1=0x2fdffe80 +r2=0x2fdffe90 +r3=0x2fdffea0 +r4=0x2fdffeb0 +r5=0x2fdffec0 +r6=0x2fdffed0 +r7=0x2fdffe70 +r8=0x2fdffef0 +r9=0x2fdfff00 +r10=0x2fdfff10 +r11=0x2fdfff20 +r12=0x2fdfff30 +r13=0x2fdffe70 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe70 +r1=0x2fdffe80 +r2=0x2fdffe90 +r3=0x2fdffea0 +r4=0x2fdffeb0 +r5=0x2fdffec0 +r6=0x2fdffed0 +r7=0x2fdffe70 +r8=0x2fdffef0 +r9=0x2fdfff00 +r10=0x2fdfff10 +r11=0x2fdfff20 +r12=0x2fdfff30 +r13=0x2fdffe70 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-strt-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-strt-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-strt-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-strt-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="strt r0, [r2], #+15" +triple=arm-apple-darwin +opcode=0xe4a2000f +before_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe78 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe58 +r1=0x2fdffe68 +r2=0x2fdffe87 +r3=0x0000001f +r4=0x2fdffe98 +r5=0x2fdffea8 +r6=0x2fdffeb8 +r7=0x2fdffe58 +r8=0x2fdffed8 +r9=0x2fdffee8 +r10=0x2fdffef8 +r11=0x2fdfff08 +r12=0x2fdfff18 +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub r0, sp, r8" +triple=arm-apple-darwin +opcode=0xe04d0008 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x2fdffe50 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub.w r10, sp, #16" +triple=thumb-apple-darwin +opcode=0xf1ad0a10 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe40 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe40 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe40 +r8=0x00000008 +r9=0x00000009 +r10=0x2fdffe30 +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe40 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-10-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-10-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-10-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-10-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub r7, r12, #8" +triple=arm-apple-darwin +opcode=0xe24c7008 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x00000004 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-2-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-2-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-2-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-2-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub r10, r12, #31" +triple=arm-apple-darwin +opcode=0xe24ca01f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0xffffffed +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub.w r10, sp, #31" +triple=thumb-apple-darwin +opcode=0xf1ad0a1f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe40 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe40 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe40 +r8=0x00000008 +r9=0x00000009 +r10=0x2fdffe21 +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe40 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-3-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-3-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-3-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-3-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub r12, r13, #12" +triple=arm-apple-darwin +opcode=0xe24dc00c +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x2fdffe44 +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub.w r12, sp, #31" +triple=thumb-apple-darwin +opcode=0xf1ad0c1f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe40 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe40 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe40 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x2fdffe21 +r13=0x2fdffe40 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-4-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-4-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-4-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-4-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub r13, r13, #24" +triple=arm-apple-darwin +opcode=0xe24dd018 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe38 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-4-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-4-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub.w r1, sp, r3, lsl #2" +triple=thumb-apple-darwin +opcode=0xebad0183 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe30 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe30 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x2fdffe24 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe30 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe30 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-5-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-5-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-5-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-5-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub r13, r13, #4" +triple=arm-apple-darwin +opcode=0xe24dd004 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe54 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-5-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-5-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-5-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-5-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub.w r7, sp, #1" +triple=thumb-apple-darwin +opcode=0xf1ad0701 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe4f +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-6-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-6-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-6-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-6-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub r1, r13, #4" +triple=arm-apple-darwin +opcode=0xe24d1004 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x2fdffe54 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-6-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-6-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-6-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-6-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub.w sp, sp, #4" +triple=thumb-apple-darwin +opcode=0xf1ad0d04 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe4c +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-8-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-8-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-8-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-8-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub r2, r2, r3" +triple=arm-apple-darwin +opcode=0xe0422003 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0xffffffe3 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-sub-9-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-sub-9-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-sub-9-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-sub-9-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="sub r4, r12, r7" +triple=arm-apple-darwin +opcode=0xe04c4007 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0xd02001b4 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe58 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe58 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-subs-1-arm.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-subs-1-arm.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-subs-1-arm.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-subs-1-arm.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="subs r10, r13, #31" +triple=arm-apple-darwin +opcode=0xe25da01f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ff8 +cpsr=0x60000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x0000001f +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x2fdffe31 +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002e7c +r15=0x00002ffc +cpsr=0x20000010 +s0=0x00000000 +s1=0x00000001 +s2=0x00000002 +s3=0x00000003 +s4=0x00000004 +s5=0x00000005 +s6=0x00000006 +s7=0x00000007 +s8=0x00000008 +s9=0x00000009 +s10=0x0000000a +s11=0x0000000b +s12=0x0000000c +s13=0x0000000d +s14=0x0000000e +s15=0x0000000f +s16=0x00000010 +s17=0x00000011 +s18=0x00000012 +s19=0x00000013 +s20=0x00000014 +s21=0x00000015 +s22=0x00000016 +s23=0x00000017 +s24=0x00000018 +s25=0x00000019 +s26=0x0000001a +s27=0x0000001b +s28=0x0000001c +s29=0x0000001d +s30=0x0000001e +s31=0x0000001f +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-subs-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-subs-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-subs-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-subs-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="subs r0, r6, #0" +triple=thumb-apple-darwin +opcode=0x1e30 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000006 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x20000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-subs-10-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-subs-10-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-subs-10-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-subs-10-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="subs.w r1, sp, #4" +triple=thumb-apple-darwin +opcode=0xf1bd0104 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x2fdffe44 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x20000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-subs-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-subs-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-subs-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-subs-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="subs r0, r7, r5" +triple=thumb-apple-darwin +opcode=0x1b78 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x2fdffe43 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x20000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-subs-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-subs-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-subs-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-subs-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="subs.w r10, r13, #31" +triple=thumb-apple-darwin +opcode=0xf1bd0a1f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe38 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe38 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe38 +r8=0x00000008 +r9=0x00000009 +r10=0x2fdffe19 +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe38 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x20000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-subs-4-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-subs-4-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-subs-4-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-subs-4-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="subs r1, r3, #4" +triple=thumb-apple-darwin +opcode=0x1f19 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0xffffffff +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x80000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-subs-5-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-subs-5-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-subs-5-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-subs-5-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="subs r4, r2, r6" +triple=thumb-apple-darwin +opcode=0x1b94 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0xfffffffc +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe48 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe48 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x80000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-subs-6-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-subs-6-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-subs-6-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-subs-6-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="subs r7, r5, #7" +triple=thumb-apple-darwin +opcode=0x1fef +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe50 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0xfffffffe +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f84 +r15=0x00002ffe +cpsr=0x80000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-subs-8-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-subs-8-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-subs-8-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-subs-8-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="subs.w r10, r13, #31" +triple=thumb-apple-darwin +opcode=0xf1bd0a1f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe38 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe38 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe38 +r8=0x00000008 +r9=0x00000009 +r10=0x2fdffe19 +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe38 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x20000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-subs-9-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-subs-9-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-subs-9-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-subs-9-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="subs.w r10, sp, #31" +triple=thumb-apple-darwin +opcode=0xf1bd0a1f +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe38 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe38 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe38 +r8=0x00000008 +r9=0x00000009 +r10=0x2fdffe19 +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe38 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x20000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,125 @@ +InstructionEmulationState={ +assembly_string="vpop {d11, d12, d13, d14}" +triple=thumb-apple-darwin +opcode=0xecbdbb08 +before_state={ +memory={ +address=0x2fdffe60 +data_encoding=uint32_t +data=[ +0x0 +0x2f80 +0x1000 +0x1 +0x2fdffebc +0x0 +0x0 +0x2fdffe8c +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe80 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00002f80 +s24=0x00001000 +s25=0x00000001 +s26=0x2fdffebc +s27=0x00000000 +s28=0x00000000 +s29=0x2fdffe8c +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,118 @@ +InstructionEmulationState={ +assembly_string="vpop {s0}" +triple=thumb-apple-darwin +opcode=0xecbd0a01 +before_state={ +memory={ +address=0x2fdffe98 +data_encoding=uint32_t +data=[ +0x0 +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe98 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe98 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe98 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe9c +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,121 @@ +InstructionEmulationState={ +assembly_string="vpop {s11, s12, s13, s14}" +triple=thumb-apple-darwin +opcode=0xecfd5a04 +before_state={ +memory={ +address=0x2fdffe60 +data_encoding=uint32_t +data=[ +0x0 +0x2f80 +0x1000 +0x1 +] +} +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe70 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00002f80 +s13=0x00001000 +s14=0x00000001 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="vpush {d11, d12, d13, d14}" +triple=thumb-apple-darwin +opcode=0xed2dbb08 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe40 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="vpush {s0}" +triple=thumb-apple-darwin +opcode=0xed2d0a01 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe90 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe90 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe90 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe8c +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} Added: lldb/trunk/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat?rev=129991&view=auto ============================================================================== --- lldb/trunk/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat (added) +++ lldb/trunk/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat Fri Apr 22 11:03:05 2011 @@ -0,0 +1,111 @@ +InstructionEmulationState={ +assembly_string="vpush {s11, s12, s13, s14}" +triple=thumb-apple-darwin +opcode=0xed6d5a04 +before_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe60 +r14=0x00002f80 +r15=0x00002ff8 +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +after_state={ +registers={ +r0=0x00000000 +r1=0x00000001 +r2=0x00000002 +r3=0x00000003 +r4=0x00000004 +r5=0x00000005 +r6=0x00000006 +r7=0x2fdffe60 +r8=0x00000008 +r9=0x00000009 +r10=0x0000000a +r11=0x0000000b +r12=0x0000000c +r13=0x2fdffe50 +r14=0x00002f80 +r15=0x00002ffc +cpsr=0x60000030 +s0=0x00000000 +s1=0x00000000 +s2=0x00000000 +s3=0x00000000 +s4=0x00000000 +s5=0x00000000 +s6=0x00000000 +s7=0x00000000 +s8=0x00000000 +s9=0x00000000 +s10=0x00000000 +s11=0x00000000 +s12=0x00000000 +s13=0x00000000 +s14=0x00000000 +s15=0x00000000 +s16=0x00000000 +s17=0x00000000 +s18=0x00000000 +s19=0x00000000 +s20=0x00000000 +s21=0x00000000 +s22=0x00000000 +s23=0x00000000 +s24=0x00000000 +s25=0x00000000 +s26=0x00000000 +s27=0x00000000 +s28=0x00000000 +s29=0x00000000 +s30=0x00000000 +s31=0x00000000 +} +} +} From ctice at apple.com Fri Apr 22 11:05:13 2011 From: ctice at apple.com (Caroline Tice) Date: Fri, 22 Apr 2011 16:05:13 -0000 Subject: [Lldb-commits] [lldb] r129992 - /lldb/trunk/test/arm_emulation/TestEmulations.py Message-ID: <20110422160513.817592A6C12C@llvm.org> Author: ctice Date: Fri Apr 22 11:05:13 2011 New Revision: 129992 URL: http://llvm.org/viewvc/llvm-project?rev=129992&view=rev Log: Modify to use the new test files. Modified: lldb/trunk/test/arm_emulation/TestEmulations.py Modified: lldb/trunk/test/arm_emulation/TestEmulations.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/arm_emulation/TestEmulations.py?rev=129992&r1=129991&r2=129992&view=diff ============================================================================== --- lldb/trunk/test/arm_emulation/TestEmulations.py (original) +++ lldb/trunk/test/arm_emulation/TestEmulations.py Fri Apr 22 11:05:13 2011 @@ -13,7 +13,7 @@ def test_thumb_emulations (self): current_dir = os.getcwd(); - test_dir = os.path.join (current_dir, "test-files") + test_dir = os.path.join (current_dir, "new-test-files") files = os.listdir (test_dir) thumb_files = list() for f in files: @@ -27,7 +27,7 @@ def test_arm_emulations (self): current_dir = os.getcwd(); - test_dir = os.path.join (current_dir, "test-files") + test_dir = os.path.join (current_dir, "new-test-files") files = os.listdir (test_dir) arm_files = list() for f in files: From ctice at apple.com Fri Apr 22 11:29:23 2011 From: ctice at apple.com (Caroline Tice) Date: Fri, 22 Apr 2011 16:29:23 -0000 Subject: [Lldb-commits] [lldb] r129993 - /lldb/trunk/test/arm_emulation/test-files/ Message-ID: <20110422162923.8ED242A6C12C@llvm.org> Author: ctice Date: Fri Apr 22 11:29:23 2011 New Revision: 129993 URL: http://llvm.org/viewvc/llvm-project?rev=129993&view=rev Log: Remove old emulation test data files. Removed: lldb/trunk/test/arm_emulation/test-files/ From johnny.chen at apple.com Fri Apr 22 15:40:26 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Fri, 22 Apr 2011 20:40:26 -0000 Subject: [Lldb-commits] [lldb] r130011 - /lldb/trunk/test/class_types/TestClassTypesDisassembly.py Message-ID: <20110422204027.060DC2A6C12C@llvm.org> Author: johnny Date: Fri Apr 22 15:40:26 2011 New Revision: 130011 URL: http://llvm.org/viewvc/llvm-project?rev=130011&view=rev Log: Fix a typo. Modified: lldb/trunk/test/class_types/TestClassTypesDisassembly.py Modified: lldb/trunk/test/class_types/TestClassTypesDisassembly.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/class_types/TestClassTypesDisassembly.py?rev=130011&r1=130010&r2=130011&view=diff ============================================================================== --- lldb/trunk/test/class_types/TestClassTypesDisassembly.py (original) +++ lldb/trunk/test/class_types/TestClassTypesDisassembly.py Fri Apr 22 15:40:26 2011 @@ -97,7 +97,7 @@ frame = thread.GetFrameAtIndex(i) function = frame.GetFunction() # Print the function header. - if self.traceOn(): + if self.TraceOn(): print print function if function.IsValid(): From gclayton at apple.com Fri Apr 22 15:58:45 2011 From: gclayton at apple.com (Greg Clayton) Date: Fri, 22 Apr 2011 20:58:45 -0000 Subject: [Lldb-commits] [lldb] r130013 - /lldb/trunk/source/Interpreter/CommandInterpreter.cpp Message-ID: <20110422205845.A99692A6C12C@llvm.org> Author: gclayton Date: Fri Apr 22 15:58:45 2011 New Revision: 130013 URL: http://llvm.org/viewvc/llvm-project?rev=130013&view=rev Log: Erase from a string instead of using substr when you don't really need to. Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=130013&r1=130012&r2=130013&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original) +++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Fri Apr 22 15:58:45 2011 @@ -956,7 +956,7 @@ std::string white_space (" \t\v"); size_t pos = remainder.find_first_not_of (white_space); if (pos != 0 && pos != std::string::npos) - remainder = remainder.substr (pos); + remainder.erase(0, pos); if (log) log->Printf ("HandleCommand, command line after removing command name(s): '%s'\n", remainder.c_str()); From gclayton at apple.com Fri Apr 22 16:03:41 2011 From: gclayton at apple.com (Greg Clayton) Date: Fri, 22 Apr 2011 21:03:41 -0000 Subject: [Lldb-commits] [lldb] r130014 - in /lldb/trunk/www: blog.html sidebar.incl Message-ID: <20110422210341.2E4612A6C12C@llvm.org> Author: gclayton Date: Fri Apr 22 16:03:40 2011 New Revision: 130014 URL: http://llvm.org/viewvc/llvm-project?rev=130014&view=rev Log: Reroute the blog link to the LLVM blog site. Removed: lldb/trunk/www/blog.html Modified: lldb/trunk/www/sidebar.incl Removed: lldb/trunk/www/blog.html URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/www/blog.html?rev=130013&view=auto ============================================================================== --- lldb/trunk/www/blog.html (original) +++ lldb/trunk/www/blog.html (removed) @@ -1,128 +0,0 @@ - - - - - -LLDB FAQ - - - -
    - The LLDB Debugger -
    - -
    -
    - - -
    -
    -

    April 20, 2011  
    Regular Expression Commands

    -
    -

    Greetings LLDB users. I want to start writing regular blog posts - for the new and cool features and things you can do in LLDB. Today I - will start with one that was just added: regular expression commands. - What is a regular expression command? It is a command that you can - define by giving it a command name, where the command will have its raw arguments be - matched against one or more regular expressions. The first regular - expression to match your command's raw arguments wins and gets to - use substitutions to place argument snippets into a new command that - will get executed.

    - -

    Lets supposed we want to use the "f" as a command to - select a frame by frame index. The command to select a frame by the - frame index is the "frame select <num>" command - which you might not always want to type out (even with out command - completion). - We can make this a bit easier this using a regular expression command: -

    - (lldb) command regex f 's/([0-9]+)/frame select %1/' -

    - -

    "command regex f" tells the interpreter to create a new - regex command named "f", and when a command is entered - on the command line that starts with "f", it will match - the remaining command text against the regular expression - "([0-9]+)", and it if matches, it will substitute any - parenthesized subexpressions as needed. Here we enclosed the number - regular expression "[0-9]+" in parentheses which will - save the results in the first match and allow the matching string - to be substitued into the result "frame select %1". - So now we can use our new command and it will show us what command - resulted from our regular expression substitution: -

    -

    - (lldb) f 12
    - frame select 12 -
    -

    -

    Leading spaces will always be stripped, but there may be trailing spaces - since we are processing the remaining raw command string that follows - the initial f command name, plus any leading spaces. The regular expression - is also just looking for any sequence of one or more digits. Our - current regular expression will actually match "f 11 22 33": -

    - (lldb) f 11 22 33
    - frame select 11 -
    -

    - Since this isn't desired, we should make the regular expression more complete by checking for - the start of the line (^) and the end of the line ($) - and also allow for zero or more spaces ([[:space:]]*) - to come after the number. Our newer and safer regular expression command line looks like: -

    - (lldb) command regex f 's/^([0-9]+)[[:space:]]*$/frame select %1/' -

    -

    Now we can type in a command as "f 12 " (note the trailing - spaces), and still get correct substitutions, while our previous - example of "f 11 22 33" will no longer match: -

    - (lldb) f 11 22 33
    - error: Command contents '11 22 33' failed to match any regular expression in the 'f' regex command. -
    -

    Lets take this a bit further by also using the f command - to emulate GDB's finish command when it is typed without - any arguments. We will also modify this command to watch for a single - "+" or "-" followed by a digit to signify a relative frame change - using the frame select command with the --relative option: -

    -

    - (lldb) frame select --relative <offset> -

    - Multiple regular expressions can be entered in on the command line - or using the multi-line mode when typing in a live LLDB debug session. - Below the text in bold is user entered: -

    - - (lldb) commands regex f
    - Enter regular expressions in the form 's/<regex>/<subst>/' and terminate with an empty line:
    - s/^([0-9]+)[[:space:]]*$/frame select %1/
    - s/^([+-][0-9]+)[[:space:]]*$/frame select --relative=%1/
    - s/^[[:space:]]*$/finish/

    -
    - (lldb) f
    - finish
    - ...
    - (lldb) f -1
    - frame select --relative=-1
    - ...
    - (lldb) f +1
    - frame select --relative=+1
    - ...
    - (lldb) f 12
    - frame select 12
    -
    -

    -

    I hope you can see the possilbities in how you can customize your - command line experience in LLDB using these commands. You can add - any regular expression commands to your ~/.lldbinit file to - always have your regular expression commands defined in your debug - sessions. - -

    - -
    -
    -
    - - \ No newline at end of file Modified: lldb/trunk/www/sidebar.incl URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/www/sidebar.incl?rev=130014&r1=130013&r2=130014&view=diff ============================================================================== --- lldb/trunk/www/sidebar.incl (original) +++ lldb/trunk/www/sidebar.incl Fri Apr 22 16:03:40 2011 @@ -4,7 +4,7 @@

    Goals and Status

    • About
    • -
    • Blog
    • +
    • Blog
    • Goals
    • Features
    • Status
    • From johnny.chen at apple.com Fri Apr 22 16:47:08 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Fri, 22 Apr 2011 21:47:08 -0000 Subject: [Lldb-commits] [lldb] r130015 - in /lldb/trunk/test: command_regex/TestCommandRegex.py connect_remote/TestConnectRemote.py Message-ID: <20110422214708.19BA12A6C12C@llvm.org> Author: johnny Date: Fri Apr 22 16:47:07 2011 New Revision: 130015 URL: http://llvm.org/viewvc/llvm-project?rev=130015&view=rev Log: Make test_connect_remote() more robust by waiting on the server ready message before issuing the 'process connect ...' command. test_comand_regex(): assign the spawned child to self.child so it gets automatically shutdown during TestBase.tearDown(self). Modified: lldb/trunk/test/command_regex/TestCommandRegex.py lldb/trunk/test/connect_remote/TestConnectRemote.py Modified: lldb/trunk/test/command_regex/TestCommandRegex.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/command_regex/TestCommandRegex.py?rev=130015&r1=130014&r2=130015&view=diff ============================================================================== --- lldb/trunk/test/command_regex/TestCommandRegex.py (original) +++ lldb/trunk/test/command_regex/TestCommandRegex.py Fri Apr 22 16:47:07 2011 @@ -22,6 +22,8 @@ # Turn on logging for what the child sends back. if self.TraceOn(): child.logfile_read = sys.stdout + # So that the spawned lldb session gets shutdown durng teardown. + self.child = child # Substitute 'Help!' with 'help' using the 'commands regex' mechanism. child.expect(prompt) @@ -33,7 +35,7 @@ # Help! child.sendline('Help!') # If we see the familiar 'help' output, the test is done. - child.expect('The following is a list of built-in, permanent debugger commands:') + child.expect('The following is a list of built-in, permanent debugger commands:') if __name__ == '__main__': import atexit Modified: lldb/trunk/test/connect_remote/TestConnectRemote.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/connect_remote/TestConnectRemote.py?rev=130015&r1=130014&r2=130015&view=diff ============================================================================== --- lldb/trunk/test/connect_remote/TestConnectRemote.py (original) +++ lldb/trunk/test/connect_remote/TestConnectRemote.py Fri Apr 22 16:47:07 2011 @@ -2,9 +2,10 @@ Test lldb 'process connect' command. """ -import os, time +import os import unittest2 import lldb +import pexpect from lldbtest import * class ConnectRemoteTestCase(TestBase): @@ -16,14 +17,21 @@ """Test "process connect connect:://localhost:12345".""" # First, we'll start a fake debugserver (a simple echo server). - import subprocess - fakeserver = subprocess.Popen('./EchoServer.py') - # This does the cleanup afterwards. - def cleanup_fakeserver(): - fakeserver.kill() - fakeserver.wait() - self.addTearDownHook(cleanup_fakeserver) + fakeserver = pexpect.spawn('./EchoServer.py') + # Turn on logging for what the child sends back. + if self.TraceOn(): + fakeserver.logfile = sys.stdout + + # Schedule the fake debugserver to be shut down during teardown. + def shutdown_fakeserver(): + fakeserver.close() + self.addTearDownHook(shutdown_fakeserver) + + # Wait until we receive the server ready message before continuing. + fakeserver.expect('Listening on localhost:12345') + + # Connect to the fake server.... self.runCmd("process connect connect://localhost:12345") From johnny.chen at apple.com Fri Apr 22 16:50:08 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Fri, 22 Apr 2011 21:50:08 -0000 Subject: [Lldb-commits] [lldb] r130016 - /lldb/trunk/test/connect_remote/TestConnectRemote.py Message-ID: <20110422215008.678BB2A6C12C@llvm.org> Author: johnny Date: Fri Apr 22 16:50:08 2011 New Revision: 130016 URL: http://llvm.org/viewvc/llvm-project?rev=130016&view=rev Log: Fix comment. Modified: lldb/trunk/test/connect_remote/TestConnectRemote.py Modified: lldb/trunk/test/connect_remote/TestConnectRemote.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/connect_remote/TestConnectRemote.py?rev=130016&r1=130015&r2=130016&view=diff ============================================================================== --- lldb/trunk/test/connect_remote/TestConnectRemote.py (original) +++ lldb/trunk/test/connect_remote/TestConnectRemote.py Fri Apr 22 16:50:08 2011 @@ -23,7 +23,7 @@ if self.TraceOn(): fakeserver.logfile = sys.stdout - # Schedule the fake debugserver to be shut down during teardown. + # Schedule the fake debugserver to be shutting down during teardown. def shutdown_fakeserver(): fakeserver.close() self.addTearDownHook(shutdown_fakeserver) From johnny.chen at apple.com Fri Apr 22 16:56:22 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Fri, 22 Apr 2011 21:56:22 -0000 Subject: [Lldb-commits] [lldb] r130017 - /lldb/trunk/test/connect_remote/TestConnectRemote.py Message-ID: <20110422215622.C290A2A6C12C@llvm.org> Author: johnny Date: Fri Apr 22 16:56:22 2011 New Revision: 130017 URL: http://llvm.org/viewvc/llvm-project?rev=130017&view=rev Log: We are only interested in logging the child's output to sys.stdout. Modified: lldb/trunk/test/connect_remote/TestConnectRemote.py Modified: lldb/trunk/test/connect_remote/TestConnectRemote.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/connect_remote/TestConnectRemote.py?rev=130017&r1=130016&r2=130017&view=diff ============================================================================== --- lldb/trunk/test/connect_remote/TestConnectRemote.py (original) +++ lldb/trunk/test/connect_remote/TestConnectRemote.py Fri Apr 22 16:56:22 2011 @@ -21,7 +21,7 @@ # Turn on logging for what the child sends back. if self.TraceOn(): - fakeserver.logfile = sys.stdout + fakeserver.logfile_read = sys.stdout # Schedule the fake debugserver to be shutting down during teardown. def shutdown_fakeserver(): From johnny.chen at apple.com Fri Apr 22 18:20:18 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Fri, 22 Apr 2011 23:20:18 -0000 Subject: [Lldb-commits] [lldb] r130029 - /lldb/trunk/test/python_api/target/TestTargetAPI.py Message-ID: <20110422232018.1258C2A6C12C@llvm.org> Author: johnny Date: Fri Apr 22 18:20:17 2011 New Revision: 130029 URL: http://llvm.org/viewvc/llvm-project?rev=130029&view=rev Log: Add test cases for the SBTarget.GetDescription() API which takes an extra lldb::DescriptionLevel enum. Modified: lldb/trunk/test/python_api/target/TestTargetAPI.py Modified: lldb/trunk/test/python_api/target/TestTargetAPI.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/target/TestTargetAPI.py?rev=130029&r1=130028&r2=130029&view=diff ============================================================================== --- lldb/trunk/test/python_api/target/TestTargetAPI.py (original) +++ lldb/trunk/test/python_api/target/TestTargetAPI.py Fri Apr 22 18:20:17 2011 @@ -14,6 +14,19 @@ @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test + def test_get_description_with_dsym(self): + """Exercise SBTaget.GetDescription() API.""" + self.buildDsym() + self.get_description() + + @python_api_test + def test_get_description_with_dwarf(self): + """Exercise SBTarget.GetDescription() API.""" + self.buildDwarf() + self.get_description() + + @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @python_api_test def test_launch_new_process_and_redirect_stdout_with_dsym(self): """Exercise SBTaget.Launch() API.""" self.buildDsym() @@ -45,6 +58,29 @@ self.line1 = line_number('main.c', '// Find the line number for breakpoint 1 here.') self.line2 = line_number('main.c', '// Find the line number for breakpoint 2 here.') + def get_description(self): + """Exercise SBTaget.GetDescription() API.""" + exe = os.path.join(os.getcwd(), "a.out") + + # Create a target by the debugger. + target = self.dbg.CreateTarget(exe) + self.assertTrue(target.IsValid(), VALID_TARGET) + + stream = lldb.SBStream() + if not target.GetDescription(stream, lldb.eDescriptionLevelBrief): + self.fail("SBTarget.GetDescription() failed") + self.expect(stream.GetData(), exe=False, + substrs = ['a.out']) + self.expect(stream.GetData(), exe=False, matching=False, + substrs = ['Target', 'Module', 'Breakpoint']) + + stream.Clear() + if not target.GetDescription(stream, lldb.eDescriptionLevelFull): + self.fail("SBTarget.GetDescription() failed") + self.expect(stream.GetData(), exe=False, + substrs = ['a.out', 'Target', 'Module', 'Breakpoint']) + + def launch_new_process_and_redirect_stdout(self): """Exercise SBTaget.Launch() API with redirected stdout.""" exe = os.path.join(os.getcwd(), "a.out") From jingham at apple.com Fri Apr 22 18:53:53 2011 From: jingham at apple.com (Jim Ingham) Date: Fri, 22 Apr 2011 23:53:53 -0000 Subject: [Lldb-commits] [lldb] r130035 - in /lldb/trunk: include/lldb/Core/ include/lldb/Utility/ lldb.xcodeproj/ source/API/ source/Commands/ source/Core/ source/Expression/ source/Target/ test/objc-stepping/ Message-ID: <20110422235354.12A972A6C12C@llvm.org> Author: jingham Date: Fri Apr 22 18:53:53 2011 New Revision: 130035 URL: http://llvm.org/viewvc/llvm-project?rev=130035&view=rev Log: Fix up how the ValueObjects manage their life cycle so that you can hand out a shared pointer to a ValueObject or any of its dependent ValueObjects, and the whole cluster will stay around as long as that shared pointer stays around. Added: lldb/trunk/include/lldb/Utility/SharedCluster.h Modified: lldb/trunk/include/lldb/Core/ValueObject.h lldb/trunk/include/lldb/Core/ValueObjectChild.h lldb/trunk/include/lldb/Core/ValueObjectConstResult.h lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h lldb/trunk/include/lldb/Core/ValueObjectMemory.h lldb/trunk/include/lldb/Core/ValueObjectRegister.h lldb/trunk/include/lldb/Core/ValueObjectVariable.h lldb/trunk/include/lldb/Utility/SharingPtr.h lldb/trunk/lldb.xcodeproj/project.pbxproj lldb/trunk/source/API/SBFrame.cpp lldb/trunk/source/API/SBValue.cpp lldb/trunk/source/Commands/CommandObjectFrame.cpp lldb/trunk/source/Core/ValueObject.cpp lldb/trunk/source/Core/ValueObjectConstResult.cpp lldb/trunk/source/Core/ValueObjectDynamicValue.cpp lldb/trunk/source/Core/ValueObjectMemory.cpp lldb/trunk/source/Core/ValueObjectRegister.cpp lldb/trunk/source/Core/ValueObjectVariable.cpp lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp lldb/trunk/source/Expression/ClangExpressionVariable.cpp lldb/trunk/source/Expression/ClangUserExpression.cpp lldb/trunk/source/Target/StackFrame.cpp lldb/trunk/source/Target/Target.cpp lldb/trunk/test/objc-stepping/TestObjCStepping.py Modified: lldb/trunk/include/lldb/Core/ValueObject.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObject.h?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/ValueObject.h (original) +++ lldb/trunk/include/lldb/Core/ValueObject.h Fri Apr 22 18:53:53 2011 @@ -27,10 +27,12 @@ #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/ExecutionContextScope.h" #include "lldb/Target/StackID.h" +#include "lldb/Utility/SharedCluster.h" namespace lldb_private { /// ValueObject: +/// /// This abstract class provides an interface to a particular value, be it a register, a local or global variable, /// that is evaluated in some particular scope. The ValueObject also has the capibility of being the "child" of /// some other variable object, and in turn of having children. @@ -38,6 +40,27 @@ /// particular ExecutionContextScope. If it is a child, it inherits the ExecutionContextScope from its parent. /// The ValueObject will update itself if necessary before fetching its value, summary, object description, etc. /// But it will always update itself in the ExecutionContextScope with which it was originally created. + +/// A brief note on life cycle management for ValueObjects. This is a little tricky because a ValueObject can contain +/// various other ValueObjects - the Dynamic Value, its children, the dereference value, etc. Any one of these can be +/// handed out as a shared pointer, but for that contained value object to be valid, the root object and potentially other +/// of the value objects need to stay around. +/// We solve this problem by handing out shared pointers to the Value Object and any of its dependents using a shared +/// ClusterManager. This treats each shared pointer handed out for the entire cluster as a reference to the whole +/// cluster. The whole cluster will stay around until the last reference is released. +/// +/// The ValueObject mostly handle this automatically, if a value object is made with a Parent ValueObject, then it adds +/// itself to the ClusterManager of the parent. + +/// It does mean that external to the ValueObjects we should only ever make available ValueObjectSP's, never ValueObjects +/// or pointers to them. So all the "Root level" ValueObject derived constructors should be private, and +/// should implement a Create function that new's up object and returns a Shared Pointer that it gets from the GetSP() method. +/// +/// However, if you are making an derived ValueObject that will be contained in a parent value object, you should just +/// hold onto a pointer to it internally, and by virtue of passing the parent ValueObject into its constructor, it will +/// be added to the ClusterManager for the parent. Then if you ever hand out a Shared Pointer to the contained ValueObject, +/// just do so by calling GetSP() on the contained object. + class ValueObject : public UserID { public: @@ -189,8 +212,6 @@ return m_update_point.GetExecutionContextScope(); } - friend class ValueObjectList; - virtual ~ValueObject(); //------------------------------------------------------------------ @@ -331,10 +352,17 @@ bool Write (); + lldb::ValueObjectSP + GetSP () + { + return m_manager->GetSharedPointer(this); + } + +protected: void AddSyntheticChild (const ConstString &key, - lldb::ValueObjectSP& valobj_sp); - + ValueObject *valobj); +public: lldb::ValueObjectSP GetSyntheticChild (const ConstString &key) const; @@ -344,9 +372,6 @@ lldb::ValueObjectSP GetDynamicValue (bool can_create); - lldb::ValueObjectSP - GetDynamicValue (bool can_create, lldb::ValueObjectSP &owning_valobj_sp); - virtual lldb::ValueObjectSP CreateConstantValue (const ConstString &name); @@ -437,6 +462,8 @@ } protected: + typedef ClusterManager ValueObjectManager; + //------------------------------------------------------------------ // Classes that inherit from ValueObject can see and modify these //------------------------------------------------------------------ @@ -454,12 +481,19 @@ std::string m_summary_str; // Cached summary string that will get cleared if/when the value is updated. std::string m_object_desc_str; // Cached result of the "object printer". This differs from the summary // in that the summary is consed up by us, the object_desc_string is builtin. - std::vector m_children; - std::map m_synthetic_children; - lldb::ValueObjectSP m_dynamic_value_sp; - lldb::ValueObjectSP m_addr_of_valobj_sp; // These two shared pointers help root the ValueObject shared pointers that - lldb::ValueObjectSP m_deref_valobj_sp; // we hand out, so that we can use them in their dynamic types and ensure - // they will last as long as this ValueObject... + + ValueObjectManager *m_manager; // This object is managed by the root object (any ValueObject that gets created + // without a parent.) The manager gets passed through all the generations of + // dependent objects, and will keep the whole cluster of objects alive as long + // as a shared pointer to any of them has been handed out. Shared pointers to + // value objects must always be made with the GetSP method. + + std::vector m_children; + std::map m_synthetic_children; + ValueObject *m_dynamic_value; + lldb::ValueObjectSP m_addr_of_valobj_sp; // We have to hold onto a shared pointer to this one because it is created + // as an independent ValueObjectConstResult, which isn't managed by us. + ValueObject *m_deref_valobj; lldb::Format m_format; bool m_value_is_valid:1, @@ -469,11 +503,10 @@ m_pointers_point_to_load_addrs:1, m_is_deref_of_parent:1; - friend class CommandObjectExpression; - friend class ClangExpressionVariable; - friend class ClangExpressionDeclMap; // For GetValue... - friend class Target; - friend class ValueObjectChild; + friend class ClangExpressionDeclMap; // For GetValue + friend class ClangExpressionVariable; // For SetName + friend class Target; // For SetName + //------------------------------------------------------------------ // Constructors and Destructors //------------------------------------------------------------------ @@ -492,6 +525,12 @@ ValueObject (ValueObject &parent); + ValueObjectManager * + GetManager() + { + return m_manager; + } + virtual bool UpdateValue () = 0; @@ -499,7 +538,8 @@ CalculateDynamicValue (); // Should only be called by ValueObject::GetChildAtIndex() - virtual lldb::ValueObjectSP + // Returns a ValueObject managed by this ValueObject's manager. + virtual ValueObject * CreateChildAtIndex (uint32_t idx, bool synthetic_array_member, int32_t synthetic_index); // Should only be called by ValueObject::GetNumChildren() Modified: lldb/trunk/include/lldb/Core/ValueObjectChild.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectChild.h?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/ValueObjectChild.h (original) +++ lldb/trunk/include/lldb/Core/ValueObjectChild.h Fri Apr 22 18:53:53 2011 @@ -24,18 +24,6 @@ class ValueObjectChild : public ValueObject { public: - ValueObjectChild (ValueObject &parent, - clang::ASTContext *clang_ast, - void *clang_type, - const ConstString &name, - uint32_t byte_size, - int32_t byte_offset, - uint32_t bitfield_bit_size, - uint32_t bitfield_bit_offset, - bool is_base_class, - bool is_deref_of_parent); - - virtual ~ValueObjectChild(); virtual size_t @@ -117,6 +105,18 @@ // ReadValueFromMemory (ValueObject* parent, lldb::addr_t address); private: + friend class ValueObject; + ValueObjectChild (ValueObject &parent, + clang::ASTContext *clang_ast, + void *clang_type, + const ConstString &name, + uint32_t byte_size, + int32_t byte_offset, + uint32_t bitfield_bit_size, + uint32_t bitfield_bit_offset, + bool is_base_class, + bool is_deref_of_parent); + DISALLOW_COPY_AND_ASSIGN (ValueObjectChild); }; Modified: lldb/trunk/include/lldb/Core/ValueObjectConstResult.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectConstResult.h?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/ValueObjectConstResult.h (original) +++ lldb/trunk/include/lldb/Core/ValueObjectConstResult.h Fri Apr 22 18:53:53 2011 @@ -24,35 +24,40 @@ class ValueObjectConstResult : public ValueObject { public: - ValueObjectConstResult (ExecutionContextScope *exe_scope, - lldb::ByteOrder byte_order, - uint32_t addr_byte_size); - - ValueObjectConstResult (ExecutionContextScope *exe_scope, - clang::ASTContext *clang_ast, - void *clang_type, - const ConstString &name, - const DataExtractor &data); - - ValueObjectConstResult (ExecutionContextScope *exe_scope, - clang::ASTContext *clang_ast, - void *clang_type, - const ConstString &name, - const lldb::DataBufferSP &result_data_sp, - lldb::ByteOrder byte_order, - uint8_t addr_size); - - ValueObjectConstResult (ExecutionContextScope *exe_scope, - clang::ASTContext *clang_ast, - void *clang_type, - const ConstString &name, - lldb::addr_t address, - AddressType address_type, - uint8_t addr_byte_size); + static lldb::ValueObjectSP + Create (ExecutionContextScope *exe_scope, + lldb::ByteOrder byte_order, + uint32_t addr_byte_size); + + static lldb::ValueObjectSP + Create (ExecutionContextScope *exe_scope, + clang::ASTContext *clang_ast, + void *clang_type, + const ConstString &name, + const DataExtractor &data); + + static lldb::ValueObjectSP + Create (ExecutionContextScope *exe_scope, + clang::ASTContext *clang_ast, + void *clang_type, + const ConstString &name, + const lldb::DataBufferSP &result_data_sp, + lldb::ByteOrder byte_order, + uint8_t addr_size); + + static lldb::ValueObjectSP + Create (ExecutionContextScope *exe_scope, + clang::ASTContext *clang_ast, + void *clang_type, + const ConstString &name, + lldb::addr_t address, + AddressType address_type, + uint8_t addr_byte_size); // When an expression fails to evaluate, we return an error - ValueObjectConstResult (ExecutionContextScope *exe_scope, - const Error& error); + static lldb::ValueObjectSP + Create (ExecutionContextScope *exe_scope, + const Error& error); virtual ~ValueObjectConstResult(); @@ -102,6 +107,35 @@ uint32_t m_byte_size; private: + ValueObjectConstResult (ExecutionContextScope *exe_scope, + lldb::ByteOrder byte_order, + uint32_t addr_byte_size); + + ValueObjectConstResult (ExecutionContextScope *exe_scope, + clang::ASTContext *clang_ast, + void *clang_type, + const ConstString &name, + const DataExtractor &data); + + ValueObjectConstResult (ExecutionContextScope *exe_scope, + clang::ASTContext *clang_ast, + void *clang_type, + const ConstString &name, + const lldb::DataBufferSP &result_data_sp, + lldb::ByteOrder byte_order, + uint8_t addr_size); + + ValueObjectConstResult (ExecutionContextScope *exe_scope, + clang::ASTContext *clang_ast, + void *clang_type, + const ConstString &name, + lldb::addr_t address, + AddressType address_type, + uint8_t addr_byte_size); + + ValueObjectConstResult (ExecutionContextScope *exe_scope, + const Error& error); + DISALLOW_COPY_AND_ASSIGN (ValueObjectConstResult); }; Modified: lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h (original) +++ lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h Fri Apr 22 18:53:53 2011 @@ -25,8 +25,6 @@ class ValueObjectDynamicValue : public ValueObject { public: - ValueObjectDynamicValue (ValueObject &parent); - virtual ~ValueObjectDynamicValue(); @@ -94,6 +92,9 @@ lldb::ValueObjectSP m_owning_valobj_sp; private: + friend class ValueObject; + ValueObjectDynamicValue (ValueObject &parent); + //------------------------------------------------------------------ // For ValueObject only //------------------------------------------------------------------ Modified: lldb/trunk/include/lldb/Core/ValueObjectMemory.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectMemory.h?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/ValueObjectMemory.h (original) +++ lldb/trunk/include/lldb/Core/ValueObjectMemory.h Fri Apr 22 18:53:53 2011 @@ -25,10 +25,11 @@ class ValueObjectMemory : public ValueObject { public: - ValueObjectMemory (ExecutionContextScope *exe_scope, - const char *name, - const Address &address, - lldb::TypeSP &type_sp); + static lldb::ValueObjectSP + Create (ExecutionContextScope *exe_scope, + const char *name, + const Address &address, + lldb::TypeSP &type_sp); virtual ~ValueObjectMemory(); @@ -62,6 +63,11 @@ lldb::TypeSP m_type_sp; private: + ValueObjectMemory (ExecutionContextScope *exe_scope, + const char *name, + const Address &address, + lldb::TypeSP &type_sp); + //------------------------------------------------------------------ // For ValueObject only //------------------------------------------------------------------ Modified: lldb/trunk/include/lldb/Core/ValueObjectRegister.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectRegister.h?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/ValueObjectRegister.h (original) +++ lldb/trunk/include/lldb/Core/ValueObjectRegister.h Fri Apr 22 18:53:53 2011 @@ -26,7 +26,6 @@ class ValueObjectRegisterContext : public ValueObject { public: - ValueObjectRegisterContext (ValueObject &parent, lldb::RegisterContextSP ®_ctx_sp); virtual ~ValueObjectRegisterContext(); @@ -52,7 +51,7 @@ virtual uint32_t CalculateNumChildren(); - virtual lldb::ValueObjectSP + virtual ValueObject * CreateChildAtIndex (uint32_t idx, bool synthetic_array_member, int32_t synthetic_index); protected: @@ -62,6 +61,7 @@ lldb::RegisterContextSP m_reg_ctx_sp; private: + ValueObjectRegisterContext (ValueObject &parent, lldb::RegisterContextSP ®_ctx_sp); //------------------------------------------------------------------ // For ValueObject only //------------------------------------------------------------------ @@ -71,7 +71,8 @@ class ValueObjectRegisterSet : public ValueObject { public: - ValueObjectRegisterSet (ExecutionContextScope *exe_scope, lldb::RegisterContextSP ®_ctx_sp, uint32_t set_idx); + static lldb::ValueObjectSP + Create (ExecutionContextScope *exe_scope, lldb::RegisterContextSP ®_ctx_sp, uint32_t set_idx); virtual ~ValueObjectRegisterSet(); @@ -97,7 +98,7 @@ virtual uint32_t CalculateNumChildren(); - virtual lldb::ValueObjectSP + virtual ValueObject * CreateChildAtIndex (uint32_t idx, bool synthetic_array_member, int32_t synthetic_index); virtual lldb::ValueObjectSP @@ -116,6 +117,9 @@ uint32_t m_reg_set_idx; private: + friend class ValueObjectRegisterContext; + ValueObjectRegisterSet (ExecutionContextScope *exe_scope, lldb::RegisterContextSP ®_ctx_sp, uint32_t set_idx); + //------------------------------------------------------------------ // For ValueObject only //------------------------------------------------------------------ @@ -125,8 +129,8 @@ class ValueObjectRegister : public ValueObject { public: - ValueObjectRegister (ValueObject &parent, lldb::RegisterContextSP ®_ctx_sp, uint32_t reg_num); - ValueObjectRegister (ExecutionContextScope *exe_scope, lldb::RegisterContextSP ®_ctx_sp, uint32_t reg_num); + static lldb::ValueObjectSP + Create (ExecutionContextScope *exe_scope, lldb::RegisterContextSP ®_ctx_sp, uint32_t reg_num); virtual ~ValueObjectRegister(); @@ -165,6 +169,11 @@ private: void ConstructObject (); + + friend class ValueObjectRegisterSet; + ValueObjectRegister (ValueObject &parent, lldb::RegisterContextSP ®_ctx_sp, uint32_t reg_num); + ValueObjectRegister (ExecutionContextScope *exe_scope, lldb::RegisterContextSP ®_ctx_sp, uint32_t reg_num); + //------------------------------------------------------------------ // For ValueObject only //------------------------------------------------------------------ Modified: lldb/trunk/include/lldb/Core/ValueObjectVariable.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectVariable.h?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/ValueObjectVariable.h (original) +++ lldb/trunk/include/lldb/Core/ValueObjectVariable.h Fri Apr 22 18:53:53 2011 @@ -25,7 +25,8 @@ class ValueObjectVariable : public ValueObject { public: - ValueObjectVariable (ExecutionContextScope *exe_scope, const lldb::VariableSP &var_sp); + static lldb::ValueObjectSP + Create (ExecutionContextScope *exe_scope, const lldb::VariableSP &var_sp); virtual ~ValueObjectVariable(); @@ -58,6 +59,7 @@ lldb::VariableSP m_variable_sp; ///< The variable that this value object is based upon private: + ValueObjectVariable (ExecutionContextScope *exe_scope, const lldb::VariableSP &var_sp); //------------------------------------------------------------------ // For ValueObject only //------------------------------------------------------------------ Added: lldb/trunk/include/lldb/Utility/SharedCluster.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/SharedCluster.h?rev=130035&view=auto ============================================================================== --- lldb/trunk/include/lldb/Utility/SharedCluster.h (added) +++ lldb/trunk/include/lldb/Utility/SharedCluster.h Fri Apr 22 18:53:53 2011 @@ -0,0 +1,106 @@ +//===---------------------SharedCluster.h --------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef utility_SharedCluster_h_ +#define utility_SharedCluster_h_ + +#include "lldb/Utility/SharingPtr.h" +#include "lldb/Host/Mutex.h" + +namespace lldb_private { + +namespace imp +{ + template + class shared_ptr_refcount : public lldb_private::imp::shared_count + { + public: + template shared_ptr_refcount (Y *in) : manager(in), shared_count (0) {} + + shared_ptr_refcount() : shared_count (0) {} + + virtual ~shared_ptr_refcount () + { + } + + virtual void on_zero_shared () + { + manager->DecrementRefCount(); + } + private: + T *manager; + }; + +} // namespace imp + +template +class ClusterManager +{ +public: + ClusterManager () : + m_external_ref(0), + m_objects(), + m_mutex(Mutex::eMutexTypeNormal) {} + + ~ClusterManager () + { + size_t n_items = m_objects.size(); + for (size_t i = 0; i < n_items; i++) + { + delete m_objects[i]; + } + } + + void ManageObject (T *new_object) + { + m_mutex.Lock(); + if (!ContainsObject(new_object)) + m_objects.push_back (new_object); + m_mutex.Unlock(); + } + + typename lldb_private::SharingPtr GetSharedPointer(T *desired_object) + { + m_mutex.Lock(); + m_external_ref++; + assert (ContainsObject(desired_object)); + m_mutex.Unlock(); + + return typename lldb_private::SharingPtr (desired_object, new imp::shared_ptr_refcount (this)); + } + +private: + + bool ContainsObject (const T *desired_object) + { + typename std::vector::iterator pos; + pos = std::find(m_objects.begin(), m_objects.end(), desired_object); + + return pos < m_objects.end(); + } + + void DecrementRefCount () + { + m_mutex.Lock(); + m_external_ref--; + if (m_external_ref == 0) + delete this; + else + m_mutex.Unlock(); + } + + friend class imp::shared_ptr_refcount; + + std::vector m_objects; + int m_external_ref; + Mutex m_mutex; +}; + +} // namespace lldb_private +#endif // utility_SharedCluster_h_ Modified: lldb/trunk/include/lldb/Utility/SharingPtr.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/SharingPtr.h?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/include/lldb/Utility/SharingPtr.h (original) +++ lldb/trunk/include/lldb/Utility/SharingPtr.h Fri Apr 22 18:53:53 2011 @@ -119,6 +119,7 @@ public: SharingPtr(); template explicit SharingPtr(Y* p); + template explicit SharingPtr(Y* p, imp::shared_count *ctrl_block); template SharingPtr(const SharingPtr& r, element_type *p); SharingPtr(const SharingPtr& r); template @@ -184,6 +185,13 @@ template template +SharingPtr::SharingPtr(Y* p, imp::shared_count *cntrl_block) + : ptr_(p), cntrl_(cntrl_block) +{ +} + +template +template inline SharingPtr::SharingPtr(const SharingPtr& r, element_type *p) : ptr_(p), Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/lldb.xcodeproj/project.pbxproj (original) +++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Apr 22 18:53:53 2011 @@ -409,6 +409,7 @@ 26F5C32D10F3DFDD009D5894 /* libtermcap.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C32B10F3DFDD009D5894 /* libtermcap.dylib */; }; 26F5C37510F3F61B009D5894 /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C37410F3F61B009D5894 /* libobjc.dylib */; }; 26F5C39110F3FA26009D5894 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C39010F3FA26009D5894 /* CoreFoundation.framework */; }; + 4C2FAE2F135E3A70001EDE44 /* SharedCluster.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C2FAE2E135E3A70001EDE44 /* SharedCluster.h */; }; 4C74CB6312288704006A8171 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C74CB6212288704006A8171 /* Carbon.framework */; }; 4CABA9DD134A8BA800539BDD /* ValueObjectMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CABA9DC134A8BA700539BDD /* ValueObjectMemory.h */; }; 4CABA9E0134A8BCD00539BDD /* ValueObjectMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CABA9DF134A8BCD00539BDD /* ValueObjectMemory.cpp */; }; @@ -1093,6 +1094,7 @@ 4C139EA4124A8B03000BFF8D /* AppleObjCRuntimeV2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppleObjCRuntimeV2.h; path = LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h; sourceTree = ""; }; 4C1AB23A1263E5F400D0F04A /* ThreadPlanTestCondition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadPlanTestCondition.cpp; path = source/Target/ThreadPlanTestCondition.cpp; sourceTree = ""; }; 4C1AB23E1263E61100D0F04A /* ThreadPlanTestCondition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadPlanTestCondition.h; path = include/lldb/Target/ThreadPlanTestCondition.h; sourceTree = ""; }; + 4C2FAE2E135E3A70001EDE44 /* SharedCluster.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedCluster.h; path = include/lldb/Utility/SharedCluster.h; sourceTree = ""; }; 4C43DEF9110641F300E55CBF /* ThreadPlanShouldStopHere.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadPlanShouldStopHere.h; path = include/lldb/Target/ThreadPlanShouldStopHere.h; sourceTree = ""; }; 4C43DEFA110641F300E55CBF /* ThreadPlanShouldStopHere.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadPlanShouldStopHere.cpp; path = source/Target/ThreadPlanShouldStopHere.cpp; sourceTree = ""; }; 4C43DF8511069BFD00E55CBF /* ThreadPlanStepInRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadPlanStepInRange.h; path = include/lldb/Target/ThreadPlanStepInRange.h; sourceTree = ""; }; @@ -1749,6 +1751,7 @@ 961FABE41235F15900F93A47 /* UnwindAssemblyProfiler.cpp */, 264723A511FA076E00DE380C /* CleanUp.h */, 261B5A5211C3F2AD00AABD0A /* SharingPtr.cpp */, + 4C2FAE2E135E3A70001EDE44 /* SharedCluster.h */, 261B5A5311C3F2AD00AABD0A /* SharingPtr.h */, 26F996A7119B79C300412154 /* ARM_DWARF_Registers.h */, 26F996A8119B79C300412154 /* ARM_GCC_Registers.h */, @@ -2584,6 +2587,7 @@ 2671A0CE134825F6003A87BB /* ConnectionMachPort.h in Headers */, 4CABA9DD134A8BA800539BDD /* ValueObjectMemory.h in Headers */, 4CD0BD0D134BFAB600CB44D4 /* ValueObjectDynamicValue.h in Headers */, + 4C2FAE2F135E3A70001EDE44 /* SharedCluster.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: lldb/trunk/source/API/SBFrame.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBFrame.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/API/SBFrame.cpp (original) +++ lldb/trunk/source/API/SBFrame.cpp Fri Apr 22 18:53:53 2011 @@ -351,6 +351,8 @@ SBFrame::FindVariable (const char *name, bool use_dynamic) { VariableSP var_sp; + SBValue sb_value; + if (m_opaque_sp && name && name[0]) { VariableList variable_list; @@ -373,8 +375,6 @@ } } - SBValue sb_value; - if (var_sp) *sb_value = ValueObjectSP (m_opaque_sp->GetValueObjectForFrameVariable(var_sp, use_dynamic)); @@ -452,7 +452,7 @@ ((reg_info->name && strcasecmp (reg_info->name, name) == 0) || (reg_info->alt_name && strcasecmp (reg_info->alt_name, name) == 0))) { - *sb_value = ValueObjectSP (new ValueObjectRegister (m_opaque_sp.get(), reg_ctx, reg_idx)); + *sb_value = ValueObjectRegister::Create (m_opaque_sp.get(), reg_ctx, reg_idx); } } } @@ -472,7 +472,7 @@ ((reg_set->name && strcasecmp (reg_set->name, name) == 0) || (reg_set->short_name && strcasecmp (reg_set->short_name, name) == 0))) { - *sb_value = ValueObjectSP (new ValueObjectRegisterSet (m_opaque_sp.get(), reg_ctx, set_idx)); + *sb_value = ValueObjectRegisterSet::Create (m_opaque_sp.get(), reg_ctx, set_idx); } } } @@ -677,7 +677,7 @@ const uint32_t num_sets = reg_ctx->GetRegisterSetCount(); for (uint32_t set_idx = 0; set_idx < num_sets; ++set_idx) { - value_list.Append(ValueObjectSP (new ValueObjectRegisterSet (m_opaque_sp.get(), reg_ctx, set_idx))); + value_list.Append(ValueObjectRegisterSet::Create (m_opaque_sp.get(), reg_ctx, set_idx)); } } } Modified: lldb/trunk/source/API/SBValue.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBValue.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/API/SBValue.cpp (original) +++ lldb/trunk/source/API/SBValue.cpp Fri Apr 22 18:53:53 2011 @@ -357,7 +357,7 @@ { if (child_sp) { - lldb::ValueObjectSP dynamic_sp = child_sp->GetDynamicValue(true, child_sp); + lldb::ValueObjectSP dynamic_sp = child_sp->GetDynamicValue(true); if (dynamic_sp) child_sp = dynamic_sp; } @@ -410,7 +410,7 @@ { if (child_sp) { - lldb::ValueObjectSP dynamic_sp = child_sp->GetDynamicValue(true, child_sp); + lldb::ValueObjectSP dynamic_sp = child_sp->GetDynamicValue(true); if (dynamic_sp) child_sp = dynamic_sp; } Modified: lldb/trunk/source/Commands/CommandObjectFrame.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectFrame.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectFrame.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectFrame.cpp Fri Apr 22 18:53:53 2011 @@ -649,13 +649,6 @@ valobj_sp = exe_ctx.frame->GetValueForVariableExpressionPath (name_cstr, expr_path_options, error); if (valobj_sp) { -// if (use_dynamic) -// { -// lldb::ValueObjectSP dynamic_sp = valobj_sp->GetDynamicValue(true, valobj_sp); -// if (dynamic_sp != NULL) -// valobj_sp = dynamic_sp; -// } -// if (m_options.format != eFormatDefault) valobj_sp->SetFormat (m_options.format); Modified: lldb/trunk/source/Core/ValueObject.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObject.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Core/ValueObject.cpp (original) +++ lldb/trunk/source/Core/ValueObject.cpp Fri Apr 22 18:53:53 2011 @@ -59,9 +59,11 @@ m_location_str (), m_summary_str (), m_object_desc_str (), + m_manager(parent.GetManager()), m_children (), m_synthetic_children (), - m_dynamic_value_sp (), + m_dynamic_value (NULL), + m_deref_valobj(NULL), m_format (eFormatDefault), m_value_is_valid (false), m_value_did_change (false), @@ -70,6 +72,7 @@ m_pointers_point_to_load_addrs (false), m_is_deref_of_parent (false) { + m_manager->ManageObject(this); } //---------------------------------------------------------------------- @@ -88,9 +91,11 @@ m_location_str (), m_summary_str (), m_object_desc_str (), + m_manager(), m_children (), m_synthetic_children (), - m_dynamic_value_sp (), + m_dynamic_value (NULL), + m_deref_valobj(NULL), m_format (eFormatDefault), m_value_is_valid (false), m_value_did_change (false), @@ -99,6 +104,8 @@ m_pointers_point_to_load_addrs (false), m_is_deref_of_parent (false) { + m_manager = new ValueObjectManager(); + m_manager->ManageObject (this); } //---------------------------------------------------------------------- @@ -282,14 +289,15 @@ if (idx < GetNumChildren()) { // Check if we have already made the child value object? - if (can_create && m_children[idx].get() == NULL) + if (can_create && m_children[idx] == NULL) { // No we haven't created the child at this index, so lets have our // subclass do it and cache the result for quick future access. m_children[idx] = CreateChildAtIndex (idx, false, 0); } - - child_sp = m_children[idx]; + + if (m_children[idx] != NULL) + return m_children[idx]->GetSP(); } } return child_sp; @@ -377,10 +385,10 @@ m_name = name; } -ValueObjectSP +ValueObject * ValueObject::CreateChildAtIndex (uint32_t idx, bool synthetic_array_member, int32_t synthetic_index) { - ValueObjectSP valobj_sp; + ValueObject *valobj; if (UpdateValueIfNeeded()) { @@ -420,22 +428,22 @@ if (!child_name_str.empty()) child_name.SetCString (child_name_str.c_str()); - valobj_sp.reset (new ValueObjectChild (*this, - clang_ast, - child_clang_type, - child_name, - child_byte_size, - child_byte_offset, - child_bitfield_bit_size, - child_bitfield_bit_offset, - child_is_base_class, - child_is_deref_of_parent)); + valobj = new ValueObjectChild (*this, + clang_ast, + child_clang_type, + child_name, + child_byte_size, + child_byte_offset, + child_bitfield_bit_size, + child_bitfield_bit_offset, + child_is_base_class, + child_is_deref_of_parent); if (m_pointers_point_to_load_addrs) - valobj_sp->SetPointersPointToLoadAddrs (m_pointers_point_to_load_addrs); + valobj->SetPointersPointToLoadAddrs (m_pointers_point_to_load_addrs); } } - return valobj_sp; + return valobj; } const char * @@ -913,18 +921,18 @@ } void -ValueObject::AddSyntheticChild (const ConstString &key, ValueObjectSP& valobj_sp) +ValueObject::AddSyntheticChild (const ConstString &key, ValueObject *valobj) { - m_synthetic_children[key] = valobj_sp; + m_synthetic_children[key] = valobj; } ValueObjectSP ValueObject::GetSyntheticChild (const ConstString &key) const { ValueObjectSP synthetic_child_sp; - std::map::const_iterator pos = m_synthetic_children.find (key); + std::map::const_iterator pos = m_synthetic_children.find (key); if (pos != m_synthetic_children.end()) - synthetic_child_sp = pos->second; + synthetic_child_sp = pos->second->GetSP(); return synthetic_child_sp; } @@ -960,13 +968,17 @@ synthetic_child_sp = GetSyntheticChild (index_const_str); if (!synthetic_child_sp) { + ValueObject *synthetic_child; // We haven't made a synthetic array member for INDEX yet, so // lets make one and cache it for any future reference. - synthetic_child_sp = CreateChildAtIndex(0, true, index); + synthetic_child = CreateChildAtIndex(0, true, index); // Cache the value if we got one back... - if (synthetic_child_sp) - AddSyntheticChild(index_const_str, synthetic_child_sp); + if (synthetic_child) + { + AddSyntheticChild(index_const_str, synthetic_child); + synthetic_child_sp = synthetic_child->GetSP(); + } } } return synthetic_child_sp; @@ -975,7 +987,7 @@ void ValueObject::CalculateDynamicValue () { - if (!m_dynamic_value_sp && !IsDynamic()) + if (!m_dynamic_value && !IsDynamic()) { Process *process = m_update_point.GetProcess(); bool worth_having_dynamic_value = false; @@ -1005,33 +1017,25 @@ } if (worth_having_dynamic_value) - m_dynamic_value_sp.reset (new ValueObjectDynamicValue (*this)); - } -} + m_dynamic_value = new ValueObjectDynamicValue (*this); + +// if (worth_having_dynamic_value) +// printf ("Adding dynamic value %s (%p) to (%p) - manager %p.\n", m_name.GetCString(), m_dynamic_value, this, m_manager); -lldb::ValueObjectSP -ValueObject::GetDynamicValue (bool can_create) -{ - if (!IsDynamic() && m_dynamic_value_sp == NULL && can_create) - { - CalculateDynamicValue(); } - return m_dynamic_value_sp; } -lldb::ValueObjectSP -ValueObject::GetDynamicValue (bool can_create, lldb::ValueObjectSP &owning_valobj_sp) +ValueObjectSP +ValueObject::GetDynamicValue (bool can_create) { - if (!IsDynamic() && m_dynamic_value_sp == NULL && can_create) + if (!IsDynamic() && m_dynamic_value == NULL && can_create) { CalculateDynamicValue(); - if (m_dynamic_value_sp) - { - ValueObjectDynamicValue *as_dynamic_value = static_cast(m_dynamic_value_sp.get()); - as_dynamic_value->SetOwningSP (owning_valobj_sp); - } } - return m_dynamic_value_sp; + if (m_dynamic_value) + return m_dynamic_value->GetSP(); + else + return ValueObjectSP(); } bool @@ -1352,17 +1356,17 @@ m_error = m_value.GetValueAsData (&exe_ctx, ast, data, 0); - valobj_sp.reset (new ValueObjectConstResult (exe_scope, - ast, - GetClangType(), - name, - data)); + valobj_sp = ValueObjectConstResult::Create (exe_scope, + ast, + GetClangType(), + name, + data); } } if (!valobj_sp) { - valobj_sp.reset (new ValueObjectConstResult (NULL, m_error)); + valobj_sp = ValueObjectConstResult::Create (NULL, m_error); } return valobj_sp; } @@ -1370,8 +1374,8 @@ lldb::ValueObjectSP ValueObject::Dereference (Error &error) { - if (m_deref_valobj_sp) - return m_deref_valobj_sp; + if (m_deref_valobj) + return m_deref_valobj->GetSP(); const bool is_pointer_type = IsPointerType(); if (is_pointer_type) @@ -1408,22 +1412,23 @@ if (!child_name_str.empty()) child_name.SetCString (child_name_str.c_str()); - m_deref_valobj_sp.reset (new ValueObjectChild (*this, - clang_ast, - child_clang_type, - child_name, - child_byte_size, - child_byte_offset, - child_bitfield_bit_size, - child_bitfield_bit_offset, - child_is_base_class, - child_is_deref_of_parent)); + m_deref_valobj = new ValueObjectChild (*this, + clang_ast, + child_clang_type, + child_name, + child_byte_size, + child_byte_offset, + child_bitfield_bit_size, + child_bitfield_bit_offset, + child_is_base_class, + child_is_deref_of_parent); } } - if (m_deref_valobj_sp) + if (m_deref_valobj) { error.Clear(); + return m_deref_valobj->GetSP(); } else { @@ -1434,9 +1439,8 @@ error.SetErrorStringWithFormat("dereference failed: (%s) %s", GetTypeName().AsCString(""), strm.GetString().c_str()); else error.SetErrorStringWithFormat("not a pointer type: (%s) %s", GetTypeName().AsCString(""), strm.GetString().c_str()); + return ValueObjectSP(); } - - return m_deref_valobj_sp; } lldb::ValueObjectSP @@ -1472,13 +1476,13 @@ { std::string name (1, '&'); name.append (m_name.AsCString("")); - m_addr_of_valobj_sp.reset (new ValueObjectConstResult (GetExecutionContextScope(), - ast, - ClangASTContext::CreatePointerType (ast, clang_type), - ConstString (name.c_str()), - addr, - eAddressTypeInvalid, - m_data.GetAddressByteSize())); + m_addr_of_valobj_sp = ValueObjectConstResult::Create (GetExecutionContextScope(), + ast, + ClangASTContext::CreatePointerType (ast, clang_type), + ConstString (name.c_str()), + addr, + eAddressTypeInvalid, + m_data.GetAddressByteSize()); } } break; Modified: lldb/trunk/source/Core/ValueObjectConstResult.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectConstResult.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Core/ValueObjectConstResult.cpp (original) +++ lldb/trunk/source/Core/ValueObjectConstResult.cpp Fri Apr 22 18:53:53 2011 @@ -26,6 +26,19 @@ using namespace lldb; using namespace lldb_private; +ValueObjectSP +ValueObjectConstResult::Create +( + ExecutionContextScope *exe_scope, + ByteOrder byte_order, + uint32_t addr_byte_size +) +{ + return (new ValueObjectConstResult (exe_scope, + byte_order, + addr_byte_size))->GetSP(); +} + ValueObjectConstResult::ValueObjectConstResult ( ExecutionContextScope *exe_scope, @@ -44,6 +57,23 @@ m_pointers_point_to_load_addrs = true; } +ValueObjectSP +ValueObjectConstResult::Create +( + ExecutionContextScope *exe_scope, + clang::ASTContext *clang_ast, + void *clang_type, + const ConstString &name, + const DataExtractor &data +) +{ + return (new ValueObjectConstResult (exe_scope, + clang_ast, + clang_type, + name, + data))->GetSP(); +} + ValueObjectConstResult::ValueObjectConstResult ( ExecutionContextScope *exe_scope, @@ -67,6 +97,27 @@ m_pointers_point_to_load_addrs = true; } +ValueObjectSP +ValueObjectConstResult::Create +( + ExecutionContextScope *exe_scope, + clang::ASTContext *clang_ast, + void *clang_type, + const ConstString &name, + const lldb::DataBufferSP &data_sp, + lldb::ByteOrder data_byte_order, + uint8_t data_addr_size +) +{ + return (new ValueObjectConstResult (exe_scope, + clang_ast, + clang_type, + name, + data_sp, + data_byte_order, + data_addr_size))->GetSP(); +} + ValueObjectConstResult::ValueObjectConstResult ( ExecutionContextScope *exe_scope, @@ -94,6 +145,27 @@ m_pointers_point_to_load_addrs = true; } +ValueObjectSP +ValueObjectConstResult::Create +( + ExecutionContextScope *exe_scope, + clang::ASTContext *clang_ast, + void *clang_type, + const ConstString &name, + lldb::addr_t address, + AddressType address_type, + uint8_t addr_byte_size +) +{ + return (new ValueObjectConstResult (exe_scope, + clang_ast, + clang_type, + name, + address, + address_type, + addr_byte_size))->GetSP(); +} + ValueObjectConstResult::ValueObjectConstResult ( ExecutionContextScope *exe_scope, @@ -128,6 +200,17 @@ m_pointers_point_to_load_addrs = true; } +ValueObjectSP +ValueObjectConstResult::Create +( + ExecutionContextScope *exe_scope, + const Error& error +) +{ + return (new ValueObjectConstResult (exe_scope, + error))->GetSP(); +} + ValueObjectConstResult::ValueObjectConstResult ( ExecutionContextScope *exe_scope, const Error& error) : Modified: lldb/trunk/source/Core/ValueObjectDynamicValue.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectDynamicValue.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Core/ValueObjectDynamicValue.cpp (original) +++ lldb/trunk/source/Core/ValueObjectDynamicValue.cpp Fri Apr 22 18:53:53 2011 @@ -39,14 +39,6 @@ m_address (), m_type_sp() { - // THINK ABOUT: It looks ugly to doctor up the name like this. But if - // people find it confusing to tell the difference, we may want to do something... - -// std::string dynamic_name (""); -// -// SetName (dynamic_name.c_str()); SetName (parent.GetName().AsCString()); } Modified: lldb/trunk/source/Core/ValueObjectMemory.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectMemory.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Core/ValueObjectMemory.cpp (original) +++ lldb/trunk/source/Core/ValueObjectMemory.cpp Fri Apr 22 18:53:53 2011 @@ -30,9 +30,18 @@ #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" - +using namespace lldb; using namespace lldb_private; +ValueObjectSP +ValueObjectMemory::Create (ExecutionContextScope *exe_scope, + const char *name, + const Address &address, + lldb::TypeSP &type_sp) +{ + return (new ValueObjectMemory (exe_scope, name, address, type_sp))->GetSP(); +} + ValueObjectMemory::ValueObjectMemory (ExecutionContextScope *exe_scope, const char *name, const Address &address, Modified: lldb/trunk/source/Core/ValueObjectRegister.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectRegister.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Core/ValueObjectRegister.cpp (original) +++ lldb/trunk/source/Core/ValueObjectRegister.cpp Fri Apr 22 18:53:53 2011 @@ -95,21 +95,29 @@ return m_error.Success(); } -ValueObjectSP +ValueObject * ValueObjectRegisterContext::CreateChildAtIndex (uint32_t idx, bool synthetic_array_member, int32_t synthetic_index) { - ValueObjectSP valobj_sp; - + ValueObject *new_valobj = NULL; + const uint32_t num_children = GetNumChildren(); if (idx < num_children) - valobj_sp.reset (new ValueObjectRegisterSet(GetExecutionContextScope(), m_reg_ctx_sp, idx)); - return valobj_sp; + new_valobj = new ValueObjectRegisterSet(GetExecutionContextScope(), m_reg_ctx_sp, idx); + + return new_valobj; } #pragma mark - #pragma mark ValueObjectRegisterSet +ValueObjectSP +ValueObjectRegisterSet::Create (ExecutionContextScope *exe_scope, lldb::RegisterContextSP ®_ctx_sp, uint32_t set_idx) +{ + return (new ValueObjectRegisterSet (exe_scope, reg_ctx_sp, set_idx))->GetSP(); +} + + ValueObjectRegisterSet::ValueObjectRegisterSet (ExecutionContextScope *exe_scope, lldb::RegisterContextSP ®_ctx, uint32_t reg_set_idx) : ValueObject (exe_scope), m_reg_ctx_sp (reg_ctx), @@ -199,30 +207,33 @@ } -ValueObjectSP +ValueObject * ValueObjectRegisterSet::CreateChildAtIndex (uint32_t idx, bool synthetic_array_member, int32_t synthetic_index) { - ValueObjectSP valobj_sp; + ValueObject *valobj; if (m_reg_ctx_sp && m_reg_set) { const uint32_t num_children = GetNumChildren(); if (idx < num_children) - valobj_sp.reset (new ValueObjectRegister(*this, m_reg_ctx_sp, m_reg_set->registers[idx])); + valobj = new ValueObjectRegister(*this, m_reg_ctx_sp, m_reg_set->registers[idx]); } - return valobj_sp; + return valobj; } lldb::ValueObjectSP ValueObjectRegisterSet::GetChildMemberWithName (const ConstString &name, bool can_create) { - ValueObjectSP valobj_sp; + ValueObject *valobj = NULL; if (m_reg_ctx_sp && m_reg_set) { const RegisterInfo *reg_info = m_reg_ctx_sp->GetRegisterInfoByName (name.AsCString()); if (reg_info != NULL) - valobj_sp.reset (new ValueObjectRegister(*this, m_reg_ctx_sp, reg_info->kinds[eRegisterKindLLDB])); + valobj = new ValueObjectRegister(*this, m_reg_ctx_sp, reg_info->kinds[eRegisterKindLLDB]); } - return valobj_sp; + if (valobj) + return valobj->GetSP(); + else + return ValueObjectSP(); } uint32_t @@ -265,6 +276,12 @@ ConstructObject(); } +ValueObjectSP +ValueObjectRegister::Create (ExecutionContextScope *exe_scope, lldb::RegisterContextSP ®_ctx_sp, uint32_t reg_num) +{ + return (new ValueObjectRegister (exe_scope, reg_ctx_sp, reg_num))->GetSP(); +} + ValueObjectRegister::ValueObjectRegister (ExecutionContextScope *exe_scope, lldb::RegisterContextSP ®_ctx, uint32_t reg_num) : ValueObject (exe_scope), m_reg_ctx_sp (reg_ctx), Modified: lldb/trunk/source/Core/ValueObjectVariable.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectVariable.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Core/ValueObjectVariable.cpp (original) +++ lldb/trunk/source/Core/ValueObjectVariable.cpp Fri Apr 22 18:53:53 2011 @@ -32,6 +32,12 @@ using namespace lldb_private; +lldb::ValueObjectSP +ValueObjectVariable::Create (ExecutionContextScope *exe_scope, const lldb::VariableSP &var_sp) +{ + return (new ValueObjectVariable (exe_scope, var_sp))->GetSP(); +} + ValueObjectVariable::ValueObjectVariable (ExecutionContextScope *exe_scope, const lldb::VariableSP &var_sp) : ValueObject(exe_scope), m_variable_sp(var_sp) Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original) +++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Fri Apr 22 18:53:53 2011 @@ -987,13 +987,13 @@ // If the reference comes from the program, then the ClangExpressionVariable's // live variable data hasn't been set up yet. Do this now. - var_sp->m_live_sp.reset(new lldb_private::ValueObjectConstResult(exe_ctx.GetBestExecutionContextScope (), - var_sp->GetTypeFromUser().GetASTContext(), - var_sp->GetTypeFromUser().GetOpaqueQualType(), - var_sp->GetName(), - mem, - eAddressTypeLoad, - pvar_byte_size)); + var_sp->m_live_sp = ValueObjectConstResult::Create (exe_ctx.GetBestExecutionContextScope (), + var_sp->GetTypeFromUser().GetASTContext(), + var_sp->GetTypeFromUser().GetOpaqueQualType(), + var_sp->GetName(), + mem, + eAddressTypeLoad, + pvar_byte_size); } if (!var_sp->m_live_sp) @@ -1082,13 +1082,13 @@ // Put the location of the spare memory into the live data of the ValueObject. - var_sp->m_live_sp.reset(new lldb_private::ValueObjectConstResult(exe_ctx.GetBestExecutionContextScope(), - var_sp->GetTypeFromUser().GetASTContext(), - var_sp->GetTypeFromUser().GetOpaqueQualType(), - var_sp->GetName(), - mem, - eAddressTypeLoad, - pvar_byte_size)); + var_sp->m_live_sp = ValueObjectConstResult::Create (exe_ctx.GetBestExecutionContextScope(), + var_sp->GetTypeFromUser().GetASTContext(), + var_sp->GetTypeFromUser().GetOpaqueQualType(), + var_sp->GetName(), + mem, + eAddressTypeLoad, + pvar_byte_size); // Clear the flag if the variable will never be deallocated. @@ -1347,13 +1347,13 @@ // Put the location of the spare memory into the live data of the ValueObject. - expr_var->m_live_sp.reset(new lldb_private::ValueObjectConstResult(exe_ctx.GetBestExecutionContextScope(), - type.GetASTContext(), - type.GetOpaqueQualType(), - name, - mem, - eAddressTypeLoad, - value_byte_size)); + expr_var->m_live_sp = ValueObjectConstResult::Create (exe_ctx.GetBestExecutionContextScope(), + type.GetASTContext(), + type.GetOpaqueQualType(), + name, + mem, + eAddressTypeLoad, + value_byte_size); // Now write the location of the area into the struct. Modified: lldb/trunk/source/Expression/ClangExpressionVariable.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionVariable.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Expression/ClangExpressionVariable.cpp (original) +++ lldb/trunk/source/Expression/ClangExpressionVariable.cpp Fri Apr 22 18:53:53 2011 @@ -29,7 +29,7 @@ m_parser_vars(), m_jit_vars (), m_flags (EVNone), - m_frozen_sp (new ValueObjectConstResult(exe_scope, byte_order, addr_byte_size)) + m_frozen_sp (ValueObjectConstResult::Create (exe_scope, byte_order, addr_byte_size)) { } Modified: lldb/trunk/source/Expression/ClangUserExpression.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUserExpression.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Expression/ClangUserExpression.cpp (original) +++ lldb/trunk/source/Expression/ClangUserExpression.cpp Fri Apr 22 18:53:53 2011 @@ -570,7 +570,7 @@ { error.SetErrorString ("Must have a process to evaluate expressions."); - result_valobj_sp.reset (new ValueObjectConstResult (NULL, error)); + result_valobj_sp = ValueObjectConstResult::Create (NULL, error); return eExecutionSetupError; } @@ -590,7 +590,7 @@ else error.SetErrorString (install_errors.GetString().c_str()); - result_valobj_sp.reset (new ValueObjectConstResult (NULL, error)); + result_valobj_sp = ValueObjectConstResult::Create (NULL, error); return eExecutionSetupError; } @@ -672,7 +672,7 @@ } if (result_valobj_sp.get() == NULL) - result_valobj_sp.reset (new ValueObjectConstResult (NULL, error)); + result_valobj_sp = ValueObjectConstResult::Create (NULL, error); return execution_results; } Modified: lldb/trunk/source/Target/StackFrame.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StackFrame.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Target/StackFrame.cpp (original) +++ lldb/trunk/source/Target/StackFrame.cpp Fri Apr 22 18:53:53 2011 @@ -628,7 +628,7 @@ var_path.erase(0, child_name.GetLength()); if (dynamic_value) { - ValueObjectSP dynamic_value_sp(child_valobj_sp->GetDynamicValue(true, child_valobj_sp)); + ValueObjectSP dynamic_value_sp(child_valobj_sp->GetDynamicValue(true)); if (dynamic_value_sp) child_valobj_sp = dynamic_value_sp; } @@ -690,7 +690,7 @@ separator_idx = var_path.find_first_of(".-["); if (dynamic_value) { - ValueObjectSP dynamic_value_sp(child_valobj_sp->GetDynamicValue(true, child_valobj_sp)); + ValueObjectSP dynamic_value_sp(child_valobj_sp->GetDynamicValue(true)); if (dynamic_value_sp) child_valobj_sp = dynamic_value_sp; } @@ -825,14 +825,14 @@ { if (m_variable_list_value_objects.GetSize() < num_variables) m_variable_list_value_objects.Resize(num_variables); - valobj_sp.reset (new ValueObjectVariable (this, variable_sp)); + valobj_sp = ValueObjectVariable::Create (this, variable_sp); m_variable_list_value_objects.SetValueObjectAtIndex (var_idx, valobj_sp); } } } if (use_dynamic && valobj_sp) { - ValueObjectSP dynamic_sp = valobj_sp->GetDynamicValue (true, valobj_sp); + ValueObjectSP dynamic_sp = valobj_sp->GetDynamicValue (true); if (dynamic_sp) return dynamic_sp; } Modified: lldb/trunk/source/Target/Target.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/source/Target/Target.cpp (original) +++ lldb/trunk/source/Target/Target.cpp Fri Apr 22 18:53:53 2011 @@ -931,7 +931,7 @@ { if (fetch_dynamic_value) { - ValueObjectSP dynamic_sp = result_valobj_sp->GetDynamicValue(true, result_valobj_sp); + ValueObjectSP dynamic_sp = result_valobj_sp->GetDynamicValue(true); if (dynamic_sp) result_valobj_sp = dynamic_sp; } Modified: lldb/trunk/test/objc-stepping/TestObjCStepping.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/objc-stepping/TestObjCStepping.py?rev=130035&r1=130034&r2=130035&view=diff ============================================================================== --- lldb/trunk/test/objc-stepping/TestObjCStepping.py (original) +++ lldb/trunk/test/objc-stepping/TestObjCStepping.py Fri Apr 22 18:53:53 2011 @@ -86,6 +86,10 @@ self.assertTrue(mySource_isa.IsValid(), "Found mySource->isa local variable.") mySource_isa.GetValue (thread.GetFrameAtIndex(0)) + # Lets delete mySource so we can check that after stepping a child variable + # with no parent persists and is useful. + del (mySource) + # Now step in, that should leave us in the Source randomMethod: thread.StepInto() line_number = thread.GetFrameAtIndex(0).GetLineEntry().GetLine() From johnny.chen at apple.com Fri Apr 22 19:13:34 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Sat, 23 Apr 2011 00:13:34 -0000 Subject: [Lldb-commits] [lldb] r130038 - in /lldb/trunk/test: lldbutil.py python_api/target/TestTargetAPI.py Message-ID: <20110423001334.608132A6C12C@llvm.org> Author: johnny Date: Fri Apr 22 19:13:34 2011 New Revision: 130038 URL: http://llvm.org/viewvc/llvm-project?rev=130038&view=rev Log: Add a simple utility function get_description(lldb_obj, option=None) to lldbutil.py and use it from TestTargetAPI.py. Modified: lldb/trunk/test/lldbutil.py lldb/trunk/test/python_api/target/TestTargetAPI.py Modified: lldb/trunk/test/lldbutil.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbutil.py?rev=130038&r1=130037&r2=130038&view=diff ============================================================================== --- lldb/trunk/test/lldbutil.py (original) +++ lldb/trunk/test/lldbutil.py Fri Apr 22 19:13:34 2011 @@ -168,6 +168,24 @@ return None return threads[0] +# ============================================================== +# Get the description of an lldb object or None if not available +# ============================================================== +def get_description(lldb_obj, option=None): + """Calls lldb_obj.GetDescription() and returns a string, or None.""" + method = getattr(lldb_obj, 'GetDescription') + if not method: + return None + stream = lldb.SBStream() + if option is None: + success = method(stream) + else: + success = method(stream, option) + if not success: + return None + return stream.GetData() + + # ================================================= # Convert some enum value to its string counterpart # ================================================= Modified: lldb/trunk/test/python_api/target/TestTargetAPI.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/target/TestTargetAPI.py?rev=130038&r1=130037&r2=130038&view=diff ============================================================================== --- lldb/trunk/test/python_api/target/TestTargetAPI.py (original) +++ lldb/trunk/test/python_api/target/TestTargetAPI.py Fri Apr 22 19:13:34 2011 @@ -66,18 +66,19 @@ target = self.dbg.CreateTarget(exe) self.assertTrue(target.IsValid(), VALID_TARGET) - stream = lldb.SBStream() - if not target.GetDescription(stream, lldb.eDescriptionLevelBrief): + from lldbutil import get_description + desc = get_description(target, option=lldb.eDescriptionLevelBrief) + if not desc: self.fail("SBTarget.GetDescription() failed") - self.expect(stream.GetData(), exe=False, + self.expect(desc, exe=False, substrs = ['a.out']) - self.expect(stream.GetData(), exe=False, matching=False, + self.expect(desc, exe=False, matching=False, substrs = ['Target', 'Module', 'Breakpoint']) - stream.Clear() - if not target.GetDescription(stream, lldb.eDescriptionLevelFull): + desc = get_description(target, option=lldb.eDescriptionLevelFull) + if not desc: self.fail("SBTarget.GetDescription() failed") - self.expect(stream.GetData(), exe=False, + self.expect(desc, exe=False, substrs = ['a.out', 'Target', 'Module', 'Breakpoint']) From johnny.chen at apple.com Fri Apr 22 19:34:56 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Sat, 23 Apr 2011 00:34:56 -0000 Subject: [Lldb-commits] [lldb] r130041 - in /lldb/trunk/test/python_api: event/TestEvents.py function_symbol/TestDisasmAPI.py symbol-context/TestSymbolContext.py target/TestTargetAPI.py Message-ID: <20110423003456.C45F82A6C12C@llvm.org> Author: johnny Date: Fri Apr 22 19:34:56 2011 New Revision: 130041 URL: http://llvm.org/viewvc/llvm-project?rev=130041&view=rev Log: Convert the rest of the test suite to use the lldbutil.get_description() utility function. Modified: lldb/trunk/test/python_api/event/TestEvents.py lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py lldb/trunk/test/python_api/target/TestTargetAPI.py Modified: lldb/trunk/test/python_api/event/TestEvents.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/event/TestEvents.py?rev=130041&r1=130040&r2=130041&view=diff ============================================================================== --- lldb/trunk/test/python_api/event/TestEvents.py (original) +++ lldb/trunk/test/python_api/event/TestEvents.py Fri Apr 22 19:34:56 2011 @@ -165,11 +165,9 @@ broadcaster, lldb.SBProcess.eBroadcastBitStateChanged, event): - stream = lldb.SBStream() - event.GetDescription(stream) - description = stream.GetData() - #print "Event description:", description - match = pattern.search(description) + desc = lldbutil.get_description(event) + #print "Event description:", desc + match = pattern.search(desc) if not match: break; if self.context.state == 0 and match.group(1) == 'running': Modified: lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py?rev=130041&r1=130040&r2=130041&view=diff ============================================================================== --- lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py (original) +++ lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py Fri Apr 22 19:34:56 2011 @@ -109,13 +109,11 @@ #ea2 = function.GetEndAddress() #print "ea2:", ea2 - stream1 = lldb.SBStream() - sa1.GetDescription(stream1) - stream2 = lldb.SBStream() - sa2.GetDescription(stream2) - - self.expect(stream1.GetData(), "The two starting addresses should be the same", exe=False, - startstr = stream2.GetData()) + from lldbutil import get_description + desc1 = get_description(sa1) + desc2 = get_description(sa2) + self.assertTrue(desc1 and desc2 and desc1 == desc2, + "The two starting addresses should be the same") if __name__ == '__main__': Modified: lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py?rev=130041&r1=130040&r2=130041&view=diff ============================================================================== --- lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py (original) +++ lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py Fri Apr 22 19:34:56 2011 @@ -65,9 +65,8 @@ # Get the description of this module. module = context.GetModule() - stream = lldb.SBStream() - module.GetDescription(stream) - self.expect(stream.GetData(), "The module should match", exe=False, + desc = lldbutil.get_description(module) + self.expect(desc, "The module should match", exe=False, substrs = [os.path.join(self.mydir, 'a.out')]) compileUnit = context.GetCompileUnit() Modified: lldb/trunk/test/python_api/target/TestTargetAPI.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/target/TestTargetAPI.py?rev=130041&r1=130040&r2=130041&view=diff ============================================================================== --- lldb/trunk/test/python_api/target/TestTargetAPI.py (original) +++ lldb/trunk/test/python_api/target/TestTargetAPI.py Fri Apr 22 19:34:56 2011 @@ -189,13 +189,11 @@ #print "symbol1:", symbol1 #print "symbol2:", symbol2 - stream1 = lldb.SBStream() - symbol1.GetDescription(stream1) - stream2 = lldb.SBStream() - symbol2.GetDescription(stream2) - - self.expect(stream1.GetData(), "The two addresses should resolve to the same symbol", exe=False, - startstr = stream2.GetData()) + from lldbutil import get_description + desc1 = get_description(symbol1) + desc2 = get_description(symbol2) + self.assertTrue(desc1 and desc2 and desc1 == desc2, + "The two addresses should resolve to the same symbol") if __name__ == '__main__': From gclayton at apple.com Fri Apr 22 21:04:55 2011 From: gclayton at apple.com (Greg Clayton) Date: Sat, 23 Apr 2011 02:04:55 -0000 Subject: [Lldb-commits] [lldb] r130044 - in /lldb/trunk: include/lldb/Core/ include/lldb/Interpreter/ include/lldb/Symbol/ include/lldb/Target/ source/API/ source/Commands/ source/Core/ source/Host/common/ source/Interpreter/ source/Plugins/DynamicLoader/MacOSX-DYLD/ source/Plugins/Process/Utility/ source/Symbol/ source/Target/ Message-ID: <20110423020455.BC2982A6C12C@llvm.org> Author: gclayton Date: Fri Apr 22 21:04:55 2011 New Revision: 130044 URL: http://llvm.org/viewvc/llvm-project?rev=130044&view=rev Log: Fixed the SymbolContext::DumpStopContext() to correctly indent and dump inline contexts when the deepest most block is not inlined. Added source path remappings to the lldb_private::Target class that allow it to remap paths found in debug info so we can find source files that are elsewhere on the current system. Fixed disassembly by function name to disassemble inline functions that are inside other functions much better and to show enough context before the disassembly output so you can tell where things came from. Added the ability to get more than one address range from a SymbolContext class for the case where a block or function has discontiguous address ranges. Modified: lldb/trunk/include/lldb/Core/SourceManager.h lldb/trunk/include/lldb/Core/UserSettingsController.h lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h lldb/trunk/include/lldb/Symbol/Block.h lldb/trunk/include/lldb/Symbol/SymbolContext.h lldb/trunk/include/lldb/Target/PathMappingList.h lldb/trunk/include/lldb/Target/Target.h lldb/trunk/source/API/SBSourceManager.cpp lldb/trunk/source/Commands/CommandObjectRegister.cpp lldb/trunk/source/Commands/CommandObjectSource.cpp lldb/trunk/source/Core/Disassembler.cpp lldb/trunk/source/Core/SourceManager.cpp lldb/trunk/source/Core/UserSettingsController.cpp lldb/trunk/source/Host/common/FileSpec.cpp lldb/trunk/source/Interpreter/Args.cpp lldb/trunk/source/Interpreter/NamedOptionValue.cpp lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp lldb/trunk/source/Symbol/Block.cpp lldb/trunk/source/Symbol/SymbolContext.cpp lldb/trunk/source/Symbol/UnwindTable.cpp lldb/trunk/source/Target/PathMappingList.cpp lldb/trunk/source/Target/StackFrame.cpp lldb/trunk/source/Target/Target.cpp Modified: lldb/trunk/include/lldb/Core/SourceManager.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/SourceManager.h?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/SourceManager.h (original) +++ lldb/trunk/include/lldb/Core/SourceManager.h Fri Apr 22 21:04:55 2011 @@ -29,7 +29,7 @@ class File { public: - File (const FileSpec &file_spec); + File (const FileSpec &file_spec, Target *target); ~File(); size_t @@ -58,8 +58,9 @@ bool CalculateLineOffsets (uint32_t line = UINT32_MAX); - FileSpec m_file_spec; - TimeValue m_mod_time; // Keep the modification time that this file data is valid for + FileSpec m_file_spec_orig; // The original file spec that was used (can be different from m_file_spec) + FileSpec m_file_spec; // The actualy file spec being used (if the target has source mappings, this might be different from m_file_spec_orig) + TimeValue m_mod_time; // Keep the modification time that this file data is valid for lldb::DataBufferSP m_data_sp; typedef std::vector LineOffsets; LineOffsets m_offsets; @@ -77,23 +78,22 @@ typedef lldb::SharedPtr::Type FileSP; FileSP - GetFile (const FileSpec &file_spec); - - FileSP GetLastFile () { return m_last_file_sp; } size_t - DisplaySourceLines (const FileSpec &file, + DisplaySourceLines (Target *target, + const FileSpec &file, uint32_t line, uint32_t context_before, uint32_t context_after, Stream *s); size_t - DisplaySourceLinesWithLineNumbers (const FileSpec &file, + DisplaySourceLinesWithLineNumbers (Target *target, + const FileSpec &file, uint32_t line, uint32_t context_before, uint32_t context_after, @@ -115,6 +115,11 @@ const SymbolContextList *bp_locs = NULL); protected: + + FileSP + GetFile (const FileSpec &file_spec, Target *target); + + //------------------------------------------------------------------ // Classes that inherit from SourceManager can see and modify these //------------------------------------------------------------------ Modified: lldb/trunk/include/lldb/Core/UserSettingsController.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/UserSettingsController.h?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/UserSettingsController.h (original) +++ lldb/trunk/include/lldb/Core/UserSettingsController.h Fri Apr 22 21:04:55 2011 @@ -25,6 +25,7 @@ #include "lldb/Core/Stream.h" #include "lldb/Core/StreamString.h" #include "lldb/Host/Mutex.h" +#include "lldb/Interpreter/NamedOptionValue.h" namespace lldb_private { @@ -231,6 +232,21 @@ const char *new_value, Error &err); + static Error + UpdateStringOptionValue (const char *new_value_cstr, + VarSetOperationType op, + OptionValueString &option_value); + + static Error + UpdateBooleanOptionValue (const char *new_value_cstr, + VarSetOperationType op, + OptionValueBoolean &option_value); + + static Error + UpdateFileSpecOptionValue (const char *new_value_cstr, + VarSetOperationType op, + OptionValueFileSpec &option_value); + static bool InitializeSettingsController (lldb::UserSettingsControllerSP &controller_sp, SettingEntry *global_settings, Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h (original) +++ lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Fri Apr 22 21:04:55 2011 @@ -192,6 +192,13 @@ { return m_current_value; } + + const bool & + operator = (bool b) + { + m_current_value = b; + return m_current_value; + } bool GetCurrentValue() const @@ -274,6 +281,13 @@ // Subclass specific functions //--------------------------------------------------------------------- + const int64_t & + operator = (int64_t value) + { + m_current_value = value; + return m_current_value; + } + int64_t GetCurrentValue() const { @@ -363,6 +377,13 @@ // Subclass specific functions //--------------------------------------------------------------------- + const uint64_t & + operator = (uint64_t value) + { + m_current_value = value; + return m_current_value; + } + uint64_t GetCurrentValue() const { @@ -449,6 +470,16 @@ //--------------------------------------------------------------------- const char * + operator = (const char *value) + { + if (value && value[0]) + m_current_value.assign (value); + else + m_current_value.clear(); + return m_current_value.c_str(); + } + + const char * GetCurrentValue() const { return m_current_value.c_str(); @@ -468,7 +499,14 @@ else m_current_value.clear(); } - + + void + AppendToCurrentValue (const char *value) + { + if (value && value[0]) + m_current_value.append (value); + } + void SetDefaultValue (const char *value) { @@ -541,8 +579,8 @@ // Subclass specific functions //--------------------------------------------------------------------- - const FileSpec & - GetCurrentValue() const + FileSpec & + GetCurrentValue() { return m_current_value; } @@ -622,6 +660,15 @@ } lldb::OptionValueSP + operator[](uint32_t idx) const + { + lldb::OptionValueSP value_sp; + if (idx < m_values.size()) + value_sp = m_values[idx]; + return value_sp; + } + + lldb::OptionValueSP GetValueAtIndex (uint32_t idx) const { lldb::OptionValueSP value_sp; @@ -630,11 +677,6 @@ return value_sp; } - uint64_t - GetUInt64ValueAtIndex (uint32_t idx, - uint64_t fail_value, - bool *success_ptr) const; - bool AppendValue (const lldb::OptionValueSP &value_sp) { Modified: lldb/trunk/include/lldb/Symbol/Block.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Block.h?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/include/lldb/Symbol/Block.h (original) +++ lldb/trunk/include/lldb/Symbol/Block.h Fri Apr 22 21:04:55 2011 @@ -420,6 +420,14 @@ bool GetRangeContainingAddress (const Address& addr, AddressRange &range); + //------------------------------------------------------------------ + // Since blocks might have multiple discontiguous addresss ranges, + // we need to be able to get at any of the address ranges in a block. + //------------------------------------------------------------------ + bool + GetRangeAtIndex (uint32_t range_idx, + AddressRange &range); + bool GetStartAddress (Address &addr); Modified: lldb/trunk/include/lldb/Symbol/SymbolContext.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/SymbolContext.h?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/include/lldb/Symbol/SymbolContext.h (original) +++ lldb/trunk/include/lldb/Symbol/SymbolContext.h Fri Apr 22 21:04:55 2011 @@ -172,10 +172,29 @@ /// Get the address range contained within a symbol context. /// /// Address range priority is as follows: - /// - line_entry address range if line_entry is valid - /// - function address range if function is not NULL - /// - symbol address range if symbol is not NULL - /// + /// - line_entry address range if line_entry is valid and eSymbolContextLineEntry is set in \a scope + /// - block address range if block is not NULL and eSymbolContextBlock is set in \a scope + /// - function address range if function is not NULL and eSymbolContextFunction is set in \a scope + /// - symbol address range if symbol is not NULL and eSymbolContextSymbol is set in \a scope + /// + /// @param[in] scope + /// A mask of symbol context bits telling this function which + /// address ranges it can use when trying to extract one from + /// the valid (non-NULL) symbol context classes. + /// + /// @param[in] range_idx + /// The address range index to grab. Since many functions and + /// blocks are not always contiguous, they may have more than + /// one address range. + /// + /// @param[in] use_inline_block_range + /// If \a scope has the eSymbolContextBlock bit set, and there + /// is a valid block in the symbol context, return the block + /// address range for the containing inline function block, not + /// the deepest most block. This allows us to extract information + /// for the address range of the inlined function block, not + /// the deepest lexical block. + /// /// @param[out] range /// An address range object that will be filled in if \b true /// is returned. @@ -185,7 +204,10 @@ /// an address range, \b false otherwise. //------------------------------------------------------------------ bool - GetAddressRange (uint32_t scope, AddressRange &range) const; + GetAddressRange (uint32_t scope, + uint32_t range_idx, + bool use_inline_block_range, + AddressRange &range) const; void Modified: lldb/trunk/include/lldb/Target/PathMappingList.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/PathMappingList.h?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/PathMappingList.h (original) +++ lldb/trunk/include/lldb/Target/PathMappingList.h Fri Apr 22 21:04:55 2011 @@ -34,9 +34,14 @@ PathMappingList (ChangedCallback callback, void *callback_baton); + PathMappingList (const PathMappingList &rhs); + virtual ~PathMappingList (); + const PathMappingList & + operator =(const PathMappingList &rhs); + void Append (const ConstString &path, const ConstString &replacement, bool notify); @@ -49,6 +54,9 @@ size_t GetSize (); + bool + GetPathsAtIndex (uint32_t idx, ConstString &path, ConstString &new_path) const; + void Insert (const ConstString &path, const ConstString &replacement, @@ -59,22 +67,34 @@ Remove (off_t index, bool notify); bool + Remove (const ConstString &path, bool notify); + + bool + Replace (const ConstString &path, + const ConstString &new_path, + bool notify); + + bool RemapPath (const ConstString &path, ConstString &new_path); + uint32_t + FindIndexForPath (const ConstString &path) const; + protected: typedef std::pair pair; typedef std::vector collection; typedef collection::iterator iterator; typedef collection::const_iterator const_iterator; + iterator + FindIteratorForPath (const ConstString &path); + + const_iterator + FindIteratorForPath (const ConstString &path) const; + collection m_pairs; ChangedCallback m_callback; void * m_callback_baton; -private: - //------------------------------------------------------------------ - // For PathMappingList only - //------------------------------------------------------------------ - DISALLOW_COPY_AND_ASSIGN (PathMappingList); }; } // namespace lldb_private Modified: lldb/trunk/include/lldb/Target/Target.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Target.h?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/Target.h (original) +++ lldb/trunk/include/lldb/Target/Target.h Fri Apr 22 21:04:55 2011 @@ -23,6 +23,7 @@ #include "lldb/Core/ModuleList.h" #include "lldb/Core/UserSettingsController.h" #include "lldb/Expression/ClangPersistentVariables.h" +#include "lldb/Interpreter/NamedOptionValue.h" #include "lldb/Symbol/SymbolContext.h" #include "lldb/Target/ABI.h" #include "lldb/Target/ExecutionContextScope.h" @@ -78,6 +79,12 @@ return m_skip_prologue; } + PathMappingList & + GetSourcePathMap () + { + return m_source_map; + } + protected: void @@ -87,10 +94,11 @@ const ConstString CreateInstanceName (); - std::string m_expr_prefix_path; - std::string m_expr_prefix_contents; - bool m_prefer_dynamic_value; - bool m_skip_prologue; + OptionValueFileSpec m_expr_prefix_file; + lldb::DataBufferSP m_expr_prefix_contents_sp; + OptionValueBoolean m_prefer_dynamic_value; + OptionValueBoolean m_skip_prologue; + PathMappingList m_source_map; }; Modified: lldb/trunk/source/API/SBSourceManager.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBSourceManager.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/API/SBSourceManager.cpp (original) +++ lldb/trunk/source/API/SBSourceManager.cpp Fri Apr 22 21:04:55 2011 @@ -61,7 +61,8 @@ if (file.IsValid()) { - return m_opaque_ptr->DisplaySourceLinesWithLineNumbers (*file, + return m_opaque_ptr->DisplaySourceLinesWithLineNumbers (NULL, + *file, line, context_before, context_after, Modified: lldb/trunk/source/Commands/CommandObjectRegister.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectRegister.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectRegister.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectRegister.cpp Fri Apr 22 21:04:55 2011 @@ -170,7 +170,7 @@ { for (uint32_t i=0; iGetUInt64Value (UINT32_MAX, NULL); if (set_idx != UINT32_MAX) { if (!DumpRegisterSet (exe_ctx, strm, reg_ctx, set_idx)) Modified: lldb/trunk/source/Commands/CommandObjectSource.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectSource.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectSource.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectSource.cpp Fri Apr 22 21:04:55 2011 @@ -429,7 +429,8 @@ m_breakpoint_locations.Clear(); result.AppendMessageWithFormat("File: %s.\n", path_buf); - m_interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers (start_file, + m_interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers (target, + start_file, line_no, 0, m_options.num_lines, @@ -580,7 +581,8 @@ else m_breakpoint_locations.Clear(); - m_interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers (sc.comp_unit, + m_interpreter.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers (target, + sc.comp_unit, m_options.start_line, 0, m_options.num_lines, Modified: lldb/trunk/source/Core/Disassembler.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Disassembler.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Core/Disassembler.cpp (original) +++ lldb/trunk/source/Core/Disassembler.cpp Fri Apr 22 21:04:55 2011 @@ -119,12 +119,13 @@ const size_t count = sc_list.GetSize(); SymbolContext sc; AddressRange range; - + const uint32_t scope = eSymbolContextBlock | eSymbolContextFunction | eSymbolContextSymbol; + const bool use_inline_block_range = true; for (size_t i=0; iGetFrameCodeAddress(); + const uint32_t scope = eSymbolContextLineEntry | eSymbolContextFunction | eSymbolContextSymbol; + const bool use_inline_block_range = false; for (size_t i=0; iGetFileSpec().GetFilename(); + bool show_fullpaths = false; + bool show_module = true; + bool show_inlined_frames = true; + sc.DumpStopContext (&strm, + exe_scope, + addr, + show_fullpaths, + show_module, + show_inlined_frames); - if (sc.function) - strm << '`' << sc.function->GetMangled().GetName(); - else if (sc.symbol) - strm << '`' << sc.symbol->GetMangled().GetName(); strm << ":\n"; } } Modified: lldb/trunk/source/Core/SourceManager.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/SourceManager.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Core/SourceManager.cpp (original) +++ lldb/trunk/source/Core/SourceManager.cpp Fri Apr 22 21:04:55 2011 @@ -16,6 +16,7 @@ #include "lldb/Core/DataBuffer.h" #include "lldb/Core/Stream.h" #include "lldb/Symbol/SymbolContext.h" +#include "lldb/Target/Target.h" using namespace lldb_private; @@ -47,6 +48,7 @@ size_t SourceManager::DisplaySourceLines ( + Target *target, const FileSpec &file_spec, uint32_t line, uint32_t context_before, @@ -54,7 +56,7 @@ Stream *s ) { - m_last_file_sp = GetFile (file_spec); + m_last_file_sp = GetFile (file_spec, target); m_last_file_line = line + context_after + 1; m_last_file_context_before = context_before; m_last_file_context_after = context_after; @@ -65,7 +67,7 @@ } SourceManager::FileSP -SourceManager::GetFile (const FileSpec &file_spec) +SourceManager::GetFile (const FileSpec &file_spec, Target *target) { FileSP file_sp; FileCache::iterator pos = m_file_cache.find(file_spec); @@ -73,7 +75,7 @@ file_sp = pos->second; else { - file_sp.reset (new File (file_spec)); + file_sp.reset (new File (file_spec, target)); m_file_cache[file_spec] = file_sp; } return file_sp; @@ -149,6 +151,7 @@ size_t SourceManager::DisplaySourceLinesWithLineNumbers ( + Target *target, const FileSpec &file_spec, uint32_t line, uint32_t context_before, @@ -161,7 +164,7 @@ bool same_as_previous = m_last_file_sp && m_last_file_sp->FileSpecMatches (file_spec); if (!same_as_previous) - m_last_file_sp = GetFile (file_spec); + m_last_file_sp = GetFile (file_spec, target); if (line == 0) { @@ -186,12 +189,21 @@ -SourceManager::File::File(const FileSpec &file_spec) : +SourceManager::File::File(const FileSpec &file_spec, Target *target) : + m_file_spec_orig (file_spec), m_file_spec(file_spec), - m_mod_time (m_file_spec.GetModificationTime()), - m_data_sp(file_spec.ReadFileContents ()), + m_mod_time (file_spec.GetModificationTime()), + m_data_sp(), m_offsets() { + if (!m_mod_time.IsValid()) + { + if (target->GetSourcePathMap().RemapPath(file_spec.GetDirectory(), m_file_spec.GetDirectory())) + m_mod_time = file_spec.GetModificationTime(); + } + + if (m_mod_time.IsValid()) + m_data_sp = m_file_spec.ReadFileContents (); } SourceManager::File::~File() Modified: lldb/trunk/source/Core/UserSettingsController.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/UserSettingsController.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Core/UserSettingsController.cpp (original) +++ lldb/trunk/source/Core/UserSettingsController.cpp Fri Apr 22 21:04:55 2011 @@ -737,8 +737,15 @@ if (entry.var_type == eSetVarTypeEnum) value = entry.enum_values[0].string_value; - m_default_settings->UpdateInstanceSettingsVariable (var_name, NULL, value, default_name, entry, - eVarSetOperationAssign, err, true); + if (value != NULL) + m_default_settings->UpdateInstanceSettingsVariable (var_name, + NULL, + value, + default_name, + entry, + eVarSetOperationAssign, + err, + true); } } @@ -2026,6 +2033,75 @@ err.SetErrorString ("Unrecognized operation. Cannot update value.\n"); } +Error +UserSettingsController::UpdateStringOptionValue (const char *value, + VarSetOperationType op, + OptionValueString &option_value) +{ + Error error; + if (op == eVarSetOperationAssign) + { + option_value.SetCurrentValue (value); + } + else if (op == eVarSetOperationAppend) + { + option_value.AppendToCurrentValue (value); + } + else if (op == eVarSetOperationClear) + { + option_value.Clear(); + } + else + { + error.SetErrorString ("Unrecognized operation. Cannot update value.\n"); + } + return error; +} + +Error +UserSettingsController::UpdateFileSpecOptionValue (const char *value, + VarSetOperationType op, + OptionValueFileSpec &option_value) +{ + Error error; + if (op == eVarSetOperationAssign) + { + option_value.GetCurrentValue().SetFile (value, false); + } + else if (op == eVarSetOperationAppend) + { + char path[PATH_MAX]; + if (option_value.GetCurrentValue().GetPath (path, sizeof(path))) + { + int path_len = ::strlen (path); + int value_len = ::strlen (value); + if (value_len + 1 > sizeof(path) - path_len) + { + error.SetErrorString("path too long."); + } + else + { + ::strncat (path, value, sizeof(path) - path_len - 1); + option_value.GetCurrentValue().SetFile (path, false); + } + } + else + { + error.SetErrorString("path too long."); + } + } + else if (op == eVarSetOperationClear) + { + option_value.Clear(); + } + else + { + error.SetErrorString ("operation not supported for FileSpec option value type."); + } + return error; +} + + void UserSettingsController::UpdateBooleanVariable (VarSetOperationType op, bool &bool_value, @@ -2074,6 +2150,53 @@ break; } } +Error +UserSettingsController::UpdateBooleanOptionValue (const char *value, + VarSetOperationType op, + OptionValueBoolean &option_value) +{ + Error error; + switch (op) + { + case eVarSetOperationReplace: + case eVarSetOperationInsertBefore: + case eVarSetOperationInsertAfter: + case eVarSetOperationRemove: + case eVarSetOperationAppend: + case eVarSetOperationInvalid: + default: + error.SetErrorString ("Invalid operation for Boolean variable. Cannot update value.\n"); + break; + + case eVarSetOperationClear: + option_value.Clear(); + break; + + case eVarSetOperationAssign: + { + bool success = false; + error = option_value.SetValueFromCString(value); + + if (value == NULL) + error.SetErrorStringWithFormat ("invalid boolean string value (NULL)\n", value); + else if (value[0] == '\0') + error.SetErrorStringWithFormat ("invalid boolean string value (empty)\n", value); + else + { + bool new_value = Args::StringToBoolean (value, false, &success); + if (success) + { + error.Clear(); + option_value = new_value; + } + else + error.SetErrorStringWithFormat ("invalid boolean string value: '%s'\n", value); + } + } + break; + } + return error; +} void UserSettingsController::UpdateStringArrayVariable (VarSetOperationType op, Modified: lldb/trunk/source/Host/common/FileSpec.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/FileSpec.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Host/common/FileSpec.cpp (original) +++ lldb/trunk/source/Host/common/FileSpec.cpp Fri Apr 22 21:04:55 2011 @@ -39,7 +39,7 @@ GetFileStats (const FileSpec *file_spec, struct stat *stats_ptr) { char resolved_path[PATH_MAX]; - if (file_spec->GetPath(&resolved_path[0], sizeof(resolved_path))) + if (file_spec->GetPath (resolved_path, sizeof(resolved_path))) return ::stat (resolved_path, stats_ptr) == 0; return false; } Modified: lldb/trunk/source/Interpreter/Args.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/Args.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/Args.cpp (original) +++ lldb/trunk/source/Interpreter/Args.cpp Fri Apr 22 21:04:55 2011 @@ -893,10 +893,13 @@ case 'c': format = eFormatChar; break; case 'C': format = eFormatCharPrintable; break; case 'o': format = eFormatOctal; break; + case 'O': format = eFormatOSType; break; case 'i': case 'd': format = eFormatDecimal; break; + case 'I': format = eFormatComplexInteger; break; case 'u': format = eFormatUnsigned; break; case 'x': format = eFormatHex; break; + case 'X': format = eFormatComplex; break; case 'f': case 'e': case 'g': format = eFormatFloat; break; @@ -913,10 +916,14 @@ " f - float\n" " g - float\n" " i - signed decimal\n" + " i - complex integer\n" " o - octal\n" + " O - OSType\n" + " p - pointer\n" " s - c-string\n" " u - unsigned decimal\n" " x - hex\n" + " X - complex float\n" " y - bytes\n" " Y - bytes with ASCII\n", s[0]); break; Modified: lldb/trunk/source/Interpreter/NamedOptionValue.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/NamedOptionValue.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/NamedOptionValue.cpp (original) +++ lldb/trunk/source/Interpreter/NamedOptionValue.cpp Fri Apr 22 21:04:55 2011 @@ -156,7 +156,12 @@ } else { - error.SetErrorStringWithFormat ("invalid boolean string value: '%s'\n", value_cstr); + if (value_cstr == NULL) + error.SetErrorString ("invalid boolean string value: NULL\n"); + else if (value_cstr[0] == '\0') + error.SetErrorString ("invalid boolean string value \n"); + else + error.SetErrorStringWithFormat ("invalid boolean string value: '%s'\n", value_cstr); } return error; } @@ -303,17 +308,6 @@ return error; } - -uint64_t -OptionValueArray::GetUInt64ValueAtIndex (uint32_t idx, uint64_t fail_value, bool *success_ptr) const -{ - if (idx < m_values.size()) - return m_values[idx]->GetUInt64Value (fail_value, success_ptr); - return fail_value; -} - - - //------------------------------------------------------------------------- // OptionValueDictionary //------------------------------------------------------------------------- Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp (original) +++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp Fri Apr 22 21:04:55 2011 @@ -1215,7 +1215,7 @@ AddressRange addr_range; if (target_symbols.GetContextAtIndex(0, context)) { - context.GetAddressRange (eSymbolContextEverything, addr_range); + context.GetAddressRange (eSymbolContextEverything, 0, false, addr_range); thread_plan_sp.reset (new ThreadPlanRunToAddress (thread, addr_range.GetBaseAddress(), stop_others)); } else @@ -1234,7 +1234,7 @@ AddressRange addr_range; if (target_symbols.GetContextAtIndex(i, context)) { - context.GetAddressRange (eSymbolContextEverything, addr_range); + context.GetAddressRange (eSymbolContextEverything, 0, false, addr_range); lldb::addr_t load_addr = addr_range.GetBaseAddress().GetLoadAddress(&thread.GetProcess().GetTarget()); addresses[i] = load_addr; } Modified: lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp (original) +++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp Fri Apr 22 21:04:55 2011 @@ -92,7 +92,7 @@ m_sym_ctx = frame_sp->GetSymbolContext (eSymbolContextFunction | eSymbolContextSymbol); m_sym_ctx_valid = true; AddressRange addr_range; - m_sym_ctx.GetAddressRange (eSymbolContextFunction | eSymbolContextSymbol, addr_range); + m_sym_ctx.GetAddressRange (eSymbolContextFunction | eSymbolContextSymbol, 0, false, addr_range); m_current_pc = frame_sp->GetFrameCodeAddress(); @@ -302,7 +302,7 @@ } AddressRange addr_range; - if (!m_sym_ctx.GetAddressRange (eSymbolContextFunction | eSymbolContextSymbol, addr_range)) + if (!m_sym_ctx.GetAddressRange (eSymbolContextFunction | eSymbolContextSymbol, 0, false, addr_range)) { m_sym_ctx_valid = false; } @@ -339,7 +339,7 @@ { m_sym_ctx_valid = true; } - if (!m_sym_ctx.GetAddressRange (eSymbolContextFunction | eSymbolContextSymbol, addr_range)) + if (!m_sym_ctx.GetAddressRange (eSymbolContextFunction | eSymbolContextSymbol, 0, false, addr_range)) { m_sym_ctx_valid = false; } Modified: lldb/trunk/source/Symbol/Block.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Block.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Symbol/Block.cpp (original) +++ lldb/trunk/source/Symbol/Block.cpp Fri Apr 22 21:04:55 2011 @@ -160,9 +160,15 @@ bool show_fullpaths, bool show_inline_blocks) { - Block* parent_block = GetParent(); + const InlineFunctionInfo* inline_info = NULL; + Block* inlined_block; + if (sc_ptr) + inlined_block = GetContainingInlinedBlock (); + else + inlined_block = GetInlinedParent(); - const InlineFunctionInfo* inline_info = GetInlinedFunctionInfo (); + if (inlined_block) + inline_info = inlined_block->GetInlinedFunctionInfo(); const Declaration *inline_call_site = child_inline_call_site; if (inline_info) { @@ -176,7 +182,10 @@ s->EOL(); else s->PutChar(' '); - + + if (sc_ptr == NULL) + s->Indent(); + s->PutCString(inline_info->GetName ().AsCString()); if (child_inline_call_site && child_inline_call_site->IsValid()) @@ -186,6 +195,12 @@ } } + // The first call to this function from something that has a symbol + // context will pass in a valid sc_ptr. Subsequent calls to this function + // from this function for inline purposes will NULL out sc_ptr. So on the + // first time through we dump the line table entry (which is always at the + // deepest inline code block). And subsequent calls to this function we + // will use hte inline call site information to print line numbers. if (sc_ptr) { // If we have any inlined functions, this will be the deepest most @@ -199,13 +214,13 @@ if (show_inline_blocks) { - if (parent_block) + if (inlined_block) { - parent_block->Block::DumpStopContext (s, - NULL, - inline_call_site, - show_fullpaths, - show_inline_blocks); + inlined_block->Block::DumpStopContext (s, + NULL, + inline_call_site, + show_fullpaths, + show_inline_blocks); } else if (child_inline_call_site) { @@ -358,6 +373,23 @@ return false; } +bool +Block::GetRangeAtIndex (uint32_t range_idx, AddressRange &range) +{ + if (range_idx < m_ranges.size()) + { + SymbolContext sc; + CalculateSymbolContext(&sc); + if (sc.function) + { + range.GetBaseAddress() = sc.function->GetAddressRange().GetBaseAddress(); + range.GetBaseAddress().Slide(m_ranges[range_idx].GetBaseAddress ()); + range.SetByteSize (m_ranges[range_idx].GetByteSize()); + return true; + } + } + return false; +} bool Block::GetStartAddress (Address &addr) Modified: lldb/trunk/source/Symbol/SymbolContext.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/SymbolContext.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Symbol/SymbolContext.cpp (original) +++ lldb/trunk/source/Symbol/SymbolContext.cpp Fri Apr 22 21:04:55 2011 @@ -343,36 +343,61 @@ } bool -SymbolContext::GetAddressRange (uint32_t scope, AddressRange &range) const +SymbolContext::GetAddressRange (uint32_t scope, + uint32_t range_idx, + bool use_inline_block_range, + AddressRange &range) const { if ((scope & eSymbolContextLineEntry) && line_entry.IsValid()) { range = line_entry.range; return true; } - else if ((scope & eSymbolContextFunction) && function != NULL) + + if ((scope & eSymbolContextBlock) && (block != NULL)) { - range = function->GetAddressRange(); - return true; + if (use_inline_block_range) + { + Block *inline_block = block->GetContainingInlinedBlock(); + if (inline_block) + return inline_block->GetRangeAtIndex (range_idx, range); + } + else + { + return block->GetRangeAtIndex (range_idx, range); + } } - else if ((scope & eSymbolContextSymbol) && symbol != NULL && symbol->GetAddressRangePtr()) - { - range = *symbol->GetAddressRangePtr(); - if (range.GetByteSize() == 0) + if ((scope & eSymbolContextFunction) && (function != NULL)) + { + if (range_idx == 0) { - if (module_sp) + range = function->GetAddressRange(); + return true; + } + } + + if ((scope & eSymbolContextSymbol) && (symbol != NULL) && (symbol->GetAddressRangePtr() != NULL)) + { + if (range_idx == 0) + { + range = *symbol->GetAddressRangePtr(); + + if (range.GetByteSize() == 0) { - ObjectFile *objfile = module_sp->GetObjectFile(); - if (objfile) + if (module_sp) { - Symtab *symtab = objfile->GetSymtab(); - if (symtab) - range.SetByteSize(symtab->CalculateSymbolSize (symbol)); + ObjectFile *objfile = module_sp->GetObjectFile(); + if (objfile) + { + Symtab *symtab = objfile->GetSymtab(); + if (symtab) + range.SetByteSize(symtab->CalculateSymbolSize (symbol)); + } } } + return true; } - return true; } range.Clear(); return false; Modified: lldb/trunk/source/Symbol/UnwindTable.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/UnwindTable.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Symbol/UnwindTable.cpp (original) +++ lldb/trunk/source/Symbol/UnwindTable.cpp Fri Apr 22 21:04:55 2011 @@ -94,7 +94,7 @@ } AddressRange range; - if (!sc.GetAddressRange(eSymbolContextFunction | eSymbolContextSymbol, range) || !range.GetBaseAddress().IsValid()) + if (!sc.GetAddressRange(eSymbolContextFunction | eSymbolContextSymbol, 0, false, range) || !range.GetBaseAddress().IsValid()) { // Does the eh_frame unwind info has a function bounds for this addr? if (m_eh_frame == NULL || !m_eh_frame->GetAddressRange (addr, range)) Modified: lldb/trunk/source/Target/PathMappingList.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/PathMappingList.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Target/PathMappingList.cpp (original) +++ lldb/trunk/source/Target/PathMappingList.cpp Fri Apr 22 21:04:55 2011 @@ -33,6 +33,28 @@ { } + +PathMappingList::PathMappingList (const PathMappingList &rhs) : + m_pairs (rhs.m_pairs), + m_callback (NULL), + m_callback_baton (NULL) +{ + +} + +const PathMappingList & +PathMappingList::operator =(const PathMappingList &rhs) +{ + if (this != &rhs) + { + m_pairs = rhs.m_pairs; + m_callback = NULL; + m_callback_baton = NULL; + } + return *this; +} + + //---------------------------------------------------------------------- // Destructor //---------------------------------------------------------------------- @@ -124,3 +146,91 @@ } return false; } + +bool +PathMappingList::Replace (const ConstString &path, const ConstString &new_path, bool notify) +{ + uint32_t idx = FindIndexForPath (path); + if (idx < m_pairs.size()) + { + m_pairs[idx].second = new_path; + if (notify && m_callback) + m_callback (*this, m_callback_baton); + return true; + } + return false; +} + +bool +PathMappingList::Remove (const ConstString &path, bool notify) +{ + iterator pos = FindIteratorForPath (path); + if (pos != m_pairs.end()) + { + m_pairs.erase (pos); + if (notify && m_callback) + m_callback (*this, m_callback_baton); + return true; + } + return false; +} + +PathMappingList::const_iterator +PathMappingList::FindIteratorForPath (const ConstString &path) const +{ + const_iterator pos; + const_iterator begin = m_pairs.begin(); + const_iterator end = m_pairs.end(); + + for (pos = begin; pos != end; ++pos) + { + if (pos->first == path) + break; + } + return pos; +} + +PathMappingList::iterator +PathMappingList::FindIteratorForPath (const ConstString &path) +{ + iterator pos; + iterator begin = m_pairs.begin(); + iterator end = m_pairs.end(); + + for (pos = begin; pos != end; ++pos) + { + if (pos->first == path) + break; + } + return pos; +} + +bool +PathMappingList::GetPathsAtIndex (uint32_t idx, ConstString &path, ConstString &new_path) const +{ + if (idx < m_pairs.size()) + { + path = m_pairs[idx].first; + new_path = m_pairs[idx].second; + return true; + } + return false; +} + + + +uint32_t +PathMappingList::FindIndexForPath (const ConstString &path) const +{ + const_iterator pos; + const_iterator begin = m_pairs.begin(); + const_iterator end = m_pairs.end(); + + for (pos = begin; pos != end; ++pos) + { + if (pos->first == path) + return std::distance (begin, pos); + } + return UINT32_MAX; +} + Modified: lldb/trunk/source/Target/StackFrame.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StackFrame.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Target/StackFrame.cpp (original) +++ lldb/trunk/source/Target/StackFrame.cpp Fri Apr 22 21:04:55 2011 @@ -1013,7 +1013,9 @@ if (m_sc.comp_unit && m_sc.line_entry.IsValid()) { - GetThread().GetProcess().GetTarget().GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers ( + Target &target = GetThread().GetProcess().GetTarget(); + target.GetDebugger().GetSourceManager().DisplaySourceLinesWithLineNumbers ( + &target, m_sc.line_entry.file, m_sc.line_entry.line, 3, Modified: lldb/trunk/source/Target/Target.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=130044&r1=130043&r2=130044&view=diff ============================================================================== --- lldb/trunk/source/Target/Target.cpp (original) +++ lldb/trunk/source/Target/Target.cpp Fri Apr 22 21:04:55 2011 @@ -877,7 +877,9 @@ const char * Target::GetExpressionPrefixContentsAsCString () { - return m_expr_prefix_contents.c_str(); + if (m_expr_prefix_contents_sp) + return (const char *)m_expr_prefix_contents_sp->GetBytes(); + return NULL; } ExecutionResults @@ -1291,13 +1293,13 @@ #define TSC_EXPR_PREFIX "expr-prefix" #define TSC_PREFER_DYNAMIC "prefer-dynamic-value" #define TSC_SKIP_PROLOGUE "skip-prologue" +#define TSC_SOURCE_MAP "source-map" static const ConstString & GetSettingNameForDefaultArch () { static ConstString g_const_string (TSC_DEFAULT_ARCH); - return g_const_string; } @@ -1315,6 +1317,12 @@ return g_const_string; } +static const ConstString & +GetSettingNameForSourcePathMap () +{ + static ConstString g_const_string (TSC_SOURCE_MAP); + return g_const_string; +} static const ConstString & GetSettingNameForSkipPrologue () @@ -1372,10 +1380,11 @@ const char *name ) : InstanceSettings (owner, name ? name : InstanceSettings::InvalidName().AsCString(), live_instance), - m_expr_prefix_path (), - m_expr_prefix_contents (), - m_prefer_dynamic_value (true), - m_skip_prologue (true) + m_expr_prefix_file (), + m_expr_prefix_contents_sp (), + m_prefer_dynamic_value (true, true), + m_skip_prologue (true, true), + m_source_map (NULL, NULL) { // CopyInstanceSettings is a pure virtual function in InstanceSettings; it therefore cannot be called // until the vtables for TargetInstanceSettings are properly set up, i.e. AFTER all the initializers. @@ -1396,7 +1405,12 @@ } TargetInstanceSettings::TargetInstanceSettings (const TargetInstanceSettings &rhs) : - InstanceSettings (*Target::GetSettingsController(), CreateInstanceName().AsCString()) + InstanceSettings (*Target::GetSettingsController(), CreateInstanceName().AsCString()), + m_expr_prefix_file (rhs.m_expr_prefix_file), + m_expr_prefix_contents_sp (rhs.m_expr_prefix_contents_sp), + m_prefer_dynamic_value (rhs.m_prefer_dynamic_value), + m_skip_prologue (rhs.m_skip_prologue), + m_source_map (rhs.m_source_map) { if (m_instance_name != InstanceSettings::GetDefaultName()) { @@ -1431,53 +1445,100 @@ { if (var_name == GetSettingNameForExpressionPrefix ()) { - switch (op) + err = UserSettingsController::UpdateFileSpecOptionValue (value, op, m_expr_prefix_file); + if (err.Success()) { - default: - err.SetErrorToGenericError (); - err.SetErrorString ("Unrecognized operation. Cannot update value.\n"); - return; - case eVarSetOperationAssign: + switch (op) { - FileSpec file_spec(value, true); - - if (!file_spec.Exists()) - { - err.SetErrorToGenericError (); - err.SetErrorStringWithFormat ("%s does not exist.\n", value); - return; - } - - DataBufferSP data_sp (file_spec.ReadFileContents()); - - if (!data_sp && data_sp->GetByteSize() == 0) + default: + break; + case eVarSetOperationAssign: + case eVarSetOperationAppend: { - err.SetErrorToGenericError (); - err.SetErrorStringWithFormat ("Couldn't read from %s\n", value); - return; + if (!m_expr_prefix_file.GetCurrentValue().Exists()) + { + err.SetErrorToGenericError (); + err.SetErrorStringWithFormat ("%s does not exist.\n", value); + return; + } + + m_expr_prefix_contents_sp = m_expr_prefix_file.GetCurrentValue().ReadFileContents(); + + if (!m_expr_prefix_contents_sp && m_expr_prefix_contents_sp->GetByteSize() == 0) + { + err.SetErrorStringWithFormat ("Couldn't read data from '%s'\n", value); + m_expr_prefix_contents_sp.reset(); + } } - - m_expr_prefix_path = value; - m_expr_prefix_contents.assign(reinterpret_cast(data_sp->GetBytes()), data_sp->GetByteSize()); + break; + case eVarSetOperationClear: + m_expr_prefix_contents_sp.reset(); } - return; - case eVarSetOperationAppend: - err.SetErrorToGenericError (); - err.SetErrorString ("Cannot append to a path.\n"); - return; - case eVarSetOperationClear: - m_expr_prefix_path.clear (); - m_expr_prefix_contents.clear (); - return; } } else if (var_name == GetSettingNameForPreferDynamicValue()) { - UserSettingsController::UpdateBooleanVariable (op, m_prefer_dynamic_value, value, true, err); + err = UserSettingsController::UpdateBooleanOptionValue (value, op, m_prefer_dynamic_value); } else if (var_name == GetSettingNameForSkipPrologue()) { - UserSettingsController::UpdateBooleanVariable (op, m_skip_prologue, value, true, err); + err = UserSettingsController::UpdateBooleanOptionValue (value, op, m_skip_prologue); + } + else if (var_name == GetSettingNameForSourcePathMap ()) + { + switch (op) + { + case eVarSetOperationReplace: + case eVarSetOperationInsertBefore: + case eVarSetOperationInsertAfter: + case eVarSetOperationRemove: + default: + break; + case eVarSetOperationAssign: + m_source_map.Clear(true); + // Fall through to append.... + case eVarSetOperationAppend: + { + Args args(value); + const uint32_t argc = args.GetArgumentCount(); + if (argc & 1 || argc == 0) + { + err.SetErrorStringWithFormat ("an even number of paths must be supplied to to the source-map setting: %u arguments given", argc); + } + else + { + char resolved_new_path[PATH_MAX]; + FileSpec file_spec; + const char *old_path; + for (uint32_t idx = 0; (old_path = args.GetArgumentAtIndex(idx)) != NULL; idx += 2) + { + const char *new_path = args.GetArgumentAtIndex(idx+1); + assert (new_path); // We have an even number of paths, this shouldn't happen! + + file_spec.SetFile(new_path, true); + if (file_spec.Exists()) + { + if (file_spec.GetPath (resolved_new_path, sizeof(resolved_new_path)) >= sizeof(resolved_new_path)) + { + err.SetErrorStringWithFormat("new path '%s' is too long", new_path); + return; + } + } + else + { + err.SetErrorStringWithFormat("new path '%s' doesn't exist", new_path); + return; + } + m_source_map.Append(ConstString (old_path), ConstString (resolved_new_path), true); + } + } + } + break; + + case eVarSetOperationClear: + m_source_map.Clear(true); + break; + } } } @@ -1489,9 +1550,10 @@ if (!new_settings_ptr) return; - m_expr_prefix_path = new_settings_ptr->m_expr_prefix_path; - m_expr_prefix_contents = new_settings_ptr->m_expr_prefix_contents; - m_prefer_dynamic_value = new_settings_ptr->m_prefer_dynamic_value; + m_expr_prefix_file = new_settings_ptr->m_expr_prefix_file; + m_expr_prefix_contents_sp = new_settings_ptr->m_expr_prefix_contents_sp; + m_prefer_dynamic_value = new_settings_ptr->m_prefer_dynamic_value; + m_skip_prologue = new_settings_ptr->m_skip_prologue; } bool @@ -1502,7 +1564,10 @@ { if (var_name == GetSettingNameForExpressionPrefix ()) { - value.AppendString (m_expr_prefix_path.c_str(), m_expr_prefix_path.size()); + char path[PATH_MAX]; + const size_t path_len = m_expr_prefix_file.GetCurrentValue().GetPath (path, sizeof(path)); + if (path_len > 0) + value.AppendString (path, path_len); } else if (var_name == GetSettingNameForPreferDynamicValue()) { @@ -1518,6 +1583,9 @@ else value.AppendString ("false"); } + else if (var_name == GetSettingNameForSourcePathMap ()) + { + } else { if (err) @@ -1562,5 +1630,6 @@ { TSC_EXPR_PREFIX , eSetVarTypeString , NULL , NULL, false, false, "Path to a file containing expressions to be prepended to all expressions." }, { TSC_PREFER_DYNAMIC, eSetVarTypeBoolean ,"true" , NULL, false, false, "Should printed values be shown as their dynamic value." }, { TSC_SKIP_PROLOGUE , eSetVarTypeBoolean ,"true" , NULL, false, false, "Skip function prologues when setting breakpoints by name." }, + { TSC_SOURCE_MAP , eSetVarTypeArray ,NULL , NULL, false, false, "Source path remappings to use when locating source files from debug information." }, { NULL , eSetVarTypeNone , NULL , NULL, false, false, NULL } };