diff options
| author | Sean Callanan <scallanan@apple.com> | 2012-08-07 01:44:58 +0000 |
|---|---|---|
| committer | Sean Callanan <scallanan@apple.com> | 2012-08-07 01:44:58 +0000 |
| commit | cd4ae1ab94e7cb17c5843faf6950fe17848c7058 (patch) | |
| tree | 44db56e02e3714de85980cb257cd6566bbabaf23 /lldb/source/Core/Opcode.cpp | |
| parent | 79101b5cb01eda3c3b617314de23b78ea6abb702 (diff) | |
| download | bcm5719-llvm-cd4ae1ab94e7cb17c5843faf6950fe17848c7058.tar.gz bcm5719-llvm-cd4ae1ab94e7cb17c5843faf6950fe17848c7058.zip | |
Changed the Opcode::GetData() API so that it didn't
require an AddressClass, which is useless at this
point since it already knows the distinction between
32-bit Thumb opcodes and 32-bit ARM opcodes.
llvm-svn: 161382
Diffstat (limited to 'lldb/source/Core/Opcode.cpp')
| -rw-r--r-- | lldb/source/Core/Opcode.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lldb/source/Core/Opcode.cpp b/lldb/source/Core/Opcode.cpp index a4a96fdf1cd..3793bdee2ae 100644 --- a/lldb/source/Core/Opcode.cpp +++ b/lldb/source/Core/Opcode.cpp @@ -86,7 +86,7 @@ Opcode::GetDataByteOrder () const } uint32_t -Opcode::GetData (DataExtractor &data, lldb::AddressClass address_class) const +Opcode::GetData (DataExtractor &data) const { uint32_t byte_size = GetByteSize (); @@ -101,12 +101,6 @@ Opcode::GetData (DataExtractor &data, lldb::AddressClass address_class) const case Opcode::eType8: buffer_sp.reset (new DataBufferHeap (&m_data.inst8, byte_size)); break; case Opcode::eType16: buffer_sp.reset (new DataBufferHeap (&m_data.inst16, byte_size)); break; case Opcode::eType16_2: - case Opcode::eType32: - // The only thing that uses eAddressClassCodeAlternateISA currently - // is Thumb. If this ever changes, we will need to pass in more - // information like an additional "const ArchSpec &arch". For now - // this will do - if (m_type == Opcode::eType16_2 || address_class == eAddressClassCodeAlternateISA) { // 32 bit thumb instruction, we need to sizzle this a bit uint8_t buf[4]; @@ -116,10 +110,9 @@ Opcode::GetData (DataExtractor &data, lldb::AddressClass address_class) const buf[3] = m_data.inst.bytes[1]; buffer_sp.reset (new DataBufferHeap (buf, byte_size)); } - else - { - buffer_sp.reset (new DataBufferHeap (&m_data.inst32, byte_size)); - } + break; + case Opcode::eType32: + buffer_sp.reset (new DataBufferHeap (&m_data.inst32, byte_size)); break; case Opcode::eType64: buffer_sp.reset (new DataBufferHeap (&m_data.inst64, byte_size)); break; case Opcode::eTypeBytes:buffer_sp.reset (new DataBufferHeap (GetOpcodeBytes(), byte_size)); break; |
