3 files changed, 27 insertions, 1 deletions
diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp
index 9625894386b..efd70815f10 100644
--- a/lldb/source/Core/Disassembler.cpp
+++ b/lldb/source/Core/Disassembler.cpp
@@ -469,6 +469,14 @@ Disassembler::Disassemble
 Instruction::Instruction(const Address &addr) :
     m_addr (addr)
 {
+    ::memset (&m_opcode, 0, sizeof (m_opcode));
+}
+
+
+Instruction::Instruction(const Address &addr, const Opcode &opcode) :
+    m_addr (addr),
+    m_opcode (opcode)
+{
 }
 
 Instruction::~Instruction()
diff --git a/lldb/source/Core/EmulateInstruction.cpp b/lldb/source/Core/EmulateInstruction.cpp
index 05ded393560..eb20d087e5a 100644
--- a/lldb/source/Core/EmulateInstruction.cpp
+++ b/lldb/source/Core/EmulateInstruction.cpp
@@ -59,9 +59,9 @@ EmulateInstruction::EmulateInstruction
     m_write_mem_callback (write_mem_callback),
     m_read_reg_callback (read_reg_callback),
     m_write_reg_callback (write_reg_callback),
+    m_opcode (),
     m_opcode_pc (LLDB_INVALID_ADDRESS)
 {
-    ::memset (&m_opcode, 0, sizeof (m_opcode));
 }
 
 uint64_t
diff --git a/lldb/source/Core/Opcode.cpp b/lldb/source/Core/Opcode.cpp
new file mode 100644
index 00000000000..cb0b4d038b6
--- /dev/null
+++ b/lldb/source/Core/Opcode.cpp
@@ -0,0 +1,18 @@
+//===-- Baton.cpp -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Core/Opcode.h"
+
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
+
+using namespace lldb;
+using namespace lldb_private;
+\ No newline at end of file