replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added the ability to get the min and max instruction byte size for 

an architecture into ArchSpec:

uint32_t
ArchSpec::GetMinimumOpcodeByteSize() const;

uint32_t
ArchSpec::GetMaximumOpcodeByteSize() const;

Added an AddressClass to the Instruction class in Disassembler.h.
This allows decoded instructions to know know if they are code,
code with alternate ISA (thumb), or even data which can be mixed
into code. The instruction does have an address, but it is a good
idea to cache this value so we don't have to look it up more than 
once.

Fixed an issue in Opcode::SetOpcodeBytes() where the length wasn't
getting set.

Changed:

	bool
	SymbolContextList::AppendIfUnique (const SymbolContext& sc);

To:
	bool
	SymbolContextList::AppendIfUnique (const SymbolContext& sc, 
									   bool merge_symbol_into_function);

This function was typically being used when looking up functions
and symbols. Now if you lookup a function, then find the symbol,
they can be merged into the same symbol context and not cause
multiple symbol contexts to appear in a symbol context list that
describes the same function.

Fixed the SymbolContext not equal operator which was causing mixed
mode disassembly to not work ("disassembler --mixed --name main").

Modified the disassembler classes to know about the fact we know,
for a given architecture, what the min and max opcode byte sizes
are. The InstructionList class was modified to return the max
opcode byte size for all of the instructions in its list.
These two fixes means when disassemble a list of instructions and dump 
them and show the opcode bytes, we can format the output more 
intelligently when showing opcode bytes. This affects any architectures
that have varying opcode byte sizes (x86_64 and i386). Knowing the max
opcode byte size also helps us to be able to disassemble N instructions
without having to re-read data if we didn't read enough bytes.

Added the ability to set the architecture for the disassemble command.
This means you can easily cross disassemble data for any supported 
architecture. I also added the ability to specify "thumb" as an 
architecture so that we can force disassembly into thumb mode when
needed. In GDB this was done using a hack of specifying an odd
address when disassembling. I don't want to repeat this hack in LLDB,
so the auto detection between ARM and thumb is failing, just specify
thumb when disassembling:

(lldb) disassemble --arch thumb --name main

You can also have data in say an x86_64 file executable and disassemble
data as any other supported architecture:
% lldb a.out
Current executable set to 'a.out' (x86_64).
(lldb) b main
(lldb) run
(lldb) disassemble --arch thumb --count 2 --start-address 0x0000000100001080 --bytes
0x100001080:  0xb580 push   {r7, lr}
0x100001082:  0xaf00 add    r7, sp, #0

Fixed Target::ReadMemory(...) to be able to deal with Address argument object
that isn't section offset. When an address object was supplied that was
out on the heap or stack, target read memory would fail. Disassembly uses
Target::ReadMemory(...), and the example above where we disassembler thumb
opcodes in an x86 binary was failing do to this bug.

llvm-svn: 128347
This commit is contained in:
Greg Clayton 2011-03-26 19:14:58 +00:00
parent bbbeea11a8
commit 357132eb9a
20 changed files with 329 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lldb/include/lldb/Core/ArchSpec.h
View File

@ -47,6 +47,7 @@ public:
eCore_arm_armv7k, eCore_arm_armv7k,
eCore_arm_armv7s, eCore_arm_armv7s,
eCore_arm_xscale, eCore_arm_xscale,
eCore_thumb_generic,
eCore_ppc_generic, eCore_ppc_generic,
eCore_ppc_ppc601, eCore_ppc_ppc601,
@ -258,7 +259,16 @@ public:
/// and the default/assumed byte order may be incorrect. /// and the default/assumed byte order may be incorrect.
//------------------------------------------------------------------ //------------------------------------------------------------------
void void
SetByteOrder (lldb::ByteOrder byteorder); SetByteOrder (lldb::ByteOrder byte_order)
{
m_byte_order = byte_order;
}
uint32_t
GetMinimumOpcodeByteSize() const;
uint32_t
GetMaximumOpcodeByteSize() const;
Core Core
GetCore () const GetCore () const

27
lldb/include/lldb/Core/Disassembler.h
View File

@ -27,7 +27,7 @@ namespace lldb_private {
class Instruction class Instruction
{ {
public: public:
Instruction (const Address &address); Instruction (const Address &address, AddressClass addr_class);
virtual virtual
~Instruction(); ~Instruction();
@ -38,14 +38,21 @@ public:
return m_address; return m_address;
} }
AddressClass
GetAddressClass ();
void void
SetAddress (const Address &addr) SetAddress (const Address &addr)
{ {
// Invalidate the address class to lazily discover
// it if we need to.
m_address_class = eAddressClassInvalid;
m_address = addr; m_address = addr;
} }
virtual void virtual void
Dump (Stream *s, Dump (Stream *s,
uint32_t max_opcode_byte_size,
bool show_address, bool show_address,
bool show_bytes, bool show_bytes,
const ExecutionContext *exe_ctx, const ExecutionContext *exe_ctx,
@ -55,7 +62,7 @@ public:
DoesBranch () const = 0; DoesBranch () const = 0;
virtual size_t virtual size_t
Extract (const Disassembler &disassembler, Decode (const Disassembler &disassembler,
const DataExtractor& data, const DataExtractor& data,
uint32_t data_offset) = 0; uint32_t data_offset) = 0;
@ -67,6 +74,13 @@ public:
protected: protected:
Address m_address; // The section offset address of this instruction Address m_address; // The section offset address of this instruction
// We include an address class in the Instruction class to
// allow the instruction specify the eAddressClassCodeAlternateISA
// (currently used for thumb), and also to specify data (eAddressClassData).
// The usual value will be eAddressClassCode, but often when
// disassembling memory, you might run into data. This can
// help us to disassemble appropriately.
AddressClass m_address_class;
Opcode m_opcode; // The opcode for this instruction Opcode m_opcode; // The opcode for this instruction
}; };
@ -80,6 +94,9 @@ public:
size_t size_t
GetSize() const; GetSize() const;
uint32_t
GetMaxOpcocdeByteSize () const;
lldb::InstructionSP lldb::InstructionSP
GetInstructionAtIndex (uint32_t idx) const; GetInstructionAtIndex (uint32_t idx) const;
@ -194,14 +211,12 @@ public:
size_t size_t
ParseInstructions (const ExecutionContext *exe_ctx, ParseInstructions (const ExecutionContext *exe_ctx,
const AddressRange &range, const AddressRange &range);
DataExtractor& data);
size_t size_t
ParseInstructions (const ExecutionContext *exe_ctx, ParseInstructions (const ExecutionContext *exe_ctx,
const Address &range, const Address &range,
uint32_t num_instructions, uint32_t num_instructions);
DataExtractor& data);
virtual size_t virtual size_t
DecodeInstructions (const Address &base_addr, DecodeInstructions (const Address &base_addr,

3
lldb/include/lldb/Core/Opcode.h
View File

@ -11,8 +11,6 @@
#define lldb_Opcode_h #define lldb_Opcode_h
// C Includes // C Includes
#include <string.h>
// C++ Includes // C++ Includes
// Other libraries and framework includes // Other libraries and framework includes
// Project includes // Project includes
@ -163,6 +161,7 @@ namespace lldb_private {
if (bytes && length > 0) if (bytes && length > 0)
{ {
m_type = eTypeBytes; m_type = eTypeBytes;
m_data.inst.length = length;
assert (length < sizeof (m_data.inst.bytes)); assert (length < sizeof (m_data.inst.bytes));
memcpy (m_data.inst.bytes, bytes, length); memcpy (m_data.inst.bytes, bytes, length);
} }

2
lldb/include/lldb/Symbol/SymbolContext.h
View File

@ -347,7 +347,7 @@ public:
Append (const SymbolContext& sc); Append (const SymbolContext& sc);
bool bool
AppendIfUnique (const SymbolContext& sc); AppendIfUnique (const SymbolContext& sc, bool merge_symbol_into_function);
//------------------------------------------------------------------ //------------------------------------------------------------------
/// Clear the object's state. /// Clear the object's state.

4
lldb/source/API/SBInstruction.cpp
View File

@ -89,7 +89,7 @@ SBInstruction::GetDescription (lldb::SBStream &s)
{ {
// Use the "ref()" instead of the "get()" accessor in case the SBStream // Use the "ref()" instead of the "get()" accessor in case the SBStream
// didn't have a stream already created, one will get created... // didn't have a stream already created, one will get created...
m_opaque_sp->Dump (&s.ref(), true, false, NULL, false); m_opaque_sp->Dump (&s.ref(), 0, true, false, NULL, false);
return true; return true;
} }
return false; return false;
@ -104,6 +104,6 @@ SBInstruction::Print (FILE *out)
if (m_opaque_sp) if (m_opaque_sp)
{ {
StreamFile out_stream (out, false); StreamFile out_stream (out, false);
m_opaque_sp->Dump (&out_stream, true, false, NULL, false); m_opaque_sp->Dump (&out_stream, 0, true, false, NULL, false);
} }
} }

3
lldb/source/API/SBInstructionList.cpp
View File

@ -93,12 +93,13 @@ SBInstructionList::GetDescription (lldb::SBStream &description)
// Call the ref() to make sure a stream is created if one deesn't // Call the ref() to make sure a stream is created if one deesn't
// exist already inside description... // exist already inside description...
Stream &sref = description.ref(); Stream &sref = description.ref();
const uint32_t max_opcode_byte_size = m_opaque_sp->GetInstructionList().GetMaxOpcocdeByteSize();
for (size_t i=0; i<num_instructions; ++i) for (size_t i=0; i<num_instructions; ++i)
{ {
Instruction *inst = m_opaque_sp->GetInstructionList().GetInstructionAtIndex (i).get(); Instruction *inst = m_opaque_sp->GetInstructionList().GetInstructionAtIndex (i).get();
if (inst == NULL) if (inst == NULL)
break; break;
inst->Dump (&sref, true, false, NULL, false); inst->Dump (&sref, max_opcode_byte_size, true, false, NULL, false);
sref.EOL(); sref.EOL();
} }
return true; return true;

26
lldb/source/Commands/CommandObjectBreakpoint.cpp
View File

@ -155,7 +155,7 @@ CommandObjectBreakpointSet::CommandOptions::SetOptionValue (int option_idx, cons
break; break;
case 'f': case 'f':
m_filename = option_arg; m_filename.assign (option_arg);
break; break;
case 'l': case 'l':
@ -163,32 +163,32 @@ CommandObjectBreakpointSet::CommandOptions::SetOptionValue (int option_idx, cons
break; break;
case 'b': case 'b':
m_func_name = option_arg; m_func_name.assign (option_arg);
m_func_name_type_mask |= eFunctionNameTypeBase; m_func_name_type_mask |= eFunctionNameTypeBase;
break; break;
case 'n': case 'n':
m_func_name = option_arg; m_func_name.assign (option_arg);
m_func_name_type_mask |= eFunctionNameTypeAuto; m_func_name_type_mask |= eFunctionNameTypeAuto;
break; break;
case 'F': case 'F':
m_func_name = option_arg; m_func_name.assign (option_arg);
m_func_name_type_mask |= eFunctionNameTypeFull; m_func_name_type_mask |= eFunctionNameTypeFull;
break; break;
case 'S': case 'S':
m_func_name = option_arg; m_func_name.assign (option_arg);
m_func_name_type_mask |= eFunctionNameTypeSelector; m_func_name_type_mask |= eFunctionNameTypeSelector;
break; break;
case 'M': case 'M':
m_func_name = option_arg; m_func_name.assign (option_arg);
m_func_name_type_mask |= eFunctionNameTypeMethod; m_func_name_type_mask |= eFunctionNameTypeMethod;
break; break;
case 'r': case 'r':
m_func_regexp = option_arg; m_func_regexp.assign (option_arg);
break; break;
case 's': case 's':
@ -211,10 +211,10 @@ CommandObjectBreakpointSet::CommandOptions::SetOptionValue (int option_idx, cons
} }
break; break;
case 'T': case 'T':
m_thread_name = option_arg; m_thread_name.assign (option_arg);
break; break;
case 'q': case 'q':
m_queue_name = option_arg; m_queue_name.assign (option_arg);
break; break;
case 'x': case 'x':
{ {
@ -1087,7 +1087,7 @@ CommandObjectBreakpointClear::CommandOptions::SetOptionValue (int option_idx, co
switch (short_option) switch (short_option)
{ {
case 'f': case 'f':
m_filename = option_arg; m_filename.assign (option_arg);
break; break;
case 'l': case 'l':
@ -1406,7 +1406,7 @@ CommandObjectBreakpointModify::CommandOptions::SetOptionValue (int option_idx, c
{ {
case 'c': case 'c':
if (option_arg != NULL) if (option_arg != NULL)
m_condition = option_arg; m_condition.assign (option_arg);
else else
m_condition.clear(); m_condition.clear();
m_condition_passed = true; m_condition_passed = true;
@ -1445,14 +1445,14 @@ CommandObjectBreakpointModify::CommandOptions::SetOptionValue (int option_idx, c
break; break;
case 'T': case 'T':
if (option_arg != NULL) if (option_arg != NULL)
m_thread_name = option_arg; m_thread_name.assign (option_arg);
else else
m_thread_name.clear(); m_thread_name.clear();
m_name_passed = true; m_name_passed = true;
break; break;
case 'q': case 'q':
if (option_arg != NULL) if (option_arg != NULL)
m_queue_name = option_arg; m_queue_name.assign (option_arg);
else else
m_queue_name.clear(); m_queue_name.clear();
m_queue_passed = true; m_queue_passed = true;

60
lldb/source/Commands/CommandObjectDisassemble.cpp
View File

@ -40,7 +40,8 @@ CommandObjectDisassemble::CommandOptions::CommandOptions () :
m_start_addr(), m_start_addr(),
m_end_addr (), m_end_addr (),
m_at_pc (false), m_at_pc (false),
m_plugin_name () m_plugin_name (),
m_arch()
{ {
ResetOptionValues(); ResetOptionValues();
} }
@ -64,7 +65,7 @@ CommandObjectDisassemble::CommandOptions::SetOptionValue (int option_idx, const
show_mixed = true; show_mixed = true;
break; break;
case 'x': case 'C':
num_lines_context = Args::StringToUInt32(option_arg, 0, 0, &success); num_lines_context = Args::StringToUInt32(option_arg, 0, 0, &success);
if (!success) if (!success)
error.SetErrorStringWithFormat ("Invalid num context lines string: \"%s\".\n", option_arg); error.SetErrorStringWithFormat ("Invalid num context lines string: \"%s\".\n", option_arg);
@ -118,6 +119,10 @@ CommandObjectDisassemble::CommandOptions::SetOptionValue (int option_idx, const
// There's no need to set any flag. // There's no need to set any flag.
break; break;
case 'a':
m_arch.SetTriple (option_arg);
break;
default: default:
error.SetErrorStringWithFormat("Unrecognized short option '%c'.\n", short_option); error.SetErrorStringWithFormat("Unrecognized short option '%c'.\n", short_option);
break; break;
@ -140,6 +145,7 @@ CommandObjectDisassemble::CommandOptions::ResetOptionValues ()
m_end_addr = LLDB_INVALID_ADDRESS; m_end_addr = LLDB_INVALID_ADDRESS;
raw = false; raw = false;
m_plugin_name.clear(); m_plugin_name.clear();
m_arch.Clear();
} }
const OptionDefinition* const OptionDefinition*
@ -152,26 +158,21 @@ OptionDefinition
CommandObjectDisassemble::CommandOptions::g_option_table[] = CommandObjectDisassemble::CommandOptions::g_option_table[] =
{ {
{ LLDB_OPT_SET_ALL , false , "bytes", 'b', no_argument , NULL, 0, eArgTypeNone, "Show opcode bytes when disassembling."}, { LLDB_OPT_SET_ALL , false , "bytes", 'b', no_argument , NULL, 0, eArgTypeNone, "Show opcode bytes when disassembling."},
{ LLDB_OPT_SET_ALL, false, "context", 'x', required_argument, NULL, 0, eArgTypeNumLines,"Number of context lines of source to show."}, { LLDB_OPT_SET_ALL , false , "context", 'C', required_argument , NULL, 0, eArgTypeNumLines, "Number of context lines of source to show."},
{ LLDB_OPT_SET_ALL , false , "mixed", 'm', no_argument , NULL, 0, eArgTypeNone, "Enable mixed source and assembly display."}, { LLDB_OPT_SET_ALL , false , "mixed", 'm', no_argument , NULL, 0, eArgTypeNone, "Enable mixed source and assembly display."},
{ LLDB_OPT_SET_ALL , false , "raw", 'r', no_argument , NULL, 0, eArgTypeNone, "Print raw disassembly with no symbol information."}, { LLDB_OPT_SET_ALL , false , "raw", 'r', no_argument , NULL, 0, eArgTypeNone, "Print raw disassembly with no symbol information."},
{ LLDB_OPT_SET_ALL , false , "plugin", 'P', required_argument , NULL, 0, eArgTypePlugin, "Name of the disassembler plugin you want to use."}, { LLDB_OPT_SET_ALL , false , "plugin", 'P', required_argument , NULL, 0, eArgTypePlugin, "Name of the disassembler plugin you want to use."},
{ LLDB_OPT_SET_ALL , false , "arch", 'a', required_argument , NULL, 0, eArgTypeArchitecture,"Specify the architecture to use from cross disassembly."},
{ LLDB_OPT_SET_1, true, "start-address", 's', required_argument, NULL, 0, eArgTypeStartAddress, "Address at which to start disassembling."}, { LLDB_OPT_SET_1 |
LLDB_OPT_SET_2 , true , "start-address" , 's', required_argument , NULL, 0, eArgTypeStartAddress,"Address at which to start disassembling."},
{ LLDB_OPT_SET_1 , false , "end-address" , 'e', required_argument , NULL, 0, eArgTypeEndAddress, "Address at which to end disassembling."}, { LLDB_OPT_SET_1 , false , "end-address" , 'e', required_argument , NULL, 0, eArgTypeEndAddress, "Address at which to end disassembling."},
{ LLDB_OPT_SET_2 |
{ LLDB_OPT_SET_2, true, "start-address", 's', required_argument, NULL, 0, eArgTypeStartAddress, "Address at which to start disassembling."}, LLDB_OPT_SET_3 |
{ LLDB_OPT_SET_2, false, "instruction-count", 'c', required_argument, NULL, 0, eArgTypeNumLines, "Number of instructions to display."}, LLDB_OPT_SET_4 |
LLDB_OPT_SET_5 , false , "count", 'c', required_argument , NULL, 0, eArgTypeNumLines, "Number of instructions to display."},
{ LLDB_OPT_SET_3 , true , "name", 'n', required_argument , NULL, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName, "Disassemble entire contents of the given function name."}, { LLDB_OPT_SET_3 , true , "name", 'n', required_argument , NULL, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName, "Disassemble entire contents of the given function name."},
{ LLDB_OPT_SET_3, false, "instruction-count", 'c', required_argument, NULL, 0, eArgTypeNumLines, "Number of instructions to display."}, { LLDB_OPT_SET_4 , true , "frame", 'f', no_argument , NULL, 0, eArgTypeNone, "Disassemble from the start of the current frame's function."},
{ LLDB_OPT_SET_5 , true , "pc", 'p', no_argument , NULL, 0, eArgTypeNone, "Disassemble from the current pc."},
{ LLDB_OPT_SET_4, true, "current-frame", 'f', no_argument, NULL, 0, eArgTypeNone, "Disassemble from the start of the current frame's function."},
{ LLDB_OPT_SET_4, false, "instruction-count", 'c', required_argument, NULL, 0, eArgTypeNumLines, "Number of instructions to display."},
{ LLDB_OPT_SET_5, true, "current-pc", 'p', no_argument, NULL, 0, eArgTypeNone, "Disassemble from the current pc."},
{ LLDB_OPT_SET_5, false, "instruction-count", 'c', required_argument, NULL, 0, eArgTypeNumLines, "Number of instructions to display."},
{ 0 , false , NULL, 0, 0 , NULL, 0, eArgTypeNone, NULL } { 0 , false , NULL, 0, 0 , NULL, 0, eArgTypeNone, NULL }
}; };
@ -207,27 +208,28 @@ CommandObjectDisassemble::Execute
result.SetStatus (eReturnStatusFailed); result.SetStatus (eReturnStatusFailed);
return false; return false;
} }
if (!m_options.m_arch.IsValid())
m_options.m_arch = target->GetArchitecture();
ArchSpec arch(target->GetArchitecture()); if (!m_options.m_arch.IsValid())
if (!arch.IsValid())
{ {
result.AppendError ("target needs valid architecure in order to be able to disassemble"); result.AppendError ("use the --arch option or set the target architecure to disassemble");
result.SetStatus (eReturnStatusFailed); result.SetStatus (eReturnStatusFailed);
return false; return false;
} }
const char *plugin_name = m_options.GetPluginName (); const char *plugin_name = m_options.GetPluginName ();
Disassembler *disassembler = Disassembler::FindPlugin(arch, plugin_name); Disassembler *disassembler = Disassembler::FindPlugin(m_options.m_arch, plugin_name);
if (disassembler == NULL) if (disassembler == NULL)
{ {
if (plugin_name) if (plugin_name)
result.AppendErrorWithFormat ("Unable to find Disassembler plug-in for %s architecture named '%s'.\n", result.AppendErrorWithFormat ("Unable to find Disassembler plug-in named '%s' that supports the '%s' architecture.\n",
arch.GetArchitectureName(), plugin_name,
plugin_name); m_options.m_arch.GetArchitectureName());
else else
result.AppendErrorWithFormat ("Unable to find Disassembler plug-in for %s architecture.\n", result.AppendErrorWithFormat ("Unable to find Disassembler plug-in for the '%s' architecture.\n",
arch.GetArchitectureName()); m_options.m_arch.GetArchitectureName());
result.SetStatus (eReturnStatusFailed); result.SetStatus (eReturnStatusFailed);
return false; return false;
} }
@ -255,7 +257,7 @@ CommandObjectDisassemble::Execute
ConstString name(m_options.m_func_name.c_str()); ConstString name(m_options.m_func_name.c_str());
if (Disassembler::Disassemble (m_interpreter.GetDebugger(), if (Disassembler::Disassemble (m_interpreter.GetDebugger(),
arch, m_options.m_arch,
plugin_name, plugin_name,
exe_ctx, exe_ctx,
name, name,
@ -337,7 +339,7 @@ CommandObjectDisassemble::Execute
} }
if (Disassembler::Disassemble (m_interpreter.GetDebugger(), if (Disassembler::Disassemble (m_interpreter.GetDebugger(),
arch, m_options.m_arch,
plugin_name, plugin_name,
exe_ctx, exe_ctx,
start_addr, start_addr,
@ -387,7 +389,7 @@ CommandObjectDisassemble::Execute
range.SetByteSize(DEFAULT_DISASM_BYTE_SIZE); range.SetByteSize(DEFAULT_DISASM_BYTE_SIZE);
if (Disassembler::Disassemble (m_interpreter.GetDebugger(), if (Disassembler::Disassemble (m_interpreter.GetDebugger(),
arch, m_options.m_arch,
plugin_name, plugin_name,
exe_ctx, exe_ctx,
range, range,

1
lldb/source/Commands/CommandObjectDisassemble.h
View File

@ -63,6 +63,7 @@ public:
lldb::addr_t m_end_addr; lldb::addr_t m_end_addr;
bool m_at_pc; bool m_at_pc;
std::string m_plugin_name; std::string m_plugin_name;
ArchSpec m_arch;
static OptionDefinition g_option_table[]; static OptionDefinition g_option_table[];
}; };

89
lldb/source/Core/ArchSpec.cpp
View File

@ -30,6 +30,8 @@ namespace lldb_private {
{ {
ByteOrder default_byte_order; ByteOrder default_byte_order;
uint32_t addr_byte_size; uint32_t addr_byte_size;
uint32_t min_opcode_byte_size;
uint32_t max_opcode_byte_size;
llvm::Triple::ArchType machine; llvm::Triple::ArchType machine;
ArchSpec::Core core; ArchSpec::Core core;
const char *name; const char *name;
@ -40,45 +42,47 @@ namespace lldb_private {
// This core information can be looked using the ArchSpec::Core as the index // This core information can be looked using the ArchSpec::Core as the index
static const CoreDefinition g_core_definitions[ArchSpec::kNumCores] = static const CoreDefinition g_core_definitions[ArchSpec::kNumCores] =
{ {
{ eByteOrderLittle, 4, llvm::Triple::alpha , ArchSpec::eCore_alpha_generic , "alpha" }, // TODO: verify alpha has 32 bit fixed instructions
{ eByteOrderLittle, 4, 4, 4, llvm::Triple::alpha , ArchSpec::eCore_alpha_generic , "alpha" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_generic , "arm" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_generic , "arm" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv4 , "armv4" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv4 , "armv4" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv4t , "armv4t" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv4t , "armv4t" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv5 , "armv5" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv5 , "armv5" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv5t , "armv5t" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv5t , "armv5t" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv6 , "armv6" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv6 , "armv6" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv7 , "armv7" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv7 , "armv7" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv7f , "armv7f" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv7f , "armv7f" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv7k , "armv7k" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv7k , "armv7k" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv7s , "armv7s" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_armv7s , "armv7s" },
{ eByteOrderLittle, 4, llvm::Triple::arm , ArchSpec::eCore_arm_xscale , "xscale" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm , ArchSpec::eCore_arm_xscale , "xscale" },
{ eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb , ArchSpec::eCore_thumb_generic , "thumb" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_generic , "ppc" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_generic , "ppc" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc601 , "ppc601" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc601 , "ppc601" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc602 , "ppc602" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc602 , "ppc602" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc603 , "ppc603" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc603 , "ppc603" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc603e , "ppc603e" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc603e , "ppc603e" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc603ev , "ppc603ev" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc603ev , "ppc603ev" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc604 , "ppc604" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc604 , "ppc604" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc604e , "ppc604e" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc604e , "ppc604e" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc620 , "ppc620" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc620 , "ppc620" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc750 , "ppc750" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc750 , "ppc750" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc7400 , "ppc7400" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc7400 , "ppc7400" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc7450 , "ppc7450" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc7450 , "ppc7450" },
{ eByteOrderLittle, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc970 , "ppc970" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::ppc , ArchSpec::eCore_ppc_ppc970 , "ppc970" },
{ eByteOrderLittle, 8, llvm::Triple::ppc64 , ArchSpec::eCore_ppc64_generic , "ppc64" }, { eByteOrderLittle, 8, 4, 4, llvm::Triple::ppc64 , ArchSpec::eCore_ppc64_generic , "ppc64" },
{ eByteOrderLittle, 8, llvm::Triple::ppc64 , ArchSpec::eCore_ppc64_ppc970_64 , "ppc970-64" }, { eByteOrderLittle, 8, 4, 4, llvm::Triple::ppc64 , ArchSpec::eCore_ppc64_ppc970_64 , "ppc970-64" },
{ eByteOrderLittle, 4, llvm::Triple::sparc , ArchSpec::eCore_sparc_generic , "sparc" }, { eByteOrderLittle, 4, 4, 4, llvm::Triple::sparc , ArchSpec::eCore_sparc_generic , "sparc" },
{ eByteOrderLittle, 8, llvm::Triple::sparcv9, ArchSpec::eCore_sparc9_generic , "sparcv9" }, { eByteOrderLittle, 8, 4, 4, llvm::Triple::sparcv9, ArchSpec::eCore_sparc9_generic , "sparcv9" },
{ eByteOrderLittle, 4, llvm::Triple::x86 , ArchSpec::eCore_x86_32_i386 , "i386" }, { eByteOrderLittle, 4, 1, 15, llvm::Triple::x86 , ArchSpec::eCore_x86_32_i386 , "i386" },
{ eByteOrderLittle, 4, llvm::Triple::x86 , ArchSpec::eCore_x86_32_i486 , "i486" }, { eByteOrderLittle, 4, 1, 15, llvm::Triple::x86 , ArchSpec::eCore_x86_32_i486 , "i486" },
{ eByteOrderLittle, 4, llvm::Triple::x86 , ArchSpec::eCore_x86_32_i486sx , "i486sx" }, { eByteOrderLittle, 4, 1, 15, llvm::Triple::x86 , ArchSpec::eCore_x86_32_i486sx , "i486sx" },
{ eByteOrderLittle, 8, llvm::Triple::x86_64 , ArchSpec::eCore_x86_64_x86_64 , "x86_64" } { eByteOrderLittle, 8, 1, 15, llvm::Triple::x86_64 , ArchSpec::eCore_x86_64_x86_64 , "x86_64" }
}; };
struct ArchDefinitionEntry struct ArchDefinitionEntry
@ -118,6 +122,7 @@ static const ArchDefinitionEntry g_macho_arch_entries[] =
{ ArchSpec::eCore_arm_armv7f , llvm::MachO::CPUTypeARM , 10 }, { ArchSpec::eCore_arm_armv7f , llvm::MachO::CPUTypeARM , 10 },
{ ArchSpec::eCore_arm_armv7k , llvm::MachO::CPUTypeARM , 12 }, { ArchSpec::eCore_arm_armv7k , llvm::MachO::CPUTypeARM , 12 },
{ ArchSpec::eCore_arm_armv7s , llvm::MachO::CPUTypeARM , 11 }, { ArchSpec::eCore_arm_armv7s , llvm::MachO::CPUTypeARM , 11 },
{ ArchSpec::eCore_thumb_generic , llvm::MachO::CPUTypeARM , 0 },
{ ArchSpec::eCore_ppc_generic , llvm::MachO::CPUTypePowerPC , CPU_ANY }, { ArchSpec::eCore_ppc_generic , llvm::MachO::CPUTypePowerPC , CPU_ANY },
{ ArchSpec::eCore_ppc_generic , llvm::MachO::CPUTypePowerPC , 0 }, { ArchSpec::eCore_ppc_generic , llvm::MachO::CPUTypePowerPC , 0 },
{ ArchSpec::eCore_ppc_ppc601 , llvm::MachO::CPUTypePowerPC , 1 }, { ArchSpec::eCore_ppc_ppc601 , llvm::MachO::CPUTypePowerPC , 1 },
@ -496,10 +501,22 @@ ArchSpec::SetArchitecture (ArchitectureType arch_type, uint32_t cpu, uint32_t su
return IsValid(); return IsValid();
} }
void uint32_t
ArchSpec::SetByteOrder (lldb::ByteOrder byte_order) ArchSpec::GetMinimumOpcodeByteSize() const
{ {
m_byte_order = byte_order; const CoreDefinition *core_def = FindCoreDefinition (m_core);
if (core_def)
return core_def->min_opcode_byte_size;
return 0;
}
uint32_t
ArchSpec::GetMaximumOpcodeByteSize() const
{
const CoreDefinition *core_def = FindCoreDefinition (m_core);
if (core_def)
return core_def->max_opcode_byte_size;
return 0;
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//

188
lldb/source/Core/Disassembler.cpp
View File

@ -69,6 +69,33 @@ Disassembler::FindPlugin (const ArchSpec &arch, const char *plugin_name)
} }
static void
ResolveAddress (const ExecutionContext &exe_ctx,
const Address &addr,
Address &resolved_addr)
{
if (!addr.IsSectionOffset())
{
// If we weren't passed in a section offset address range,
// try and resolve it to something
if (exe_ctx.target)
{
if (exe_ctx.target->GetSectionLoadList().IsEmpty())
{
exe_ctx.target->GetImages().ResolveFileAddress (addr.GetOffset(), resolved_addr);
}
else
{
exe_ctx.target->GetSectionLoadList().ResolveLoadAddress (addr.GetOffset(), resolved_addr);
}
// We weren't able to resolve the address, just treat it as a
// raw address
if (resolved_addr.IsValid())
return;
}
}
resolved_addr = addr;
}
size_t size_t
Disassembler::Disassemble Disassembler::Disassemble
@ -192,8 +219,7 @@ Disassembler::DisassembleRange
if (disasm_sp) if (disasm_sp)
{ {
DataExtractor data; size_t bytes_disassembled = disasm_sp->ParseInstructions (&exe_ctx, range);
size_t bytes_disassembled = disasm_sp->ParseInstructions (&exe_ctx, range, data);
if (bytes_disassembled == 0) if (bytes_disassembled == 0)
disasm_sp.reset(); disasm_sp.reset();
} }
@ -223,27 +249,11 @@ Disassembler::Disassemble
if (disasm_ap.get()) if (disasm_ap.get())
{ {
AddressRange range(disasm_range); AddressRange range;
ResolveAddress (exe_ctx, disasm_range.GetBaseAddress(), range.GetBaseAddress());
range.SetByteSize (disasm_range.GetByteSize());
// If we weren't passed in a section offset address range, size_t bytes_disassembled = disasm_ap->ParseInstructions (&exe_ctx, range);
// try and resolve it to something
if (range.GetBaseAddress().IsSectionOffset() == false)
{
if (exe_ctx.target)
{
if (exe_ctx.target->GetSectionLoadList().IsEmpty())
{
exe_ctx.target->GetImages().ResolveFileAddress (range.GetBaseAddress().GetOffset(), range.GetBaseAddress());
}
else
{
exe_ctx.target->GetSectionLoadList().ResolveLoadAddress (range.GetBaseAddress().GetOffset(), range.GetBaseAddress());
}
}
}
DataExtractor data;
size_t bytes_disassembled = disasm_ap->ParseInstructions (&exe_ctx, range, data);
if (bytes_disassembled == 0) if (bytes_disassembled == 0)
return false; return false;
@ -280,29 +290,12 @@ Disassembler::Disassemble
if (num_instructions > 0) if (num_instructions > 0)
{ {
std::auto_ptr<Disassembler> disasm_ap (Disassembler::FindPlugin(arch, plugin_name)); std::auto_ptr<Disassembler> disasm_ap (Disassembler::FindPlugin(arch, plugin_name));
Address addr = start_address;
if (disasm_ap.get()) if (disasm_ap.get())
{ {
// If we weren't passed in a section offset address range, Address addr;
// try and resolve it to something ResolveAddress (exe_ctx, start_address, addr);
if (addr.IsSectionOffset() == false)
{
if (exe_ctx.target)
{
if (exe_ctx.target->GetSectionLoadList().IsEmpty())
{
exe_ctx.target->GetImages().ResolveFileAddress (addr.GetOffset(), addr);
}
else
{
exe_ctx.target->GetSectionLoadList().ResolveLoadAddress (addr.GetOffset(), addr);
}
}
}
DataExtractor data; size_t bytes_disassembled = disasm_ap->ParseInstructions (&exe_ctx, addr, num_instructions);
size_t bytes_disassembled = disasm_ap->ParseInstructions (&exe_ctx, addr, num_instructions, data);
if (bytes_disassembled == 0) if (bytes_disassembled == 0)
return false; return false;
return PrintInstructions (disasm_ap.get(), return PrintInstructions (disasm_ap.get(),
@ -341,11 +334,12 @@ Disassembler::PrintInstructions
if (num_instructions > 0 && num_instructions < num_instructions_found) if (num_instructions > 0 && num_instructions < num_instructions_found)
num_instructions_found = num_instructions; num_instructions_found = num_instructions;
const uint32_t max_opcode_byte_size = disasm_ptr->GetInstructionList().GetMaxOpcocdeByteSize ();
uint32_t offset = 0; uint32_t offset = 0;
SymbolContext sc; SymbolContext sc;
SymbolContext prev_sc; SymbolContext prev_sc;
AddressRange sc_range; AddressRange sc_range;
Address addr = start_addr; Address addr (start_addr);
if (num_mixed_context_lines) if (num_mixed_context_lines)
strm.IndentMore (); strm.IndentMore ();
@ -425,7 +419,7 @@ Disassembler::PrintInstructions
if (num_mixed_context_lines) if (num_mixed_context_lines)
strm.IndentMore (); strm.IndentMore ();
strm.Indent(); strm.Indent();
inst->Dump(&strm, true, show_bytes, &exe_ctx, raw); inst->Dump(&strm, max_opcode_byte_size, true, show_bytes, &exe_ctx, raw);
strm.EOL(); strm.EOL();
addr.Slide(inst->GetOpcode().GetByteSize()); addr.Slide(inst->GetOpcode().GetByteSize());
@ -492,8 +486,9 @@ Disassembler::Disassemble
strm); strm);
} }
Instruction::Instruction(const Address &address) : Instruction::Instruction(const Address &address, AddressClass addr_class) :
m_address (address), m_address (address),
m_address_class (addr_class),
m_opcode() m_opcode()
{ {
} }
@ -502,6 +497,13 @@ Instruction::~Instruction()
{ {
} }
AddressClass
Instruction::GetAddressClass ()
{
if (m_address_class == eAddressClassInvalid)
m_address_class = m_address.GetAddressClass();
return m_address_class;
}
InstructionList::InstructionList() : InstructionList::InstructionList() :
m_instructions() m_instructions()
@ -518,6 +520,23 @@ InstructionList::GetSize() const
return m_instructions.size(); return m_instructions.size();
} }
uint32_t
InstructionList::GetMaxOpcocdeByteSize () const
{
uint32_t max_inst_size = 0;
collection::const_iterator pos, end;
for (pos = m_instructions.begin(), end = m_instructions.end();
pos != end;
++pos)
{
uint32_t inst_size = (*pos)->GetOpcode().GetByteSize();
if (max_inst_size < inst_size)
max_inst_size = inst_size;
}
return max_inst_size;
}
InstructionSP InstructionSP
InstructionList::GetInstructionAtIndex (uint32_t idx) const InstructionList::GetInstructionAtIndex (uint32_t idx) const
@ -546,8 +565,7 @@ size_t
Disassembler::ParseInstructions Disassembler::ParseInstructions
( (
const ExecutionContext *exe_ctx, const ExecutionContext *exe_ctx,
const AddressRange &range, const AddressRange &range
DataExtractor& data
) )
{ {
Target *target = exe_ctx->target; Target *target = exe_ctx->target;
@ -559,17 +577,20 @@ Disassembler::ParseInstructions
DataBufferSP data_sp(heap_buffer); DataBufferSP data_sp(heap_buffer);
Error error; Error error;
bool prefer_file_cache = true; const bool prefer_file_cache = true;
const size_t bytes_read = target->ReadMemory (range.GetBaseAddress(), prefer_file_cache, heap_buffer->GetBytes(), heap_buffer->GetByteSize(), error); const size_t bytes_read = target->ReadMemory (range.GetBaseAddress(),
prefer_file_cache,
heap_buffer->GetBytes(),
heap_buffer->GetByteSize(),
error);
if (bytes_read > 0) if (bytes_read > 0)
{ {
if (bytes_read != heap_buffer->GetByteSize()) if (bytes_read != heap_buffer->GetByteSize())
heap_buffer->SetByteSize (bytes_read); heap_buffer->SetByteSize (bytes_read);
DataExtractor data (data_sp,
data.SetData(data_sp); m_arch.GetByteOrder(),
data.SetByteOrder(target->GetArchitecture().GetByteOrder()); m_arch.GetAddressByteSize());
data.SetAddressByteSize(target->GetArchitecture().GetAddressByteSize());
return DecodeInstructions (range.GetBaseAddress(), data, 0, UINT32_MAX, false); return DecodeInstructions (range.GetBaseAddress(), data, 0, UINT32_MAX, false);
} }
@ -581,63 +602,44 @@ Disassembler::ParseInstructions
( (
const ExecutionContext *exe_ctx, const ExecutionContext *exe_ctx,
const Address &start, const Address &start,
uint32_t num_instructions, uint32_t num_instructions
DataExtractor& data
) )
{ {
Address addr = start; m_instruction_list.Clear();
if (num_instructions == 0) if (num_instructions == 0 || !start.IsValid())
return 0; return 0;
Target *target = exe_ctx->target; Target *target = exe_ctx->target;
// We'll guess at a size for the buffer, if we don't get all the instructions we want we can just re-fill & reuse it. // Calculate the max buffer size we will need in order to disassemble
const addr_t byte_size = num_instructions * 2; const addr_t byte_size = num_instructions * m_arch.GetMaximumOpcodeByteSize();
addr_t data_offset = 0;
addr_t next_instruction_offset = 0;
size_t buffer_size = byte_size;
uint32_t num_instructions_found = 0; if (target == NULL || byte_size == 0)
if (target == NULL || byte_size == 0 || !start.IsValid())
return 0; return 0;
DataBufferHeap *heap_buffer = new DataBufferHeap (byte_size, '\0'); DataBufferHeap *heap_buffer = new DataBufferHeap (byte_size, '\0');
DataBufferSP data_sp (heap_buffer); DataBufferSP data_sp (heap_buffer);
data.SetData(data_sp);
data.SetByteOrder(target->GetArchitecture().GetByteOrder());
data.SetAddressByteSize(target->GetArchitecture().GetAddressByteSize());
Error error; Error error;
bool prefer_file_cache = true; bool prefer_file_cache = true;
const size_t bytes_read = target->ReadMemory (start,
prefer_file_cache,
heap_buffer->GetBytes(),
byte_size,
error);
m_instruction_list.Clear();
while (num_instructions_found < num_instructions)
{
if (buffer_size < data_offset + byte_size)
{
buffer_size = data_offset + byte_size;
heap_buffer->SetByteSize (buffer_size);
data.SetData(data_sp); // Resizing might have changed the backing store location, so we have to reset
// the DataBufferSP in the extractor so it changes to pointing at the right thing.
}
const size_t bytes_read = target->ReadMemory (addr, prefer_file_cache, heap_buffer->GetBytes() + data_offset, byte_size, error);
size_t num_bytes_read = 0;
if (bytes_read == 0) if (bytes_read == 0)
break; return 0;
DataExtractor data (data_sp,
m_arch.GetByteOrder(),
m_arch.GetAddressByteSize());
num_bytes_read = DecodeInstructions (start, data, next_instruction_offset, num_instructions - num_instructions_found, true); const bool append_instructions = true;
if (num_bytes_read == 0) DecodeInstructions (start,
break; data,
num_instructions_found = m_instruction_list.GetSize(); 0,
num_instructions,
// Prepare for the next round. append_instructions);
data_offset += bytes_read;
addr.Slide (bytes_read);
next_instruction_offset += num_bytes_read;
}
return m_instruction_list.GetSize(); return m_instruction_list.GetSize();
} }

6
lldb/source/Core/Module.cpp
View File

@ -351,11 +351,12 @@ Module::FindFunctions (const ConstString &name,
const uint32_t num_matches = symbol_indexes.size(); const uint32_t num_matches = symbol_indexes.size();
if (num_matches) if (num_matches)
{ {
const bool merge_symbol_into_function = true;
SymbolContext sc(this); SymbolContext sc(this);
for (uint32_t i=0; i<num_matches; i++) for (uint32_t i=0; i<num_matches; i++)
{ {
sc.symbol = symtab->SymbolAtIndex(symbol_indexes[i]); sc.symbol = symtab->SymbolAtIndex(symbol_indexes[i]);
sc_list.AppendIfUnique (sc); sc_list.AppendIfUnique (sc, merge_symbol_into_function);
} }
} }
} }
@ -392,11 +393,12 @@ Module::FindFunctions (const RegularExpression& regex,
const uint32_t num_matches = symbol_indexes.size(); const uint32_t num_matches = symbol_indexes.size();
if (num_matches) if (num_matches)
{ {
const bool merge_symbol_into_function = true;
SymbolContext sc(this); SymbolContext sc(this);
for (uint32_t i=0; i<num_matches; i++) for (uint32_t i=0; i<num_matches; i++)
{ {
sc.symbol = symtab->SymbolAtIndex(symbol_indexes[i]); sc.symbol = symtab->SymbolAtIndex(symbol_indexes[i]);
sc_list.AppendIfUnique (sc); sc_list.AppendIfUnique (sc, merge_symbol_into_function);
} }
} }
} }

2
lldb/source/Core/Opcode.cpp
View File

@ -48,7 +48,7 @@ Opcode::Dump (Stream *s, uint32_t min_byte_width)
for (uint32_t i=0; i<m_data.inst.length; ++i) for (uint32_t i=0; i<m_data.inst.length; ++i)
{ {
if (i > 0) if (i > 0)
s->PutChar (' '); bytes_written += s->PutChar (' ');
bytes_written += s->Printf ("%2.2x", m_data.inst.bytes[i]); bytes_written += s->Printf ("%2.2x", m_data.inst.bytes[i]);
} }
} }

3
lldb/source/Expression/ClangExpressionParser.cpp
View File

@ -742,13 +742,14 @@ ClangExpressionParser::DisassembleFunction (Stream &stream, ExecutionContext &ex
disassembler->DecodeInstructions (Address (NULL, func_remote_addr), extractor, 0, UINT32_MAX, false); disassembler->DecodeInstructions (Address (NULL, func_remote_addr), extractor, 0, UINT32_MAX, false);
InstructionList &instruction_list = disassembler->GetInstructionList(); InstructionList &instruction_list = disassembler->GetInstructionList();
const uint32_t max_opcode_byte_size = instruction_list.GetMaxOpcocdeByteSize();
for (uint32_t instruction_index = 0, num_instructions = instruction_list.GetSize(); for (uint32_t instruction_index = 0, num_instructions = instruction_list.GetSize();
instruction_index < num_instructions; instruction_index < num_instructions;
++instruction_index) ++instruction_index)
{ {
Instruction *instruction = instruction_list.GetInstructionAtIndex(instruction_index).get(); Instruction *instruction = instruction_list.GetInstructionAtIndex(instruction_index).get();
instruction->Dump (&stream, instruction->Dump (&stream,
max_opcode_byte_size,
true, true,
true, true,
&exe_ctx, &exe_ctx,

34
lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
View File

@ -74,8 +74,10 @@ static int IPRegisterReader(uint64_t *value, unsigned regID, void* arg)
return -1; return -1;
} }
DisassemblerLLVM::InstructionLLVM::InstructionLLVM (const Address &addr, EDDisassemblerRef disassembler) : DisassemblerLLVM::InstructionLLVM::InstructionLLVM (const Address &addr,
Instruction (addr), AddressClass addr_class,
EDDisassemblerRef disassembler) :
Instruction (addr, addr_class),
m_disassembler (disassembler) m_disassembler (disassembler)
{ {
} }
@ -99,6 +101,7 @@ void
DisassemblerLLVM::InstructionLLVM::Dump DisassemblerLLVM::InstructionLLVM::Dump
( (
Stream *s, Stream *s,
uint32_t max_opcode_byte_size,
bool show_address, bool show_address,
bool show_bytes, bool show_bytes,
const lldb_private::ExecutionContext* exe_ctx, const lldb_private::ExecutionContext* exe_ctx,
@ -131,12 +134,18 @@ DisassemblerLLVM::InstructionLLVM::Dump
// x86_64 and i386 are the only ones that use bytes right now so // x86_64 and i386 are the only ones that use bytes right now so
// pad out the byte dump to be able to always show 15 bytes (3 chars each) // pad out the byte dump to be able to always show 15 bytes (3 chars each)
// plus a space // plus a space
if (max_opcode_byte_size > 0)
m_opcode.Dump (s, max_opcode_byte_size * 3 + 1);
else
m_opcode.Dump (s, 15 * 3 + 1); m_opcode.Dump (s, 15 * 3 + 1);
} }
else else
{ {
// Else, we have ARM which can show up to a uint32_t 0x00000000 (10 spaces) // Else, we have ARM which can show up to a uint32_t 0x00000000 (10 spaces)
// plus two for padding... // plus two for padding...
if (max_opcode_byte_size > 0)
m_opcode.Dump (s, max_opcode_byte_size * 3 + 1);
else
m_opcode.Dump (s, 12); m_opcode.Dump (s, 12);
} }
} }
@ -329,7 +338,7 @@ DisassemblerLLVM::InstructionLLVM::DoesBranch() const
} }
size_t size_t
DisassemblerLLVM::InstructionLLVM::Extract (const Disassembler &disassembler, DisassemblerLLVM::InstructionLLVM::Decode (const Disassembler &disassembler,
const lldb_private::DataExtractor &data, const lldb_private::DataExtractor &data,
uint32_t data_offset) uint32_t data_offset)
{ {
@ -382,6 +391,7 @@ SyntaxForArchSpec (const ArchSpec &arch)
case llvm::Triple::x86_64: case llvm::Triple::x86_64:
return kEDAssemblySyntaxX86ATT; return kEDAssemblySyntaxX86ATT;
case llvm::Triple::arm: case llvm::Triple::arm:
case llvm::Triple::thumb:
return kEDAssemblySyntaxARMUAL; return kEDAssemblySyntaxARMUAL;
default: default:
break; break;
@ -411,17 +421,16 @@ DisassemblerLLVM::DisassemblerLLVM(const ArchSpec &arch) :
if (EDGetDisassembler(&m_disassembler, arch_triple.c_str(), SyntaxForArchSpec (arch))) if (EDGetDisassembler(&m_disassembler, arch_triple.c_str(), SyntaxForArchSpec (arch)))
m_disassembler = NULL; m_disassembler = NULL;
llvm::Triple::ArchType llvm_arch = arch.GetTriple().getArch(); llvm::Triple::ArchType llvm_arch = arch.GetTriple().getArch();
// Don't have the lldb::Triple::thumb architecture here. If someone specifies
// "thumb" as the architecture, we want a thumb only disassembler. But if any
// architecture starting with "arm" if specified, we want to auto detect the
// arm/thumb code automatically using the AddressClass from section offset
// addresses.
if (llvm_arch == llvm::Triple::arm) if (llvm_arch == llvm::Triple::arm)
{ {
if (EDGetDisassembler(&m_disassembler_thumb, "thumb-apple-darwin", kEDAssemblySyntaxARMUAL)) if (EDGetDisassembler(&m_disassembler_thumb, "thumb-apple-darwin", kEDAssemblySyntaxARMUAL))
m_disassembler_thumb = NULL; m_disassembler_thumb = NULL;
} }
else if (llvm_arch == llvm::Triple::thumb)
{
m_disassembler_thumb = m_disassembler;
if (EDGetDisassembler(&m_disassembler, "arm-apple-darwin-unknown", kEDAssemblySyntaxARMUAL))
m_disassembler = NULL;
}
} }
} }
@ -456,15 +465,18 @@ DisassemblerLLVM::DecodeInstructions
// If we have a thumb disassembler, then we have an ARM architecture // If we have a thumb disassembler, then we have an ARM architecture
// so we need to check what the instruction address class is to make // so we need to check what the instruction address class is to make
// sure we shouldn't be disassembling as thumb... // sure we shouldn't be disassembling as thumb...
AddressClass inst_address_class = eAddressClassInvalid;
if (m_disassembler_thumb) if (m_disassembler_thumb)
{ {
if (inst_addr.GetAddressClass () == eAddressClassCodeAlternateISA) inst_address_class = inst_addr.GetAddressClass ();
if (inst_address_class == eAddressClassCodeAlternateISA)
use_thumb = true; use_thumb = true;
} }
InstructionSP inst_sp (new InstructionLLVM (inst_addr, InstructionSP inst_sp (new InstructionLLVM (inst_addr,
inst_address_class,
use_thumb ? m_disassembler_thumb : m_disassembler)); use_thumb ? m_disassembler_thumb : m_disassembler));
size_t inst_byte_size = inst_sp->Extract (*this, data, data_offset); size_t inst_byte_size = inst_sp->Decode (*this, data, data_offset);
if (inst_byte_size == 0) if (inst_byte_size == 0)
break; break;

4
lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
View File

@ -23,6 +23,7 @@ public:
{ {
public: public:
InstructionLLVM (const lldb_private::Address &addr, InstructionLLVM (const lldb_private::Address &addr,
lldb_private::AddressClass addr_class,
EDDisassemblerRef disassembler); EDDisassemblerRef disassembler);
virtual virtual
@ -30,6 +31,7 @@ public:
virtual void virtual void
Dump (lldb_private::Stream *s, Dump (lldb_private::Stream *s,
uint32_t max_opcode_byte_size,
bool show_address, bool show_address,
bool show_bytes, bool show_bytes,
const lldb_private::ExecutionContext* exe_ctx, const lldb_private::ExecutionContext* exe_ctx,
@ -39,7 +41,7 @@ public:
DoesBranch () const; DoesBranch () const;
virtual size_t virtual size_t
Extract (const Disassembler &disassembler, Decode (const Disassembler &disassembler,
const lldb_private::DataExtractor &data, const lldb_private::DataExtractor &data,
uint32_t data_offset); uint32_t data_offset);

43
lldb/source/Symbol/SymbolContext.cpp
View File

@ -334,11 +334,11 @@ bool
lldb_private::operator!= (const SymbolContext& lhs, const SymbolContext& rhs) lldb_private::operator!= (const SymbolContext& lhs, const SymbolContext& rhs)
{ {
return lhs.function != rhs.function return lhs.function != rhs.function
&& lhs.symbol != rhs.symbol || lhs.symbol != rhs.symbol
&& lhs.module_sp.get() != rhs.module_sp.get() || lhs.module_sp.get() != rhs.module_sp.get()
&& lhs.comp_unit != rhs.comp_unit || lhs.comp_unit != rhs.comp_unit
&& lhs.target_sp.get() != rhs.target_sp.get() || lhs.target_sp.get() != rhs.target_sp.get()
&& LineEntry::Compare(lhs.line_entry, rhs.line_entry) != 0; || LineEntry::Compare(lhs.line_entry, rhs.line_entry) != 0;
} }
bool bool
@ -749,14 +749,43 @@ SymbolContextList::Append(const SymbolContext& sc)
} }
bool bool
SymbolContextList::AppendIfUnique (const SymbolContext& sc) SymbolContextList::AppendIfUnique (const SymbolContext& sc, bool merge_symbol_into_function)
{ {
collection::const_iterator pos, end = m_symbol_contexts.end(); collection::iterator pos, end = m_symbol_contexts.end();
for (pos = m_symbol_contexts.begin(); pos != end; ++pos) for (pos = m_symbol_contexts.begin(); pos != end; ++pos)
{ {
if (*pos == sc) if (*pos == sc)
return false; return false;
} }
if (merge_symbol_into_function
&& sc.symbol != NULL
&& sc.comp_unit == NULL
&& sc.function == NULL
&& sc.block == NULL
&& sc.line_entry.IsValid() == false)
{
const AddressRange *symbol_range = sc.symbol->GetAddressRangePtr();
if (symbol_range)
{
for (pos = m_symbol_contexts.begin(); pos != end; ++pos)
{
if (pos->function)
{
if (pos->function->GetAddressRange().GetBaseAddress() == symbol_range->GetBaseAddress())
{
// Do we already have a function with this symbol?
if (pos->symbol == sc.symbol)
return false;
if (pos->symbol == NULL)
{
pos->symbol = sc.symbol;
return false;
}
}
}
}
}
}
m_symbol_contexts.push_back(sc); m_symbol_contexts.push_back(sc);
return true; return true;
} }

10
lldb/source/Target/Target.cpp
View File

@ -587,18 +587,16 @@ Target::ReadMemory (const Address& addr, bool prefer_file_cache, void *dst, size
bool process_is_valid = m_process_sp && m_process_sp->IsAlive(); bool process_is_valid = m_process_sp && m_process_sp->IsAlive();
size_t bytes_read = 0; size_t bytes_read = 0;
Address resolved_addr(addr); Address resolved_addr;
if (!resolved_addr.IsSectionOffset()) if (!addr.IsSectionOffset())
{ {
if (process_is_valid) if (process_is_valid)
{
m_section_load_list.ResolveLoadAddress (addr.GetOffset(), resolved_addr); m_section_load_list.ResolveLoadAddress (addr.GetOffset(), resolved_addr);
}
else else
{
m_images.ResolveFileAddress(addr.GetOffset(), resolved_addr); m_images.ResolveFileAddress(addr.GetOffset(), resolved_addr);
} }
} if (!resolved_addr.IsValid())
resolved_addr = addr;
if (prefer_file_cache) if (prefer_file_cache)
{ {

2
lldb/source/Target/ThreadPlanTracer.cpp
View File

@ -209,11 +209,13 @@ ThreadPlanAssemblyTracer::Log ()
m_disassembler->DecodeInstructions (Address (NULL, pc), extractor, 0, 1, false); m_disassembler->DecodeInstructions (Address (NULL, pc), extractor, 0, 1, false);
InstructionList &instruction_list = m_disassembler->GetInstructionList(); InstructionList &instruction_list = m_disassembler->GetInstructionList();
const uint32_t max_opcode_byte_size = instruction_list.GetMaxOpcocdeByteSize();
if (instruction_list.GetSize()) if (instruction_list.GetSize())
{ {
Instruction *instruction = instruction_list.GetInstructionAtIndex(0).get(); Instruction *instruction = instruction_list.GetInstructionAtIndex(0).get();
instruction->Dump (&desc, instruction->Dump (&desc,
max_opcode_byte_size,
false, false,
false, false,
NULL, NULL,

3
lldb/test/settings/TestSettings.py
View File

@ -240,9 +240,6 @@ class SettingsCommandTestCase(TestBase):
"auto-confirm (boolean) = ", "auto-confirm (boolean) = ",
"target.default-arch (string):", "target.default-arch (string):",
"target.expr-prefix (string) = ", "target.expr-prefix (string) = ",
"target.execution-level (enum) = ",
"target.execution-mode (enum) = ",
"target.execution-os-type (enum) = ",
"target.process.run-args (array):", "target.process.run-args (array):",
"target.process.env-vars (dictionary):", "target.process.env-vars (dictionary):",
"target.process.inherit-env (boolean) = ", "target.process.inherit-env (boolean) = ",