commit 7bc390873f7c1c798c36c8003c4b82597f67c703
author Greg Clayton <gclayton@apple.com> Thu Mar 24 23:53:38 2011 +0000
committer Greg Clayton <gclayton@apple.com> Thu Mar 24 23:53:38 2011 +0000
tree 09d2aa603c34c397e2054a65d9e5b5c898725523
parent b344843f75ef893762c93fd0a22d2d45712ce74d

Made the lldb_private::Opcode struct into a real boy... I mean class.

Modified the Disassembler::Instruction base class to contain an Opcode 
instance so that we can know the bytes for an instruction without needing
to keep the data around.

Modified the DisassemblerLLVM's instruction class to correctly extract the
opcode bytes if all goes well.



git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@128248 91177308-0d34-0410-b5e6-96231b3b80d8

source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp

diff --git a/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
index ca51db3..9835dea 100644
--- a/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
+++ b/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
@@ -32,7 +32,7 @@
 
 
 static int 
-DataExtractorByteReader(uint8_t *byte, uint64_t address, void *arg)
+DataExtractorByteReader (uint8_t *byte, uint64_t address, void *arg)
 {
     DataExtractor &extractor = *((DataExtractor *)arg);
 
@@ -74,7 +74,7 @@
     return -1;
 }
 
-DisassemblerLLVM::InstructionLLVM::InstructionLLVM (EDDisassemblerRef disassembler, const Address &addr) :
+DisassemblerLLVM::InstructionLLVM::InstructionLLVM (const Address &addr, EDDisassemblerRef disassembler) :
     Instruction (addr),
     m_disassembler (disassembler)
 {
@@ -334,10 +334,41 @@
 }
 
 size_t
-DisassemblerLLVM::InstructionLLVM::Extract(const DataExtractor &data, uint32_t data_offset)
+DisassemblerLLVM::InstructionLLVM::Extract (const Disassembler &disassembler, 
+                                            const lldb_private::DataExtractor &data,
+                                            uint32_t data_offset)
 {
     if (EDCreateInsts(&m_inst, 1, m_disassembler, DataExtractorByteReader, data_offset, (void*)(&data)))
-        return EDInstByteSize(m_inst);
+    {
+        const int byte_size = EDInstByteSize(m_inst);
+        uint32_t offset = data_offset;
+        // Make a copy of the opcode in m_opcode
+        switch (disassembler.GetArchitecture().GetMachine())
+        {
+        case llvm::Triple::x86:
+        case llvm::Triple::x86_64:
+            m_opcode.SetOpcodeBytes (data.PeekData (data_offset, byte_size), byte_size);
+            break;
+
+        case llvm::Triple::arm:
+            assert (byte_size == 4);
+            m_opcode.SetOpcode32 (data.GetU32 (&offset));
+            break;
+
+        case llvm::Triple::thumb:
+            assert ((byte_size == 2) || (byte_size == 4));
+            if (byte_size == 2)
+                m_opcode.SetOpcode16 (data.GetU16 (&offset));
+            else
+                m_opcode.SetOpcode32 (data.GetU32 (&offset));
+            break;
+
+        default:
+            assert (!"This shouldn't happen since we control the architecture we allow DisassemblerLLVM to be created for");
+            break;
+        }
+        return byte_size;
+    }
     else
         return 0;
 }
@@ -430,10 +461,10 @@
             if (inst_addr.GetAddressClass () == eAddressClassCodeAlternateISA)
                 use_thumb = true;
         }
-        InstructionSP inst_sp (new InstructionLLVM (use_thumb ? m_disassembler_thumb : m_disassembler, 
-                                                    inst_addr));
+        InstructionSP inst_sp (new InstructionLLVM (inst_addr, 
+                                                    use_thumb ? m_disassembler_thumb : m_disassembler));
 
-        size_t inst_byte_size = inst_sp->Extract (data, data_offset);
+        size_t inst_byte_size = inst_sp->Extract (*this, data, data_offset);
 
         if (inst_byte_size == 0)
             break;

source/Plugins/Disassembler/llvm/DisassemblerLLVM.h

diff --git a/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h b/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
index 012d4b6..5ecda3e 100644
--- a/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
+++ b/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
@@ -22,7 +22,8 @@
     class InstructionLLVM : public lldb_private::Instruction
     {
     public:
-        InstructionLLVM(EDDisassemblerRef disassembler, const lldb_private::Address &addr);
+        InstructionLLVM (const lldb_private::Address &addr,
+                         EDDisassemblerRef disassembler);
 
         virtual
         ~InstructionLLVM();
@@ -42,7 +43,8 @@
         GetByteSize() const;
 
         size_t
-        Extract (const lldb_private::DataExtractor &data,
+        Extract (const Disassembler &disassembler,
+                 const lldb_private::DataExtractor &data,
                  uint32_t data_offset);
 
     protected: