diff options
Diffstat (limited to 'source/Expression')
| -rw-r--r-- | source/Expression/DWARFExpression.cpp | 35 | ||||
| -rw-r--r-- | source/Expression/IRExecutionUnit.cpp | 6 | ||||
| -rw-r--r-- | source/Expression/IRInterpreter.cpp | 5 |
3 files changed, 15 insertions, 31 deletions
diff --git a/source/Expression/DWARFExpression.cpp b/source/Expression/DWARFExpression.cpp index 592a30cdd7800..14011aece7c99 100644 --- a/source/Expression/DWARFExpression.cpp +++ b/source/Expression/DWARFExpression.cpp @@ -24,9 +24,6 @@ #include "lldb/Utility/StreamString.h" #include "lldb/Utility/VMRange.h" -#include "Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h" -#include "Plugins/ExpressionParser/Clang/ClangExpressionVariable.h" - #include "lldb/Host/Host.h" #include "lldb/Utility/Endian.h" @@ -1245,23 +1242,21 @@ bool DWARFExpression::DumpLocationForAddress(Stream *s, } bool DWARFExpression::Evaluate(ExecutionContextScope *exe_scope, - ClangExpressionVariableList *expr_locals, - ClangExpressionDeclMap *decl_map, lldb::addr_t loclist_base_load_addr, const Value *initial_value_ptr, const Value *object_address_ptr, Value &result, Status *error_ptr) const { ExecutionContext exe_ctx(exe_scope); - return Evaluate(&exe_ctx, expr_locals, decl_map, nullptr, - loclist_base_load_addr, initial_value_ptr, object_address_ptr, - result, error_ptr); + return Evaluate(&exe_ctx, nullptr, loclist_base_load_addr, initial_value_ptr, + object_address_ptr, result, error_ptr); } -bool DWARFExpression::Evaluate( - ExecutionContext *exe_ctx, ClangExpressionVariableList *expr_locals, - ClangExpressionDeclMap *decl_map, RegisterContext *reg_ctx, - lldb::addr_t loclist_base_load_addr, const Value *initial_value_ptr, - const Value *object_address_ptr, Value &result, Status *error_ptr) const { +bool DWARFExpression::Evaluate(ExecutionContext *exe_ctx, + RegisterContext *reg_ctx, + lldb::addr_t loclist_base_load_addr, + const Value *initial_value_ptr, + const Value *object_address_ptr, Value &result, + Status *error_ptr) const { ModuleSP module_sp = m_module_wp.lock(); if (IsLocationList()) { @@ -1307,9 +1302,9 @@ bool DWARFExpression::Evaluate( if (length > 0 && lo_pc <= pc && pc < hi_pc) { return DWARFExpression::Evaluate( - exe_ctx, expr_locals, decl_map, reg_ctx, module_sp, m_data, - m_dwarf_cu, offset, length, m_reg_kind, initial_value_ptr, - object_address_ptr, result, error_ptr); + exe_ctx, reg_ctx, module_sp, m_data, m_dwarf_cu, offset, length, + m_reg_kind, initial_value_ptr, object_address_ptr, result, + error_ptr); } offset += length; } @@ -1321,14 +1316,12 @@ bool DWARFExpression::Evaluate( // Not a location list, just a single expression. return DWARFExpression::Evaluate( - exe_ctx, expr_locals, decl_map, reg_ctx, module_sp, m_data, m_dwarf_cu, 0, - m_data.GetByteSize(), m_reg_kind, initial_value_ptr, object_address_ptr, - result, error_ptr); + exe_ctx, reg_ctx, module_sp, m_data, m_dwarf_cu, 0, m_data.GetByteSize(), + m_reg_kind, initial_value_ptr, object_address_ptr, result, error_ptr); } bool DWARFExpression::Evaluate( - ExecutionContext *exe_ctx, ClangExpressionVariableList *expr_locals, - ClangExpressionDeclMap *decl_map, RegisterContext *reg_ctx, + ExecutionContext *exe_ctx, RegisterContext *reg_ctx, lldb::ModuleSP module_sp, const DataExtractor &opcodes, DWARFCompileUnit *dwarf_cu, const lldb::offset_t opcodes_offset, const lldb::offset_t opcodes_length, const lldb::RegisterKind reg_kind, diff --git a/source/Expression/IRExecutionUnit.cpp b/source/Expression/IRExecutionUnit.cpp index 363e6fe8678fd..be53f37e0bcc7 100644 --- a/source/Expression/IRExecutionUnit.cpp +++ b/source/Expression/IRExecutionUnit.cpp @@ -260,7 +260,6 @@ void IRExecutionUnit::GetRunnableInfo(Status &error, lldb::addr_t &func_addr, llvm::Triple triple(m_module->getTargetTriple()); llvm::Reloc::Model relocModel; - llvm::CodeModel::Model codeModel; if (triple.isOSBinFormatELF()) { relocModel = llvm::Reloc::Static; @@ -268,9 +267,6 @@ void IRExecutionUnit::GetRunnableInfo(Status &error, lldb::addr_t &func_addr, relocModel = llvm::Reloc::PIC_; } - // This will be small for 32-bit and large for 64-bit. - codeModel = llvm::CodeModel::JITDefault; - m_module_ap->getContext().setInlineAsmDiagnosticHandler(ReportInlineAsmError, &error); @@ -281,7 +277,6 @@ void IRExecutionUnit::GetRunnableInfo(Status &error, lldb::addr_t &func_addr, .setRelocationModel(relocModel) .setMCJITMemoryManager( std::unique_ptr<MemoryManager>(new MemoryManager(*this))) - .setCodeModel(codeModel) .setOptLevel(llvm::CodeGenOpt::Less); llvm::StringRef mArch; @@ -1114,6 +1109,7 @@ bool IRExecutionUnit::CommitOneAllocation(lldb::ProcessSP &process_sp, case lldb::eSectionTypeDWARFDebugAbbrev: case lldb::eSectionTypeDWARFDebugAddr: case lldb::eSectionTypeDWARFDebugAranges: + case lldb::eSectionTypeDWARFDebugCuIndex: case lldb::eSectionTypeDWARFDebugFrame: case lldb::eSectionTypeDWARFDebugInfo: case lldb::eSectionTypeDWARFDebugLine: diff --git a/source/Expression/IRInterpreter.cpp b/source/Expression/IRInterpreter.cpp index 6b5e22329af83..a809bff20039b 100644 --- a/source/Expression/IRInterpreter.cpp +++ b/source/Expression/IRInterpreter.cpp @@ -385,11 +385,6 @@ public: return ret; } - lldb::addr_t MallocPointer() { - return Malloc(m_target_data.getPointerSize(), - m_target_data.getPointerPrefAlignment()); - } - lldb::addr_t Malloc(llvm::Type *type) { lldb_private::Status alloc_error; |