diff options
Diffstat (limited to 'include/lldb/Expression')
| -rw-r--r-- | include/lldb/Expression/DWARFExpression.h | 44 | ||||
| -rw-r--r-- | include/lldb/Expression/ExpressionParser.h | 1 | ||||
| -rw-r--r-- | include/lldb/Expression/IRExecutionUnit.h | 4 |
3 files changed, 12 insertions, 37 deletions
diff --git a/include/lldb/Expression/DWARFExpression.h b/include/lldb/Expression/DWARFExpression.h index 1816c3b7a00f..c85aaa5c1f9a 100644 --- a/include/lldb/Expression/DWARFExpression.h +++ b/include/lldb/Expression/DWARFExpression.h @@ -22,10 +22,6 @@ class DWARFCompileUnit; namespace lldb_private { -class ClangExpressionDeclMap; -class ClangExpressionVariable; -class ClangExpressionVariableList; - //---------------------------------------------------------------------- /// @class DWARFExpression DWARFExpression.h "lldb/Expression/DWARFExpression.h" /// @brief Encapsulates a DWARF location expression and interprets it. @@ -262,8 +258,6 @@ public: /// member variables to populate many operands //------------------------------------------------------------------ bool 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; @@ -272,9 +266,7 @@ public: /// Wrapper for the static evaluate function that uses member /// variables to populate many operands //------------------------------------------------------------------ - bool Evaluate(ExecutionContext *exe_ctx, - ClangExpressionVariableList *expr_locals, - ClangExpressionDeclMap *decl_map, RegisterContext *reg_ctx, + bool 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; @@ -338,32 +330,14 @@ public: /// True on success; false otherwise. If error_ptr is non-NULL, /// details of the failure are provided through it. //------------------------------------------------------------------ - static bool - Evaluate(ExecutionContext *exe_ctx, ClangExpressionVariableList *expr_locals, - ClangExpressionDeclMap *decl_map, RegisterContext *reg_ctx, - lldb::ModuleSP opcode_ctx, const DataExtractor &opcodes, - DWARFCompileUnit *dwarf_cu, const lldb::offset_t offset, - const lldb::offset_t length, const lldb::RegisterKind reg_set, - const Value *initial_value_ptr, const Value *object_address_ptr, - Value &result, Status *error_ptr); - - //------------------------------------------------------------------ - /// Loads a ClangExpressionVariableList into the object - /// - /// @param[in] locals - /// If non-NULL, the list of locals used by this expression. - /// See Evaluate(). - //------------------------------------------------------------------ - void SetExpressionLocalVariableList(ClangExpressionVariableList *locals); - - //------------------------------------------------------------------ - /// Loads a ClangExpressionDeclMap into the object - /// - /// @param[in] locals - /// If non-NULL, the list of external variables used by this - /// expression. See Evaluate(). - //------------------------------------------------------------------ - void SetExpressionDeclMap(ClangExpressionDeclMap *decl_map); + static bool Evaluate(ExecutionContext *exe_ctx, RegisterContext *reg_ctx, + lldb::ModuleSP opcode_ctx, const DataExtractor &opcodes, + DWARFCompileUnit *dwarf_cu, const lldb::offset_t offset, + const lldb::offset_t length, + const lldb::RegisterKind reg_set, + const Value *initial_value_ptr, + const Value *object_address_ptr, Value &result, + Status *error_ptr); bool GetExpressionData(DataExtractor &data) const { data = m_data; diff --git a/include/lldb/Expression/ExpressionParser.h b/include/lldb/Expression/ExpressionParser.h index 19526d28b9b3..a550d576f437 100644 --- a/include/lldb/Expression/ExpressionParser.h +++ b/include/lldb/Expression/ExpressionParser.h @@ -11,6 +11,7 @@ #define liblldb_ExpressionParser_h_ #include "lldb/Utility/Status.h" +#include "lldb/lldb-private-enumerations.h" #include "lldb/lldb-public.h" namespace lldb_private { diff --git a/include/lldb/Expression/IRExecutionUnit.h b/include/lldb/Expression/IRExecutionUnit.h index b0b4d7a5c586..703fcd152af4 100644 --- a/include/lldb/Expression/IRExecutionUnit.h +++ b/include/lldb/Expression/IRExecutionUnit.h @@ -421,8 +421,8 @@ private: lldb::addr_t m_function_load_addr; lldb::addr_t m_function_end_load_addr; - bool m_strip_underscore; ///< True for platforms where global symbols have a _ - ///prefix + bool m_strip_underscore = true; ///< True for platforms where global symbols + /// have a _ prefix bool m_reported_allocations; ///< True after allocations have been reported. ///It is possible that ///< sections will be allocated when this is true, in which case they weren't |