Removed 2800+ lines of code that no longer do anything

now that the IR interpreter and the JIT share the same
materialization codepaths.

llvm-svn: 179842

1 files changed, 19 insertions, 1247 deletions

diff --git a/lldb/source/Expression/IRInterpreter.cpp b/lldb/source/Expression/IRInterpreter.cpp
index bfd8abe793a..509e4636d70 100644
--- a/lldb/source/Expression/IRInterpreter.cpp
+++ b/lldb/source/Expression/IRInterpreter.cpp
@@ -83,7 +83,6 @@ public:
     ValueMap                                m_values;
     PlacedValueVector                       m_placed_values;
     DataLayout                             &m_target_data;
-    lldb_private::ClangExpressionDeclMap   *m_decl_map;
     lldb_private::IRMemoryMap              &m_memory_map;
     const BasicBlock                       *m_bb;
     BasicBlock::const_iterator              m_ii;
@@ -97,10 +96,8 @@ public:
     size_t                                  m_addr_byte_size;
     
     InterpreterStackFrame (DataLayout &target_data,
-                           lldb_private::ClangExpressionDeclMap *decl_map,
                            lldb_private::IRMemoryMap &memory_map) :
         m_target_data (target_data),
-        m_decl_map (decl_map),
         m_memory_map (memory_map)
     {
         m_byte_order = (target_data.isLittleEndian() ? lldb::eByteOrderLittle : lldb::eByteOrderBig);
@@ -396,68 +393,6 @@ public:
         return Malloc(m_target_data.getTypeAllocSize(type), m_target_data.getPrefTypeAlignment(type));
     }
     
-    lldb::addr_t PlaceLLDBValue (const llvm::Value *value, lldb_private::Value lldb_value)
-    {
-        if (!m_decl_map)
-            return false;
-        
-        lldb_private::Error alloc_error;
-        lldb_private::RegisterInfo *reg_info = lldb_value.GetRegisterInfo();
-                
-        lldb::addr_t ret;
-        
-        size_t value_size = m_target_data.getTypeStoreSize(value->getType());
-        size_t value_align = m_target_data.getPrefTypeAlignment(value->getType());
-        
-        if (reg_info && (reg_info->encoding == lldb::eEncodingVector))
-            value_size = reg_info->byte_size;
-        
-        if (!reg_info && (lldb_value.GetValueType() == lldb_private::Value::eValueTypeLoadAddress))
-            return lldb_value.GetScalar().ULongLong();
-        
-        ret = Malloc(value_size, value_align);
-        
-        if (ret == LLDB_INVALID_ADDRESS)
-            return LLDB_INVALID_ADDRESS;
-        
-        lldb_private::DataBufferHeap buf(value_size, 0);
-        
-        m_decl_map->ReadTarget(m_memory_map, buf.GetBytes(), lldb_value, value_size);
-        
-        lldb_private::Error write_error;
-        
-        m_memory_map.WriteMemory(ret, buf.GetBytes(), buf.GetByteSize(), write_error);
-        
-        if (!write_error.Success())
-        {
-            lldb_private::Error free_error;
-            m_memory_map.Free(ret, free_error);
-            return LLDB_INVALID_ADDRESS;
-        }
-        
-        m_placed_values.push_back(PlacedValue(lldb_value, ret, value_size));
-        
-        return ret;
-    }
-    
-    void RestoreLLDBValues ()
-    {
-        if (!m_decl_map)
-            return;
-        
-        for (PlacedValue &placed_value : m_placed_values)
-        {
-            lldb_private::DataBufferHeap buf(placed_value.size, 0);
-            
-            lldb_private::Error read_error;
-            
-            m_memory_map.ReadMemory(buf.GetBytes(), placed_value.process_address, buf.GetByteSize(), read_error);
-            
-            if (read_error.Success())
-                m_decl_map->WriteTarget(m_memory_map, placed_value.lldb_value, buf.GetBytes(), buf.GetByteSize());
-        }
-    }
-    
     std::string PrintData (lldb::addr_t addr, llvm::Type *type)
     {
         size_t length = m_target_data.getTypeStoreSize(type);
@@ -507,395 +442,9 @@ public:
         
         m_values[value] = data_address;
         return data_address;
-        
-        const GlobalValue *global_value = dyn_cast<GlobalValue>(value);
-        
-        // If the variable is indirected through the argument
-        // array then we need to build an extra level of indirection
-        // for it.  This is the default; only magic arguments like
-        // "this", "self", and "_cmd" are direct.
-        bool variable_is_this = false;
-        
-        // If the variable is a function pointer, we do not need to
-        // build an extra layer of indirection for it because it is
-        // accessed directly.
-        bool variable_is_function_address = false;
-        
-        // Attempt to resolve the value using the program's data.
-        // If it is, the values to be created are:
-        //
-        // data_region - a region of memory in which the variable's data resides.
-        // ref_region - a region of memory in which its address (i.e., &var) resides.
-        //   In the JIT case, this region would be a member of the struct passed in.
-        // pointer_region - a region of memory in which the address of the pointer
-        //   resides.  This is an IR-level variable.
-        do
-        {
-            lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-
-            lldb_private::Value resolved_value;
-            lldb_private::ClangExpressionVariable::FlagType flags = 0;
-            
-            if (global_value)
-            {            
-                clang::NamedDecl *decl = IRForTarget::DeclForGlobal(global_value, &module);
-
-                if (!decl)
-                    break;
-                
-                if (isa<clang::FunctionDecl>(decl))
-                    variable_is_function_address = true;
-                
-                resolved_value = m_decl_map->LookupDecl(decl, flags);
-            }
-            else
-            {
-                // Special-case "this", "self", and "_cmd"
-                
-                std::string name_str = value->getName().str();
-                
-                if (name_str == "this" ||
-                    name_str == "self" ||
-                    name_str == "_cmd")
-                {
-                    resolved_value = m_decl_map->GetSpecialValue(lldb_private::ConstString(name_str.c_str()));
-                    variable_is_this = true;
-                }
-            }
-            
-            if (resolved_value.GetScalar().GetType() != lldb_private::Scalar::e_void)
-            {
-                if (resolved_value.GetContextType() == lldb_private::Value::eContextTypeRegisterInfo)
-                {
-                    if (variable_is_this)
-                    {                                                
-                        lldb_private::Error alloc_error;
-                        lldb::addr_t ref_addr = Malloc(value->getType());
-                        
-                        if (ref_addr == LLDB_INVALID_ADDRESS)
-                            return LLDB_INVALID_ADDRESS;
-                        
-                        lldb_private::Error write_error;
-                        m_memory_map.WritePointerToMemory(ref_addr, resolved_value.GetScalar().ULongLong(), write_error);
-                        
-                        if (!write_error.Success())
-                            return LLDB_INVALID_ADDRESS;
-                        
-                        if (log)
-                        {
-                            log->Printf("Made an allocation for \"this\" register variable %s", PrintValue(value).c_str());
-                            log->Printf("  Data region    : %llx", (unsigned long long)resolved_value.GetScalar().ULongLong());
-                            log->Printf("  Ref region     : %llx", (unsigned long long)ref_addr);
-                        }
-                        
-                        m_values[value] = ref_addr;
-                        return ref_addr;
-                    }
-                    else if (flags & lldb_private::ClangExpressionVariable::EVBareRegister)
-                    {                                                
-                        lldb::addr_t data_address = PlaceLLDBValue(value, resolved_value);
-                        
-                        if (!data_address)
-                            return LLDB_INVALID_ADDRESS;
-                        
-                        lldb::addr_t ref_address = MallocPointer();
-                        
-                        if (ref_address == LLDB_INVALID_ADDRESS)
-                        {
-                            lldb_private::Error free_error;
-                            m_memory_map.Free(data_address, free_error);
-                            return LLDB_INVALID_ADDRESS;
-                        }
-                        
-                        lldb_private::Error write_error;
-
-                        m_memory_map.WritePointerToMemory(ref_address, data_address, write_error);
-                        
-                        if (!write_error.Success())
-                        {
-                            lldb_private::Error free_error;
-                            m_memory_map.Free(data_address, free_error);
-                            m_memory_map.Free(ref_address, free_error);
-                            return LLDB_INVALID_ADDRESS;
-                        }
-                        
-                        if (log)
-                        {
-                            log->Printf("Made an allocation for bare register variable %s", PrintValue(value).c_str());
-                            log->Printf("  Data contents  : %s", PrintData(data_address, value->getType()).c_str());
-                            log->Printf("  Data region    : 0x%llx", (unsigned long long)data_address);
-                            log->Printf("  Ref region     : 0x%llx", (unsigned long long)ref_address);
-                        }
-                        
-                        m_values[value] = ref_address;
-                        return ref_address;
-                    }
-                    else
-                    {                                               
-                        lldb::addr_t data_address = PlaceLLDBValue(value, resolved_value);
-                        
-                        if (data_address == LLDB_INVALID_ADDRESS)
-                            return LLDB_INVALID_ADDRESS;
-                        
-                        lldb::addr_t ref_address = MallocPointer();
-                        
-                        if (ref_address == LLDB_INVALID_ADDRESS)
-                        {
-                            lldb_private::Error free_error;
-                            m_memory_map.Free(data_address, free_error);
-                            return LLDB_INVALID_ADDRESS;
-                        }
-                        
-                        lldb::addr_t pointer_address = MallocPointer();
-                        
-                        if (pointer_address == LLDB_INVALID_ADDRESS)
-                        {
-                            lldb_private::Error free_error;
-                            m_memory_map.Free(data_address, free_error);
-                            m_memory_map.Free(ref_address, free_error);
-                            return LLDB_INVALID_ADDRESS;
-                        }
-                                                
-                        lldb_private::Error write_error;
-                        
-                        m_memory_map.WritePointerToMemory(ref_address, data_address, write_error);
-                        
-                        if (!write_error.Success())
-                        {
-                            lldb_private::Error free_error;
-                            m_memory_map.Free(data_address, free_error);
-                            m_memory_map.Free(ref_address, free_error);
-                            m_memory_map.Free(pointer_address, free_error);
-                            return LLDB_INVALID_ADDRESS;
-                        }
-                        
-                        write_error.Clear();
-                        
-                        m_memory_map.WritePointerToMemory(pointer_address, ref_address, write_error);
-                        
-                        if (!write_error.Success())
-                        {
-                            lldb_private::Error free_error;
-                            m_memory_map.Free(data_address, free_error);
-                            m_memory_map.Free(ref_address, free_error);
-                            m_memory_map.Free(pointer_address, free_error);
-                            return LLDB_INVALID_ADDRESS;
-                        }
-                        
-                        if (log)
-                        {
-                            log->Printf("Made an allocation for ordinary register variable %s", PrintValue(value).c_str());
-                            log->Printf("  Data contents  : %s", PrintData(data_address, value->getType()).c_str());
-                            log->Printf("  Data region    : 0x%llx", (unsigned long long)data_address);
-                            log->Printf("  Ref region     : 0x%llx", (unsigned long long)ref_address);
-                            log->Printf("  Pointer region : 0x%llx", (unsigned long long)pointer_address);
-                        }
-                        
-                        m_values[value] = pointer_address;
-                        return pointer_address;
-                    }
-                }
-                else
-                {
-                    bool no_extra_redirect = (variable_is_this || variable_is_function_address);
-                    
-                    lldb::addr_t data_address = PlaceLLDBValue(value, resolved_value);
-                    
-                    if (data_address == LLDB_INVALID_ADDRESS)
-                        return LLDB_INVALID_ADDRESS;
-                    
-                    lldb::addr_t ref_address = MallocPointer();
-                    
-                    if (ref_address == LLDB_INVALID_ADDRESS)
-                    {
-                        lldb_private::Error free_error;
-                        m_memory_map.Free(data_address, free_error);
-                        return LLDB_INVALID_ADDRESS;
-                    }
-
-                    lldb::addr_t pointer_address = LLDB_INVALID_ADDRESS;
-                    
-                    if (!no_extra_redirect)
-                    {
-                        pointer_address = MallocPointer();
-                        
-                        if (pointer_address == LLDB_INVALID_ADDRESS)
-                        {
-                            lldb_private::Error free_error;
-                            m_memory_map.Free(data_address, free_error);
-                            m_memory_map.Free(ref_address, free_error);
-                            return LLDB_INVALID_ADDRESS;
-                        }
-                    }
-                    
-                    lldb_private::Error write_error;
-                    
-                    m_memory_map.WritePointerToMemory(ref_address, data_address, write_error);
-                    
-                    if (!write_error.Success())
-                    {
-                        lldb_private::Error free_error;
-                        m_memory_map.Free(data_address, free_error);
-                        m_memory_map.Free(ref_address, free_error);
-                        if (pointer_address != LLDB_INVALID_ADDRESS)
-                            m_memory_map.Free(pointer_address, free_error);
-                        return LLDB_INVALID_ADDRESS;
-                    }
-                                        
-                    if (!no_extra_redirect)
-                    {
-                        write_error.Clear();
-                        
-                        m_memory_map.WritePointerToMemory(pointer_address, ref_address, write_error);
-                        
-                        if (!write_error.Success())
-                        {
-                            lldb_private::Error free_error;
-                            m_memory_map.Free(data_address, free_error);
-                            m_memory_map.Free(ref_address, free_error);
-                            if (pointer_address != LLDB_INVALID_ADDRESS)
-                                m_memory_map.Free(pointer_address, free_error);
-                            return LLDB_INVALID_ADDRESS;
-                        }
-                    }
-                    
-                    if (log)
-                    {
-                        log->Printf("Made an allocation for %s", PrintValue(value).c_str());
-                        log->Printf("  Data contents  : %s", PrintData(data_address, value->getType()).c_str());
-                        log->Printf("  Data region    : %llx", (unsigned long long)data_address);
-                        log->Printf("  Ref region     : %llx", (unsigned long long)ref_address);
-                        if (!variable_is_this)
-                            log->Printf("  Pointer region : %llx", (unsigned long long)pointer_address);
-                    }
-                    
-                    if (no_extra_redirect)
-                    {
-                        m_values[value] = ref_address;
-                        return ref_address;
-                    }
-                    else
-                    {
-                        m_values[value] = pointer_address;
-                        return pointer_address;
-                    }
-                }
-            }
-        }
-        while(0);
-    }
-    
-    bool ConstructResult (lldb::ClangExpressionVariableSP &result,
-                          const GlobalValue *result_value,
-                          const lldb_private::ConstString &result_name,
-                          lldb_private::TypeFromParser result_type,
-                          Module &module)
-    {
-        if (!m_decl_map)
-            return false;
-        
-        // The result_value resolves to P, a pointer to a region R containing the result data.
-        // If the result variable is a reference, the region R contains a pointer to the result R_final in the original process.
-        
-        if (!result_value)
-            return true; // There was no slot for a result – the expression doesn't return one.
-        
-        ValueMap::iterator i = m_values.find(result_value);
-
-        if (i == m_values.end())
-            return false; // There was a slot for the result, but we didn't write into it.
-        
-        lldb::addr_t P = i->second;
-        
-        Type *pointer_ty = result_value->getType();
-        PointerType *pointer_ptr_ty = dyn_cast<PointerType>(pointer_ty);
-        if (!pointer_ptr_ty)
-            return false;
-        Type *R_ty = pointer_ptr_ty->getElementType();
-                
-        lldb_private::Error read_error;
-        lldb::addr_t R;
-        m_memory_map.ReadPointerFromMemory(&R, P, read_error);
-        if (!read_error.Success())
-            return false;
-        
-        lldb_private::Value base;
-        
-        bool transient = false;
-        bool maybe_make_load = false;
-        
-        if (m_decl_map->ResultIsReference(result_name))
-        {
-            PointerType *R_ptr_ty = dyn_cast<PointerType>(R_ty);           
-            if (!R_ptr_ty)
-                return false;
-            
-            read_error.Clear();
-            lldb::addr_t R_pointer;
-            m_memory_map.ReadPointerFromMemory(&R_pointer, R, read_error);
-            if (!read_error.Success())
-                return false;
-            
-            // We got a bare pointer.  We are going to treat it as a load address
-            // or a file address, letting decl_map make the choice based on whether
-            // or not a process exists.
-            
-            bool was_placed = false;
-            
-            for (PlacedValue &value : m_placed_values)
-            {
-                if (value.process_address == R_pointer)
-                {
-                    base = value.lldb_value;
-                    was_placed = true;
-                    break;
-                }
-            }
-            
-            if (!was_placed)
-            {
-                base.SetContext(lldb_private::Value::eContextTypeInvalid, NULL);
-                base.SetValueType(lldb_private::Value::eValueTypeFileAddress);
-                base.GetScalar() = (unsigned long long)R_pointer;
-                maybe_make_load = true;
-            }
-        }
-        else
-        {
-            base.SetContext(lldb_private::Value::eContextTypeInvalid, NULL);
-            base.SetValueType(lldb_private::Value::eValueTypeLoadAddress);
-            base.GetScalar() = (unsigned long long)R;
-        }                     
-                        
-        return m_decl_map->CompleteResultVariable (result, m_memory_map, base, result_name, result_type, transient, maybe_make_load);
     }
 };
 
-bool
-IRInterpreter::maybeRunOnFunction (lldb_private::ClangExpressionDeclMap *decl_map,
-                                   lldb_private::IRMemoryMap &memory_map,
-                                   lldb_private::Stream *error_stream,
-                                   lldb::ClangExpressionVariableSP &result,
-                                   const lldb_private::ConstString &result_name,
-                                   lldb_private::TypeFromParser result_type,
-                                   Function &llvm_function,
-                                   Module &llvm_module,
-                                   lldb_private::Error &err)
-{
-    if (supportsFunction (llvm_function, err))
-        return runOnFunction(decl_map,
-                             memory_map,
-                             error_stream,
-                             result,
-                             result_name, 
-                             result_type, 
-                             llvm_function,
-                             llvm_module,
-                             err);
-    else
-        return false;
-}
-
 static const char *unsupported_opcode_error         = "Interpreter doesn't handle one of the expression's opcodes";
 //static const char *interpreter_initialization_error = "Interpreter couldn't be initialized";
 static const char *interpreter_internal_error       = "Interpreter encountered an internal error";
@@ -904,15 +453,16 @@ static const char *memory_allocation_error          = "Interpreter couldn't allo
 static const char *memory_write_error               = "Interpreter couldn't write to memory";
 static const char *memory_read_error                = "Interpreter couldn't read from memory";
 static const char *infinite_loop_error              = "Interpreter ran for too many cycles";
-static const char *bad_result_error                 = "Result of expression is in bad memory";
+//static const char *bad_result_error                 = "Result of expression is in bad memory";
 
 bool
-IRInterpreter::supportsFunction (Function &llvm_function, 
-                                 lldb_private::Error &err)
+IRInterpreter::CanInterpret (llvm::Module &module,
+                             llvm::Function &function,
+                             lldb_private::Error &error)
 {
     lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
     
-    for (Function::iterator bbi = llvm_function.begin(), bbe = llvm_function.end();
+    for (Function::iterator bbi = function.begin(), bbe = function.end();
          bbi != bbe;
          ++bbi)
     {
@@ -926,8 +476,8 @@ IRInterpreter::supportsFunction (Function &llvm_function,
                 {
                     if (log)
                         log->Printf("Unsupported instruction: %s", PrintValue(ii).c_str());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(unsupported_opcode_error);
+                    error.SetErrorToGenericError();
+                    error.SetErrorString(unsupported_opcode_error);
                     return false;
                 }
             case Instruction::Add:
@@ -942,22 +492,22 @@ IRInterpreter::supportsFunction (Function &llvm_function,
                     
                     if (!icmp_inst)
                     {
-                        err.SetErrorToGenericError();
-                        err.SetErrorString(interpreter_internal_error);
+                        error.SetErrorToGenericError();
+                        error.SetErrorString(interpreter_internal_error);
                         return false;
                     }
                     
                     switch (icmp_inst->getPredicate())
                     {
                     default:
-                        {
-                            if (log)
-                                log->Printf("Unsupported ICmp predicate: %s", PrintValue(ii).c_str());
-                            
-                            err.SetErrorToGenericError();
-                            err.SetErrorString(unsupported_opcode_error);
-                            return false;
-                        }
+                    {
+                        if (log)
+                            log->Printf("Unsupported ICmp predicate: %s", PrintValue(ii).c_str());
+                        
+                        error.SetErrorToGenericError();
+                        error.SetErrorString(unsupported_opcode_error);
+                        return false;
+                    }
                     case CmpInst::ICMP_EQ:
                     case CmpInst::ICMP_NE:
                     case CmpInst::ICMP_UGT:
@@ -995,785 +545,7 @@ IRInterpreter::supportsFunction (Function &llvm_function,
         }
     }
     
-    return true;
-}
-
-bool 
-IRInterpreter::runOnFunction (lldb_private::ClangExpressionDeclMap *decl_map,
-                              lldb_private::IRMemoryMap &memory_map,
-                              lldb_private::Stream *error_stream,
-                              lldb::ClangExpressionVariableSP &result,
-                              const lldb_private::ConstString &result_name,
-                              lldb_private::TypeFromParser result_type,
-                              Function &llvm_function,
-                              Module &llvm_module,
-                              lldb_private::Error &err)
-{
-    lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-    
-    DataLayout target_data(&llvm_module);
-    
-    InterpreterStackFrame frame(target_data, decl_map, memory_map);
-
-    uint32_t num_insts = 0;
-    
-    frame.Jump(llvm_function.begin());
-    
-    while (frame.m_ii != frame.m_ie && (++num_insts < 4096))
-    {
-        const Instruction *inst = frame.m_ii;
-        
-        if (log)
-            log->Printf("Interpreting %s", PrintValue(inst).c_str());
-        
-        switch (inst->getOpcode())
-        {
-        default:
-            break;
-        case Instruction::Add:
-        case Instruction::Sub:
-        case Instruction::Mul:
-        case Instruction::SDiv:
-        case Instruction::UDiv:
-        case Instruction::SRem:
-        case Instruction::URem:
-        case Instruction::Shl:
-        case Instruction::LShr:
-        case Instruction::AShr:
-        case Instruction::And:
-        case Instruction::Or:
-        case Instruction::Xor:
-            {
-                const BinaryOperator *bin_op = dyn_cast<BinaryOperator>(inst);
-                
-                if (!bin_op)
-                {
-                    if (log)
-                        log->Printf("getOpcode() returns %s, but instruction is not a BinaryOperator", inst->getOpcodeName());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;                
-                }
-                
-                Value *lhs = inst->getOperand(0);
-                Value *rhs = inst->getOperand(1);
-                
-                lldb_private::Scalar L;
-                lldb_private::Scalar R;
-                
-                if (!frame.EvaluateValue(L, lhs, llvm_module))
-                {
-                    if (log)
-                        log->Printf("Couldn't evaluate %s", PrintValue(lhs).c_str());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                
-                if (!frame.EvaluateValue(R, rhs, llvm_module))
-                {
-                    if (log)
-                        log->Printf("Couldn't evaluate %s", PrintValue(rhs).c_str());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);                 
-                    return false;
-                }
-                
-                lldb_private::Scalar result;
-                
-                switch (inst->getOpcode())
-                {
-                default:
-                    break;
-                case Instruction::Add:
-                    result = L + R;
-                    break;
-                case Instruction::Mul:
-                    result = L * R;
-                    break;
-                case Instruction::Sub:
-                    result = L - R;
-                    break;
-                case Instruction::SDiv:
-                    result = L / R;
-                    break;
-                case Instruction::UDiv:
-                    result = L.GetRawBits64(0) / R.GetRawBits64(1);
-                    break;
-                case Instruction::SRem:
-                    result = L % R;
-                    break;
-                case Instruction::URem:
-                    result = L.GetRawBits64(0) % R.GetRawBits64(1);
-                    break;
-                case Instruction::Shl:
-                    result = L << R;
-                    break;
-                case Instruction::AShr:
-                    result = L >> R;
-                    break;
-                case Instruction::LShr:
-                    result = L;
-                    result.ShiftRightLogical(R);
-                    break;
-                case Instruction::And:
-                    result = L & R;
-                    break;
-                case Instruction::Or:
-                    result = L | R;
-                    break;
-                case Instruction::Xor:
-                    result = L ^ R;
-                    break;
-                }
-                                
-                frame.AssignValue(inst, result, llvm_module);
-                
-                if (log)
-                {
-                    log->Printf("Interpreted a %s", inst->getOpcodeName());
-                    log->Printf("  L : %s", frame.SummarizeValue(lhs).c_str());
-                    log->Printf("  R : %s", frame.SummarizeValue(rhs).c_str());
-                    log->Printf("  = : %s", frame.SummarizeValue(inst).c_str());
-                }
-            }
-            break;
-        case Instruction::Alloca:
-            {
-                const AllocaInst *alloca_inst = dyn_cast<AllocaInst>(inst);
-                
-                if (!alloca_inst)
-                {
-                    if (log)
-                        log->Printf("getOpcode() returns Alloca, but instruction is not an AllocaInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;
-                }
-                
-                if (alloca_inst->isArrayAllocation())
-                {
-                    if (log)
-                        log->Printf("AllocaInsts are not handled if isArrayAllocation() is true");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(unsupported_opcode_error);
-                    return false;
-                }
-                
-                // The semantics of Alloca are:
-                //   Create a region R of virtual memory of type T, backed by a data buffer
-                //   Create a region P of virtual memory of type T*, backed by a data buffer
-                //   Write the virtual address of R into P
-                
-                Type *T = alloca_inst->getAllocatedType();
-                Type *Tptr = alloca_inst->getType();
-                
-                lldb::addr_t R = frame.Malloc(T);
-                                
-                if (R == LLDB_INVALID_ADDRESS)
-                {
-                    if (log)
-                        log->Printf("Couldn't allocate memory for an AllocaInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(memory_allocation_error);
-                    return false;
-                }
-                
-                lldb::addr_t P = frame.Malloc(Tptr);
-                
-                if (P == LLDB_INVALID_ADDRESS)
-                {
-                    if (log)
-                        log->Printf("Couldn't allocate the result pointer for an AllocaInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(memory_allocation_error);
-                    return false;
-                }
-                
-                lldb_private::Error write_error;
-                
-                memory_map.WritePointerToMemory(P, R, write_error);
-                
-                if (!write_error.Success())
-                {
-                    if (log)
-                        log->Printf("Couldn't write the result pointer for an AllocaInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(memory_write_error);
-                    lldb_private::Error free_error;
-                    memory_map.Free(P, free_error);
-                    memory_map.Free(R, free_error);
-                    return false;
-                }
-                
-                frame.m_values[alloca_inst] = P;
-                
-                if (log)
-                {
-                    log->Printf("Interpreted an AllocaInst");
-                    log->Printf("  R : 0x%llx", R);
-                    log->Printf("  P : 0x%llx", P);
-                }
-            }
-            break;
-        case Instruction::BitCast:
-        case Instruction::ZExt:
-            {
-                const CastInst *cast_inst = dyn_cast<CastInst>(inst);
-                
-                if (!cast_inst)
-                {
-                    if (log)
-                        log->Printf("getOpcode() returns %s, but instruction is not a BitCastInst", cast_inst->getOpcodeName());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;
-                }
-                
-                Value *source = cast_inst->getOperand(0);
-                
-                lldb_private::Scalar S;
-                
-                if (!frame.EvaluateValue(S, source, llvm_module))
-                {
-                    if (log)
-                        log->Printf("Couldn't evaluate %s", PrintValue(source).c_str());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                
-                frame.AssignValue(inst, S, llvm_module);
-            }
-            break;
-        case Instruction::Br:
-            {
-                const BranchInst *br_inst = dyn_cast<BranchInst>(inst);
-                
-                if (!br_inst)
-                {
-                    if (log)
-                        log->Printf("getOpcode() returns Br, but instruction is not a BranchInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;
-                }
-                
-                if (br_inst->isConditional())
-                {
-                    Value *condition = br_inst->getCondition();
-                    
-                    lldb_private::Scalar C;
-                    
-                    if (!frame.EvaluateValue(C, condition, llvm_module))
-                    {
-                        if (log)
-                            log->Printf("Couldn't evaluate %s", PrintValue(condition).c_str());
-                        err.SetErrorToGenericError();
-                        err.SetErrorString(bad_value_error);
-                        return false;
-                    }
-                
-                    if (C.GetRawBits64(0))
-                        frame.Jump(br_inst->getSuccessor(0));
-                    else
-                        frame.Jump(br_inst->getSuccessor(1));
-                    
-                    if (log)
-                    {
-                        log->Printf("Interpreted a BrInst with a condition");
-                        log->Printf("  cond : %s", frame.SummarizeValue(condition).c_str());
-                    }
-                }
-                else
-                {
-                    frame.Jump(br_inst->getSuccessor(0));
-                    
-                    if (log)
-                    {
-                        log->Printf("Interpreted a BrInst with no condition");
-                    }
-                }
-            }
-            continue;
-        case Instruction::GetElementPtr:
-            {
-                const GetElementPtrInst *gep_inst = dyn_cast<GetElementPtrInst>(inst);
-                
-                if (!gep_inst)
-                {
-                    if (log)
-                        log->Printf("getOpcode() returns GetElementPtr, but instruction is not a GetElementPtrInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;
-                }
-             
-                const Value *pointer_operand = gep_inst->getPointerOperand();
-                Type *pointer_type = pointer_operand->getType();
-                
-                lldb_private::Scalar P;
-                
-                if (!frame.EvaluateValue(P, pointer_operand, llvm_module))
-                {
-                    if (log)
-                        log->Printf("Couldn't evaluate %s", PrintValue(pointer_operand).c_str());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                    
-                typedef SmallVector <Value *, 8> IndexVector;
-                typedef IndexVector::iterator IndexIterator;
-                
-                SmallVector <Value *, 8> indices (gep_inst->idx_begin(),
-                                                  gep_inst->idx_end());
-                
-                SmallVector <Value *, 8> const_indices;
-                
-                for (IndexIterator ii = indices.begin(), ie = indices.end();
-                     ii != ie;
-                     ++ii)
-                {
-                    ConstantInt *constant_index = dyn_cast<ConstantInt>(*ii);
-                    
-                    if (!constant_index)
-                    {
-                        lldb_private::Scalar I;
-                        
-                        if (!frame.EvaluateValue(I, *ii, llvm_module))
-                        {
-                            if (log)
-                                log->Printf("Couldn't evaluate %s", PrintValue(*ii).c_str());
-                            err.SetErrorToGenericError();
-                            err.SetErrorString(bad_value_error);
-                            return false;
-                        }
-                        
-                        if (log)
-                            log->Printf("Evaluated constant index %s as %llu", PrintValue(*ii).c_str(), I.ULongLong(LLDB_INVALID_ADDRESS));
-                        
-                        constant_index = cast<ConstantInt>(ConstantInt::get((*ii)->getType(), I.ULongLong(LLDB_INVALID_ADDRESS)));
-                    }
-                    
-                    const_indices.push_back(constant_index);
-                }
-                
-                uint64_t offset = target_data.getIndexedOffset(pointer_type, const_indices);
-                
-                lldb_private::Scalar Poffset = P + offset;
-                
-                frame.AssignValue(inst, Poffset, llvm_module);
-                
-                if (log)
-                {
-                    log->Printf("Interpreted a GetElementPtrInst");
-                    log->Printf("  P       : %s", frame.SummarizeValue(pointer_operand).c_str());
-                    log->Printf("  Poffset : %s", frame.SummarizeValue(inst).c_str());
-                }
-            }
-            break;
-        case Instruction::ICmp:
-            {
-                const ICmpInst *icmp_inst = dyn_cast<ICmpInst>(inst);
-                
-                if (!icmp_inst)
-                {
-                    if (log)
-                        log->Printf("getOpcode() returns ICmp, but instruction is not an ICmpInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;
-                }
-                
-                CmpInst::Predicate predicate = icmp_inst->getPredicate();
-                
-                Value *lhs = inst->getOperand(0);
-                Value *rhs = inst->getOperand(1);
-                
-                lldb_private::Scalar L;
-                lldb_private::Scalar R;
-                
-                if (!frame.EvaluateValue(L, lhs, llvm_module))
-                {
-                    if (log)
-                        log->Printf("Couldn't evaluate %s", PrintValue(lhs).c_str());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                
-                if (!frame.EvaluateValue(R, rhs, llvm_module))
-                {
-                    if (log)
-                        log->Printf("Couldn't evaluate %s", PrintValue(rhs).c_str());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                
-                lldb_private::Scalar result;
-
-                switch (predicate)
-                {
-                default:
-                    return false;
-                case CmpInst::ICMP_EQ:
-                    result = (L == R);
-                    break;
-                case CmpInst::ICMP_NE:
-                    result = (L != R);
-                    break;    
-                case CmpInst::ICMP_UGT:
-                    result = (L.GetRawBits64(0) > R.GetRawBits64(0));
-                    break;
-                case CmpInst::ICMP_UGE:
-                    result = (L.GetRawBits64(0) >= R.GetRawBits64(0));
-                    break;
-                case CmpInst::ICMP_ULT:
-                    result = (L.GetRawBits64(0) < R.GetRawBits64(0));
-                    break;
-                case CmpInst::ICMP_ULE:
-                    result = (L.GetRawBits64(0) <= R.GetRawBits64(0));
-                    break;
-                case CmpInst::ICMP_SGT:
-                    result = (L > R);
-                    break;
-                case CmpInst::ICMP_SGE:
-                    result = (L >= R);
-                    break;
-                case CmpInst::ICMP_SLT:
-                    result = (L < R);
-                    break;
-                case CmpInst::ICMP_SLE:
-                    result = (L <= R);
-                    break;
-                }
-                
-                frame.AssignValue(inst, result, llvm_module);
-                
-                if (log)
-                {
-                    log->Printf("Interpreted an ICmpInst");
-                    log->Printf("  L : %s", frame.SummarizeValue(lhs).c_str());
-                    log->Printf("  R : %s", frame.SummarizeValue(rhs).c_str());
-                    log->Printf("  = : %s", frame.SummarizeValue(inst).c_str());
-                }
-            }
-            break;
-        case Instruction::IntToPtr:
-            {
-                const IntToPtrInst *int_to_ptr_inst = dyn_cast<IntToPtrInst>(inst);
-                
-                if (!int_to_ptr_inst)
-                {
-                    if (log)
-                        log->Printf("getOpcode() returns IntToPtr, but instruction is not an IntToPtrInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;
-                }
-                
-                Value *src_operand = int_to_ptr_inst->getOperand(0);
-                
-                lldb_private::Scalar I;
-                
-                if (!frame.EvaluateValue(I, src_operand, llvm_module))
-                {
-                    if (log)
-                        log->Printf("Couldn't evaluate %s", PrintValue(src_operand).c_str());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                
-                frame.AssignValue(inst, I, llvm_module);
-                
-                if (log)
-                {
-                    log->Printf("Interpreted an IntToPtr");
-                    log->Printf("  Src : %s", frame.SummarizeValue(src_operand).c_str());
-                    log->Printf("  =   : %s", frame.SummarizeValue(inst).c_str()); 
-                }
-            }
-            break;
-        case Instruction::PtrToInt:
-            {
-                const PtrToIntInst *ptr_to_int_inst = dyn_cast<PtrToIntInst>(inst);
-                
-                if (!ptr_to_int_inst)
-                {
-                    if (log)
-                        log->Printf("getOpcode() returns PtrToInt, but instruction is not an PtrToIntInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;
-                }
-                
-                Value *src_operand = ptr_to_int_inst->getOperand(0);
-                
-                lldb_private::Scalar I;
-                
-                if (!frame.EvaluateValue(I, src_operand, llvm_module))
-                {
-                    if (log)
-                        log->Printf("Couldn't evaluate %s", PrintValue(src_operand).c_str());
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                
-                frame.AssignValue(inst, I, llvm_module);
-                
-                if (log)
-                {
-                    log->Printf("Interpreted a PtrToInt");
-                    log->Printf("  Src : %s", frame.SummarizeValue(src_operand).c_str());
-                    log->Printf("  =   : %s", frame.SummarizeValue(inst).c_str());
-                }
-            }
-            break;
-        case Instruction::Load:
-            {
-                const LoadInst *load_inst = dyn_cast<LoadInst>(inst);
-                
-                if (!load_inst)
-                {
-                    if (log)
-                        log->Printf("getOpcode() returns Load, but instruction is not a LoadInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;
-                }
-                
-                // The semantics of Load are:
-                //   Create a region D that will contain the loaded data
-                //   Resolve the region P containing a pointer
-                //   Dereference P to get the region R that the data should be loaded from
-                //   Transfer a unit of type type(D) from R to D
-                                
-                const Value *pointer_operand = load_inst->getPointerOperand();
-                
-                Type *pointer_ty = pointer_operand->getType();
-                PointerType *pointer_ptr_ty = dyn_cast<PointerType>(pointer_ty);
-                if (!pointer_ptr_ty)
-                {
-                    if (log)
-                        log->Printf("getPointerOperand()->getType() is not a PointerType");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;
-                }
-                Type *target_ty = pointer_ptr_ty->getElementType();
-                
-                lldb::addr_t D = frame.ResolveValue(load_inst, llvm_module);
-                lldb::addr_t P = frame.ResolveValue(pointer_operand, llvm_module);
-                
-                if (D == LLDB_INVALID_ADDRESS)
-                {
-                    if (log)
-                        log->Printf("LoadInst's value doesn't resolve to anything");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                
-                if (P == LLDB_INVALID_ADDRESS)
-                {
-                    if (log)
-                        log->Printf("LoadInst's pointer doesn't resolve to anything");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                
-                lldb::addr_t R;
-                lldb_private::Error read_error;
-                memory_map.ReadPointerFromMemory(&R, P, read_error);
-                
-                if (!read_error.Success())
-                {
-                    if (log)
-                        log->Printf("Couldn't read the address to be loaded for a LoadInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(memory_read_error);
-                    return false;
-                }
-                
-                size_t target_size = target_data.getTypeStoreSize(target_ty);
-                lldb_private::DataBufferHeap buffer(target_size, 0);
-                
-                read_error.Clear();
-                memory_map.ReadMemory(buffer.GetBytes(), R, buffer.GetByteSize(), read_error);
-                if (!read_error.Success())
-                {
-                    if (log)
-                        log->Printf("Couldn't read from a region on behalf of a LoadInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(memory_read_error);
-                    return false;
-                }
-                
-                lldb_private::Error write_error;
-                memory_map.WriteMemory(D, buffer.GetBytes(), buffer.GetByteSize(), write_error);
-                if (!write_error.Success())
-                {
-                    if (log)
-                        log->Printf("Couldn't write to a region on behalf of a LoadInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(memory_read_error);
-                    return false;
-                }
-                
-                if (log)
-                {
-                    log->Printf("Interpreted a LoadInst");
-                    log->Printf("  P : 0x%llx", P);
-                    log->Printf("  R : 0x%llx", R);
-                    log->Printf("  D : 0x%llx", D);
-                }
-            }
-            break;
-        case Instruction::Ret:
-            {
-                frame.RestoreLLDBValues();
-
-                if (result_name.IsEmpty())
-                    return true;
-                
-                GlobalValue *result_value = llvm_module.getNamedValue(result_name.GetCString());
-                
-                if (!frame.ConstructResult(result, result_value, result_name, result_type, llvm_module))
-                {
-                    if (log)
-                        log->Printf("Couldn't construct the expression's result");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_result_error);
-                    return false;
-                }
-                
-                return true;
-            }
-        case Instruction::Store:
-            {
-                const StoreInst *store_inst = dyn_cast<StoreInst>(inst);
-                
-                if (!store_inst)
-                {
-                    if (log)
-                        log->Printf("getOpcode() returns Store, but instruction is not a StoreInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(interpreter_internal_error);
-                    return false;
-                }
-                
-                // The semantics of Store are:
-                //   Resolve the region D containing the data to be stored
-                //   Resolve the region P containing a pointer
-                //   Dereference P to get the region R that the data should be stored in
-                //   Transfer a unit of type type(D) from D to R
-                
-                const Value *value_operand = store_inst->getValueOperand();
-                const Value *pointer_operand = store_inst->getPointerOperand();
-                
-                Type *pointer_ty = pointer_operand->getType();
-                PointerType *pointer_ptr_ty = dyn_cast<PointerType>(pointer_ty);
-                if (!pointer_ptr_ty)
-                    return false;
-                Type *target_ty = pointer_ptr_ty->getElementType();
-                
-                lldb::addr_t D = frame.ResolveValue(value_operand, llvm_module);
-                lldb::addr_t P = frame.ResolveValue(pointer_operand, llvm_module);
-                
-                if (D == LLDB_INVALID_ADDRESS)
-                {
-                    if (log)
-                        log->Printf("StoreInst's value doesn't resolve to anything");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                
-                if (P == LLDB_INVALID_ADDRESS)
-                {
-                    if (log)
-                        log->Printf("StoreInst's pointer doesn't resolve to anything");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(bad_value_error);
-                    return false;
-                }
-                
-                lldb::addr_t R;
-                lldb_private::Error read_error;
-                memory_map.ReadPointerFromMemory(&R, P, read_error);
-                
-                if (!read_error.Success())
-                {
-                    if (log)
-                        log->Printf("Couldn't read the address to be loaded for a LoadInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(memory_read_error);
-                    return false;
-                }
-                
-                size_t target_size = target_data.getTypeStoreSize(target_ty);
-                lldb_private::DataBufferHeap buffer(target_size, 0);
-                
-                read_error.Clear();
-                memory_map.ReadMemory(buffer.GetBytes(), D, buffer.GetByteSize(), read_error);
-                if (!read_error.Success())
-                {
-                    if (log)
-                        log->Printf("Couldn't read from a region on behalf of a StoreInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(memory_read_error);
-                    return false;
-                }
-                
-                lldb_private::Error write_error;
-                memory_map.WriteMemory(R, buffer.GetBytes(), buffer.GetByteSize(), write_error);
-                if (!write_error.Success())
-                {
-                    if (log)
-                        log->Printf("Couldn't write to a region on behalf of a StoreInst");
-                    err.SetErrorToGenericError();
-                    err.SetErrorString(memory_read_error);
-                    return false;
-                }
-                
-                if (log)
-                {
-                    log->Printf("Interpreted a StoreInst");
-                    log->Printf("  D : 0x%llx", D);
-                    log->Printf("  P : 0x%llx", P);
-                    log->Printf("  R : 0x%llx", R);
-                }
-            }
-            break;
-        }
-        
-        ++frame.m_ii;
-    }
-    
-    if (num_insts >= 4096)
-    {
-        err.SetErrorToGenericError();
-        err.SetErrorString(infinite_loop_error);
-        return false;
-    }
-        
-    return false; 
-}
-
-// new api
-
-bool
-IRInterpreter::CanInterpret (llvm::Module &module,
-                             llvm::Function &function,
-                             lldb_private::Error &error)
-{
-    return supportsFunction(function, error);
-}
+    return true;}
 
 bool
 IRInterpreter::Interpret (llvm::Module &module,
@@ -1798,7 +570,7 @@ IRInterpreter::Interpret (llvm::Module &module,
     
     DataLayout data_layout(&module);
     
-    InterpreterStackFrame frame(data_layout, NULL, memory_map);
+    InterpreterStackFrame frame(data_layout, memory_map);
     
     if (frame.m_frame_process_address == LLDB_INVALID_ADDRESS)
     {