summaryrefslogtreecommitdiffstats
path: root/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2011-04-18 08:33:37 +0000
committerGreg Clayton <gclayton@apple.com>2011-04-18 08:33:37 +0000
commit7260f6206f4f38273b5bef39361543c7245c99dd (patch)
tree54c9177272ba4f605a5bc538750f46116a39c376 /lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
parent48f75ad67813037ea12d5d10d887ef1014d9c307 (diff)
downloadbcm5719-llvm-7260f6206f4f38273b5bef39361543c7245c99dd.tar.gz
bcm5719-llvm-7260f6206f4f38273b5bef39361543c7245c99dd.zip
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. llvm-svn: 129695
Diffstat (limited to 'lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp')
-rw-r--r--lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp22
1 files changed, 19 insertions, 3 deletions
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
index 4f71a1b339f..5ddcd727bc0 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
@@ -76,9 +76,11 @@ static int IPRegisterReader(uint64_t *value, unsigned regID, void* arg)
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 @@ InstructionLLVM::Dump
int numTokens = -1;
if (!raw)
+ raw = m_force_raw;
+
+ if (!raw)
numTokens = EDNumTokens(m_inst);
int currentOpIndex = -1;
@@ -471,9 +476,20 @@ DisassemblerLLVM::DecodeInstructions
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);
OpenPOWER on IntegriCloud