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 <target-idx>" 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.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@129695 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
index 4f71a1b..5ddcd72 100644
--- a/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
+++ b/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
@@ -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);
diff --git a/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h b/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
index 69998d9..953f5f4 100644
--- a/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
+++ b/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
@@ -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;
};
diff --git a/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
index d3a11e4..4998426 100644
--- a/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
@@ -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;
}
diff --git a/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp b/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
index 3e0b2b1..881b15b 100644
--- a/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
@@ -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");
}