diff options
| author | Greg Clayton <gclayton@apple.com> | 2011-03-24 21:19:54 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2011-03-24 21:19:54 +0000 |
| commit | e0d378b3340c67c774b0e27593347d9c521fe86f (patch) | |
| tree | 0e9feb6c8b3e8bd3179da4bc14a571fa97edd45d | |
| parent | dd9eb21c3fbbd9ffc5dc9a3598c452460b8e3c55 (diff) | |
| download | bcm5719-llvm-e0d378b3340c67c774b0e27593347d9c521fe86f.tar.gz bcm5719-llvm-e0d378b3340c67c774b0e27593347d9c521fe86f.zip | |
Fixed the LLDB build so that we can have private types, private enums and
public types and public enums. This was done to keep the SWIG stuff from
parsing all sorts of enums and types that weren't needed, and allows us to
abstract our API better.
llvm-svn: 128239
157 files changed, 1047 insertions, 1162 deletions
diff --git a/lldb/include/lldb/Core/Address.h b/lldb/include/lldb/Core/Address.h index c26e80e2c0c..5fe08b84e1a 100644 --- a/lldb/include/lldb/Core/Address.h +++ b/lldb/include/lldb/Core/Address.h @@ -246,7 +246,7 @@ public: DumpStyle fallback_style = DumpStyleInvalid, uint32_t addr_byte_size = UINT32_MAX) const; - lldb::AddressClass + AddressClass GetAddressClass () const; //------------------------------------------------------------------ diff --git a/lldb/include/lldb/Core/ArchSpec.h b/lldb/include/lldb/Core/ArchSpec.h index 98413c0eab9..618048217e7 100644 --- a/lldb/include/lldb/Core/ArchSpec.h +++ b/lldb/include/lldb/Core/ArchSpec.h @@ -119,7 +119,7 @@ public: /// Constructs an ArchSpec with properties consistent with the given /// object type and architecture name. //------------------------------------------------------------------ - ArchSpec (lldb::ArchitectureType arch_type, + ArchSpec (ArchitectureType arch_type, uint32_t cpu_type, uint32_t cpu_subtype); @@ -236,7 +236,7 @@ public: /// @return True if the object and CPU type were sucessfully set. //------------------------------------------------------------------ bool - SetArchitecture (lldb::ArchitectureType arch_type, + SetArchitecture (ArchitectureType arch_type, uint32_t cpu, uint32_t sub); diff --git a/lldb/include/lldb/Core/Baton.h b/lldb/include/lldb/Core/Baton.h index 7b9bd87d8d0..627e7203a4a 100644 --- a/lldb/include/lldb/Core/Baton.h +++ b/lldb/include/lldb/Core/Baton.h @@ -14,7 +14,7 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" namespace lldb_private { diff --git a/lldb/include/lldb/Core/Debugger.h b/lldb/include/lldb/Core/Debugger.h index de0a91d0f59..c9833919278 100644 --- a/lldb/include/lldb/Core/Debugger.h +++ b/lldb/include/lldb/Core/Debugger.h @@ -57,7 +57,7 @@ public: const char *value, const ConstString &instance_name, const SettingEntry &entry, - lldb::VarSetOperationType op, + VarSetOperationType op, Error &err, bool pending); diff --git a/lldb/include/lldb/Core/EmulateInstruction.h b/lldb/include/lldb/Core/EmulateInstruction.h index b288198bb4d..6877c2b8d0a 100644 --- a/lldb/include/lldb/Core/EmulateInstruction.h +++ b/lldb/include/lldb/Core/EmulateInstruction.h @@ -10,7 +10,7 @@ #ifndef lldb_EmulateInstruction_h_ #define lldb_EmulateInstruction_h_ -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Core/PluginInterface.h" //---------------------------------------------------------------------- @@ -351,34 +351,6 @@ public: }; - union Opcode - { - uint8_t inst8; - uint16_t inst16; - uint32_t inst32; - uint64_t inst64; - union inst - { - uint8_t bytes[16]; - uint8_t length; - }; - }; - - enum OpcodeType - { - eOpcode8, - eOpcode16, - eOpcode32, - eOpcode64, - eOpcodeBytes - }; - - struct Instruction - { - OpcodeType opcode_type; - Opcode opcode; - }; - typedef size_t (*ReadMemory) (void *baton, const Context &context, lldb::addr_t addr, @@ -465,12 +437,12 @@ public: { if (success_ptr) *success_ptr = true; - switch (m_inst.opcode_type) + switch (m_opcode.type) { - case eOpcode8: return m_inst.opcode.inst8; - case eOpcode16: return m_inst.opcode.inst16; - case eOpcode32: return m_inst.opcode.inst32; - case eOpcode64: return m_inst.opcode.inst64; + case eOpcode8: return m_opcode.data.inst8; + case eOpcode16: return m_opcode.data.inst16; + case eOpcode32: return m_opcode.data.inst32; + case eOpcode64: return m_opcode.data.inst64; case eOpcodeBytes: break; } if (success_ptr) @@ -486,9 +458,8 @@ protected: WriteMemory m_write_mem_callback; ReadRegister m_read_reg_callback; WriteRegister m_write_reg_callback; - - lldb::addr_t m_inst_pc; - Instruction m_inst; + lldb::addr_t m_opcode_pc; + Opcode m_opcode; //------------------------------------------------------------------ // For EmulateInstruction only //------------------------------------------------------------------ diff --git a/lldb/include/lldb/Core/InputReader.h b/lldb/include/lldb/Core/InputReader.h index af9c3723d68..c1658a296cf 100644 --- a/lldb/include/lldb/Core/InputReader.h +++ b/lldb/include/lldb/Core/InputReader.h @@ -10,7 +10,7 @@ #ifndef liblldb_InputReader_h_ #define liblldb_InputReader_h_ -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/lldb-enumerations.h" #include "lldb/Core/Debugger.h" #include "lldb/Host/Predicate.h" diff --git a/lldb/include/lldb/Core/Module.h b/lldb/include/lldb/Core/Module.h index 6d6fbc40102..6874e806c90 100644 --- a/lldb/include/lldb/Core/Module.h +++ b/lldb/include/lldb/Core/Module.h @@ -144,16 +144,16 @@ public: //------------------------------------------------------------------ const Symbol * FindFirstSymbolWithNameAndType (const ConstString &name, - lldb::SymbolType symbol_type = lldb::eSymbolTypeAny); + SymbolType symbol_type = eSymbolTypeAny); size_t FindSymbolsWithNameAndType (const ConstString &name, - lldb::SymbolType symbol_type, + SymbolType symbol_type, SymbolContextList &sc_list); size_t FindSymbolsMatchingRegExAndType (const RegularExpression ®ex, - lldb::SymbolType symbol_type, + SymbolType symbol_type, SymbolContextList &sc_list); //------------------------------------------------------------------ diff --git a/lldb/include/lldb/Core/ModuleList.h b/lldb/include/lldb/Core/ModuleList.h index 5202a25132f..37ca9314ca6 100644 --- a/lldb/include/lldb/Core/ModuleList.h +++ b/lldb/include/lldb/Core/ModuleList.h @@ -272,7 +272,7 @@ public: size_t FindSymbolsWithNameAndType (const ConstString &name, - lldb::SymbolType symbol_type, + SymbolType symbol_type, SymbolContextList &sc_list); //------------------------------------------------------------------ diff --git a/lldb/include/lldb/Core/Section.h b/lldb/include/lldb/Core/Section.h index e15ef890da8..e2c6ce4cede 100644 --- a/lldb/include/lldb/Core/Section.h +++ b/lldb/include/lldb/Core/Section.h @@ -55,7 +55,7 @@ public: FindSectionByID (lldb::user_id_t sect_id) const; lldb::SectionSP - FindSectionByType (lldb::SectionType sect_type, bool check_children, uint32_t start_idx = 0) const; + FindSectionByType (SectionType sect_type, bool check_children, uint32_t start_idx = 0) const; lldb::SectionSP GetSharedPointer (const Section *section, bool check_children) const; @@ -105,7 +105,7 @@ public: Module* module, lldb::user_id_t sect_id, const ConstString &name, - lldb::SectionType sect_type, + SectionType sect_type, lldb::addr_t file_vm_addr, lldb::addr_t vm_size, uint64_t file_offset, @@ -268,7 +268,7 @@ public: lldb::addr_t GetLinkedFileAddress () const; - lldb::SectionType + SectionType GetType () const { return m_type; @@ -278,7 +278,7 @@ protected: Section * m_parent; // Parent section or NULL if no parent. ConstString m_name; // Name of this section - lldb::SectionType m_type; // The type of this section + SectionType m_type; // The type of this section lldb::addr_t m_file_addr; // The absolute file virtual address range of this section if m_parent == NULL, // offset from parent file virtual address if m_parent != NULL lldb::addr_t m_byte_size; // Size in bytes that this section will occupy in memory at runtime diff --git a/lldb/include/lldb/Core/UserSettingsController.h b/lldb/include/lldb/Core/UserSettingsController.h index b2b8adaa1e6..0a675eb6c12 100644 --- a/lldb/include/lldb/Core/UserSettingsController.h +++ b/lldb/include/lldb/Core/UserSettingsController.h @@ -31,9 +31,9 @@ namespace lldb_private { typedef struct { const char *var_name; - lldb::SettableVariableType var_type; + SettableVariableType var_type; const char *default_value; - lldb::OptionEnumValueElement *enum_values; + OptionEnumValueElement *enum_values; bool initialized; bool hidden; const char *description; //help text @@ -69,7 +69,7 @@ public: const char *index_value, const char *value, const SettingEntry &entry, - const lldb::VarSetOperationType op, + const VarSetOperationType op, Error &err); virtual bool @@ -80,14 +80,14 @@ public: // End of pure virtual functions. StringList GetVariable (const char *full_dot_name, - lldb::SettableVariableType &var_type, + SettableVariableType &var_type, const char *debugger_instance_name, Error &err); Error SetVariable (const char *full_dot_name, const char *value, - const lldb::VarSetOperationType op, + const VarSetOperationType op, const bool override, const char *debugger_instance_name, const char *index_value = NULL); @@ -179,41 +179,41 @@ public: BreakNameIntoPieces (const char *full_dot_name); static const char * - GetTypeString (lldb::SettableVariableType var_type); + GetTypeString (SettableVariableType var_type); static const char * - EnumToString (const lldb::OptionEnumValueElement *enum_values, int value); + EnumToString (const OptionEnumValueElement *enum_values, int value); static void - UpdateStringVariable (lldb::VarSetOperationType op, + UpdateStringVariable (VarSetOperationType op, std::string &string_var, const char *new_value, Error &err); static void - UpdateBooleanVariable (lldb::VarSetOperationType op, + UpdateBooleanVariable (VarSetOperationType op, bool &bool_var, const char *new_value, Error &err); static void - UpdateStringArrayVariable (lldb::VarSetOperationType op, + UpdateStringArrayVariable (VarSetOperationType op, const char *index_value, Args &array_var, const char *new_value, Error &err); static void - UpdateDictionaryVariable (lldb::VarSetOperationType op, + UpdateDictionaryVariable (VarSetOperationType op, const char *index_value, std::map<std::string, std::string> &dictionary, const char *new_value, Error &err); static void - UpdateEnumVariable (lldb::OptionEnumValueElement *enum_values, + UpdateEnumVariable (OptionEnumValueElement *enum_values, int *enum_var, const char *new_value, Error &err); @@ -301,7 +301,7 @@ protected: void OverrideAllInstances (const ConstString &var_name, const char *value, - lldb::VarSetOperationType op, + VarSetOperationType op, const char *index_value, Error &err); @@ -313,23 +313,24 @@ protected: // ------------------------------------------------------------------------- static void - PrintEnumValues (const lldb::OptionEnumValueElement *enum_values, Stream &str); + PrintEnumValues (const OptionEnumValueElement *enum_values, + Stream &str); - static int - BooleanMatches (const char *partial_value, - bool &word_complete, - StringList &matches); - - static int - EnumMatches (const char *partial_value, - lldb::OptionEnumValueElement *enum_values, - bool &word_complete, - StringList &matches); + static int + BooleanMatches (const char *partial_value, + bool &word_complete, + StringList &matches); + + static int + EnumMatches (const char *partial_value, + OptionEnumValueElement *enum_values, + bool &word_complete, + StringList &matches); static void - VerifyOperationForType (lldb::SettableVariableType var_type, - lldb::VarSetOperationType op, + VerifyOperationForType (SettableVariableType var_type, + VarSetOperationType op, const ConstString &var_name, Error &err); @@ -373,7 +374,7 @@ public: const char *value, const ConstString &instance_name, const SettingEntry &entry, - lldb::VarSetOperationType op, + VarSetOperationType op, Error &err, bool pending) = 0; diff --git a/lldb/include/lldb/Core/Value.h b/lldb/include/lldb/Core/Value.h index 96c4ee1fde7..2781f85804c 100644 --- a/lldb/include/lldb/Core/Value.h +++ b/lldb/include/lldb/Core/Value.h @@ -45,7 +45,7 @@ public: // ==================== eContextTypeInvalid, // undefined eContextTypeClangType, // void * (an opaque clang::QualType * that can be fed to "static QualType QualType::getFromOpaquePtr(void *)") - eContextTypeRegisterInfo, // lldb::RegisterInfo * + eContextTypeRegisterInfo, // RegisterInfo * eContextTypeLLDBType, // lldb_private::Type * eContextTypeVariable, // lldb_private::Variable * eContextTypeValue // Value * (making this a proxy value. Used when putting locals on the DWARF expression parser stack) @@ -80,7 +80,7 @@ public: ValueType GetValueType() const; - lldb::AddressType + AddressType GetValueAddressType () const; ContextType @@ -95,7 +95,7 @@ public: void SetContext (ContextType context_type, void *p); - lldb::RegisterInfo * + RegisterInfo * GetRegisterInfo(); Type * diff --git a/lldb/include/lldb/Core/ValueObject.h b/lldb/include/lldb/Core/ValueObject.h index 9a1a281a7a6..7f123fa9103 100644 --- a/lldb/include/lldb/Core/ValueObject.h +++ b/lldb/include/lldb/Core/ValueObject.h @@ -355,11 +355,11 @@ protected: lldb::addr_t - GetPointerValue (lldb::AddressType &address_type, + GetPointerValue (AddressType &address_type, bool scalar_is_load_address); lldb::addr_t - GetAddressOf (lldb::AddressType &address_type, + GetAddressOf (AddressType &address_type, bool scalar_is_load_address); private: //------------------------------------------------------------------ diff --git a/lldb/include/lldb/Core/ValueObjectConstResult.h b/lldb/include/lldb/Core/ValueObjectConstResult.h index 3d6b1bfd61f..f21a7975303 100644 --- a/lldb/include/lldb/Core/ValueObjectConstResult.h +++ b/lldb/include/lldb/Core/ValueObjectConstResult.h @@ -43,7 +43,7 @@ public: void *clang_type, const ConstString &name, lldb::addr_t address, - lldb::AddressType address_type, + AddressType address_type, uint8_t addr_byte_size); // When an expression fails to evaluate, we return an error diff --git a/lldb/include/lldb/Core/ValueObjectRegister.h b/lldb/include/lldb/Core/ValueObjectRegister.h index 3f5af187fe5..47b47f6ab4d 100644 --- a/lldb/include/lldb/Core/ValueObjectRegister.h +++ b/lldb/include/lldb/Core/ValueObjectRegister.h @@ -106,7 +106,7 @@ public: protected: lldb::RegisterContextSP m_reg_ctx; - const lldb::RegisterSet *m_reg_set; + const RegisterSet *m_reg_set; uint32_t m_reg_set_idx; private: @@ -151,7 +151,7 @@ public: protected: lldb::RegisterContextSP m_reg_ctx; - const lldb::RegisterInfo *m_reg_info; + const RegisterInfo *m_reg_info; uint32_t m_reg_num; ConstString m_type_name; void *m_clang_type; diff --git a/lldb/include/lldb/Expression/ClangExpressionDeclMap.h b/lldb/include/lldb/Expression/ClangExpressionDeclMap.h index cd5d28721e3..df44853ec7a 100644 --- a/lldb/include/lldb/Expression/ClangExpressionDeclMap.h +++ b/lldb/include/lldb/Expression/ClangExpressionDeclMap.h @@ -20,7 +20,7 @@ // Other libraries and framework includes // Project includes #include "llvm/ADT/DenseMap.h" -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Core/ClangForward.h" #include "lldb/Core/Value.h" #include "lldb/Expression/ClangExpressionVariable.h" @@ -721,7 +721,7 @@ private: //------------------------------------------------------------------ void AddOneRegister (NameSearchContext &context, - const lldb::RegisterInfo *reg_info); + const RegisterInfo *reg_info); //------------------------------------------------------------------ /// Use the NameSearchContext to generate a Decl for the given @@ -878,7 +878,7 @@ private: DoMaterializeOneRegister (bool dematerialize, ExecutionContext &exe_ctx, RegisterContext ®_ctx, - const lldb::RegisterInfo ®_info, + const RegisterInfo ®_info, lldb::addr_t addr, Error &err); diff --git a/lldb/include/lldb/Expression/ClangExpressionParser.h b/lldb/include/lldb/Expression/ClangExpressionParser.h index cb941bf4143..1625b861721 100644 --- a/lldb/include/lldb/Expression/ClangExpressionParser.h +++ b/lldb/include/lldb/Expression/ClangExpressionParser.h @@ -10,7 +10,7 @@ #ifndef liblldb_ClangExpressionParser_h_ #define liblldb_ClangExpressionParser_h_ -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Core/ArchSpec.h" #include "lldb/Core/ClangForward.h" #include "lldb/Core/Error.h" diff --git a/lldb/include/lldb/Expression/ClangExpressionVariable.h b/lldb/include/lldb/Expression/ClangExpressionVariable.h index 862b8bc5c09..be5082fb786 100644 --- a/lldb/include/lldb/Expression/ClangExpressionVariable.h +++ b/lldb/include/lldb/Expression/ClangExpressionVariable.h @@ -21,7 +21,7 @@ // Other libraries and framework includes // Project includes -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Core/ClangForward.h" #include "lldb/Core/ConstString.h" #include "lldb/Symbol/TaggedASTType.h" @@ -174,11 +174,11 @@ public: const ConstString & GetName(); - lldb::RegisterInfo * + RegisterInfo * GetRegisterInfo(); void - SetRegisterInfo (const lldb::RegisterInfo *reg_info); + SetRegisterInfo (const RegisterInfo *reg_info); lldb::clang_type_t GetClangType (); diff --git a/lldb/include/lldb/Expression/ClangFunction.h b/lldb/include/lldb/Expression/ClangFunction.h index 06222311dc4..4a0397d5ecd 100644 --- a/lldb/include/lldb/Expression/ClangFunction.h +++ b/lldb/include/lldb/Expression/ClangFunction.h @@ -265,7 +265,7 @@ public: /// @return /// Returns one of the ExecutionResults enum indicating function call status. //------------------------------------------------------------------ - static lldb::ExecutionResults + static ExecutionResults ExecuteFunction (ExecutionContext &exe_ctx, lldb::addr_t function_address, lldb::addr_t &void_arg, @@ -295,7 +295,7 @@ public: /// @return /// Returns one of the ExecutionResults enum indicating function call status. //------------------------------------------------------------------ - lldb::ExecutionResults + ExecutionResults ExecuteFunction(ExecutionContext &exe_ctx, Stream &errors, Value &results); @@ -321,7 +321,7 @@ public: /// @return /// Returns one of the ExecutionResults enum indicating function call status. //------------------------------------------------------------------ - lldb::ExecutionResults + ExecutionResults ExecuteFunction(ExecutionContext &exe_ctx, Stream &errors, bool stop_others, Value &results); @@ -351,7 +351,7 @@ public: /// @return /// Returns one of the ExecutionResults enum indicating function call status. //------------------------------------------------------------------ - lldb::ExecutionResults + ExecutionResults ExecuteFunction(ExecutionContext &exe_ctx, Stream &errors, uint32_t single_thread_timeout_usec, @@ -391,7 +391,7 @@ public: /// @return /// Returns one of the ExecutionResults enum indicating function call status. //------------------------------------------------------------------ - lldb::ExecutionResults + ExecutionResults ExecuteFunction(ExecutionContext &exe_ctx, lldb::addr_t *args_addr_ptr, Stream &errors, diff --git a/lldb/include/lldb/Expression/ClangUserExpression.h b/lldb/include/lldb/Expression/ClangUserExpression.h index 08a504a1024..12e1d215aaa 100644 --- a/lldb/include/lldb/Expression/ClangUserExpression.h +++ b/lldb/include/lldb/Expression/ClangUserExpression.h @@ -129,7 +129,7 @@ public: /// @return /// A Process::Execution results value. //------------------------------------------------------------------ - lldb::ExecutionResults + ExecutionResults Execute (Stream &error_stream, ExecutionContext &exe_ctx, bool discard_on_error, @@ -261,7 +261,7 @@ public: /// @result /// A Process::ExecutionResults value. eExecutionCompleted for success. //------------------------------------------------------------------ - static lldb::ExecutionResults + static ExecutionResults Evaluate (ExecutionContext &exe_ctx, bool discard_on_error, bool keep_in_memory, diff --git a/lldb/include/lldb/Expression/IRForTarget.h b/lldb/include/lldb/Expression/IRForTarget.h index 4c45c6405f4..70480d78c45 100644 --- a/lldb/include/lldb/Expression/IRForTarget.h +++ b/lldb/include/lldb/Expression/IRForTarget.h @@ -10,7 +10,7 @@ #ifndef liblldb_IRForTarget_h_ #define liblldb_IRForTarget_h_ -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Core/ConstString.h" #include "lldb/Core/Stream.h" #include "lldb/Symbol/TaggedASTType.h" diff --git a/lldb/include/lldb/Expression/IRToDWARF.h b/lldb/include/lldb/Expression/IRToDWARF.h index b7c929bc9db..43dc99d6d47 100644 --- a/lldb/include/lldb/Expression/IRToDWARF.h +++ b/lldb/include/lldb/Expression/IRToDWARF.h @@ -13,7 +13,7 @@ #include "llvm/Pass.h" #include "llvm/PassManager.h" -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" class Relocator; //---------------------------------------------------------------------- diff --git a/lldb/include/lldb/Host/Host.h b/lldb/include/lldb/Host/Host.h index 392902d6a25..aa3861740b8 100644 --- a/lldb/include/lldb/Host/Host.h +++ b/lldb/include/lldb/Host/Host.h @@ -315,7 +315,7 @@ public: /// \b true if \a resource_path was resolved, \a false otherwise. //------------------------------------------------------------------ static bool - GetLLDBPath (lldb::PathType path_type, + GetLLDBPath (PathType path_type, FileSpec &file_spec); //------------------------------------------------------------------ @@ -338,7 +338,7 @@ public: static uint32_t FindProcessesByName (const char *name, - lldb::NameMatchType name_match_type, + NameMatchType name_match_type, ProcessInfoList &proc_infos); static bool diff --git a/lldb/include/lldb/Interpreter/Args.h b/lldb/include/lldb/Interpreter/Args.h index 5e5dafc0a2c..0b9c909ecaf 100644 --- a/lldb/include/lldb/Interpreter/Args.h +++ b/lldb/include/lldb/Interpreter/Args.h @@ -21,9 +21,9 @@ // Other libraries and framework includes // Project includes -#include "lldb/lldb-private.h" -#include "lldb/Core/Error.h" +#include "lldb/lldb-private-types.h" #include "lldb/lldb-types.h" +#include "lldb/Core/Error.h" namespace lldb_private { @@ -349,7 +349,7 @@ public: StringToBoolean (const char *s, bool fail_value, bool *success_ptr); static int32_t - StringToOptionEnum (const char *s, lldb::OptionEnumValueElement *enum_values, int32_t fail_value, bool *success_ptr); + StringToOptionEnum (const char *s, OptionEnumValueElement *enum_values, int32_t fail_value, bool *success_ptr); static lldb::ScriptLanguage StringToScriptLanguage (const char *s, lldb::ScriptLanguage fail_value, bool *success_ptr); diff --git a/lldb/include/lldb/Interpreter/CommandObject.h b/lldb/include/lldb/Interpreter/CommandObject.h index 96498c99566..6974dea7e74 100644 --- a/lldb/include/lldb/Interpreter/CommandObject.h +++ b/lldb/include/lldb/Interpreter/CommandObject.h @@ -41,7 +41,7 @@ public: struct CommandArgumentData // Used to build individual command argument lists { lldb::CommandArgumentType arg_type; - lldb::ArgumentRepetitionType arg_repetition; + ArgumentRepetitionType arg_repetition; }; typedef std::vector<CommandArgumentData> CommandArgumentEntry; // Used to build individual command argument lists @@ -142,7 +142,7 @@ public: GetFormattedCommandArguments (Stream &str); bool - IsPairType (lldb::ArgumentRepetitionType arg_repeat_type); + IsPairType (ArgumentRepetitionType arg_repeat_type); enum { diff --git a/lldb/include/lldb/Interpreter/Options.h b/lldb/include/lldb/Interpreter/Options.h index 2fa13bfd3ab..521c4e3df46 100644 --- a/lldb/include/lldb/Interpreter/Options.h +++ b/lldb/include/lldb/Interpreter/Options.h @@ -164,7 +164,7 @@ public: // The following two pure virtual functions must be defined by every class that inherits from // this class. - virtual const lldb::OptionDefinition* + virtual const OptionDefinition* GetDefinitions () { return NULL; } virtual void diff --git a/lldb/include/lldb/Symbol/ClangASTType.h b/lldb/include/lldb/Symbol/ClangASTType.h index 666a470d858..95c50372c6e 100644 --- a/lldb/include/lldb/Symbol/ClangASTType.h +++ b/lldb/include/lldb/Symbol/ClangASTType.h @@ -10,7 +10,7 @@ #ifndef liblldb_ClangASTType_h_ #define liblldb_ClangASTType_h_ -#include "lldb/lldb-include.h" +#include "lldb/lldb-private.h" #include "lldb/Core/ClangForward.h" namespace lldb_private { @@ -221,7 +221,7 @@ public: bool ReadFromMemory (ExecutionContext *exe_ctx, lldb::addr_t addr, - lldb::AddressType address_type, + AddressType address_type, DataExtractor &data); static bool @@ -229,13 +229,13 @@ public: lldb::clang_type_t opaque_clang_qual_type, ExecutionContext *exe_ctx, lldb::addr_t addr, - lldb::AddressType address_type, + AddressType address_type, DataExtractor &data); bool WriteToMemory (ExecutionContext *exe_ctx, lldb::addr_t addr, - lldb::AddressType address_type, + AddressType address_type, StreamString &new_value); static bool @@ -243,7 +243,7 @@ public: lldb::clang_type_t opaque_clang_qual_type, ExecutionContext *exe_ctx, lldb::addr_t addr, - lldb::AddressType address_type, + AddressType address_type, StreamString &new_value); lldb::clang_type_t diff --git a/lldb/include/lldb/Symbol/ClangNamespaceDecl.h b/lldb/include/lldb/Symbol/ClangNamespaceDecl.h index ebf933af52d..a4ee0f72a11 100644 --- a/lldb/include/lldb/Symbol/ClangNamespaceDecl.h +++ b/lldb/include/lldb/Symbol/ClangNamespaceDecl.h @@ -10,7 +10,7 @@ #ifndef liblldb_ClangNamespaceDecl_h_ #define liblldb_ClangNamespaceDecl_h_ -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Core/ClangForward.h" namespace lldb_private { diff --git a/lldb/include/lldb/Symbol/ObjectFile.h b/lldb/include/lldb/Symbol/ObjectFile.h index 2b011525d0d..4d8a96d48a9 100644 --- a/lldb/include/lldb/Symbol/ObjectFile.h +++ b/lldb/include/lldb/Symbol/ObjectFile.h @@ -156,7 +156,7 @@ public: /// architecture (and object for archives). Returns zero if no /// architecture or object has been selected. //------------------------------------------------------------------ - virtual lldb::AddressClass + virtual AddressClass GetAddressClass (lldb::addr_t file_addr); //------------------------------------------------------------------ diff --git a/lldb/include/lldb/Symbol/Symbol.h b/lldb/include/lldb/Symbol/Symbol.h index d8e187e7847..2fb7273a870 100644 --- a/lldb/include/lldb/Symbol/Symbol.h +++ b/lldb/include/lldb/Symbol/Symbol.h @@ -31,7 +31,7 @@ public: Symbol (lldb::user_id_t symID, const char *name, bool name_is_mangled, - lldb::SymbolType type, + SymbolType type, bool external, bool is_debug, bool is_trampoline, @@ -44,7 +44,7 @@ public: Symbol (lldb::user_id_t symID, const char *name, bool name_is_mangled, - lldb::SymbolType type, + SymbolType type, bool external, bool is_debug, bool is_trampoline, @@ -58,7 +58,7 @@ public: operator= (const Symbol& rhs); bool - Compare (const ConstString& name, lldb::SymbolType type) const; + Compare (const ConstString& name, SymbolType type) const; void Dump (Stream *s, Target *target, uint32_t index) const; @@ -96,11 +96,11 @@ public: lldb::addr_t GetByteSize () const { return m_addr_range.GetByteSize(); } - lldb::SymbolType + SymbolType GetType () const { return m_type; } void - SetType (lldb::SymbolType type) { m_type = type; } + SetType (SymbolType type) { m_type = type; } const char * GetTypeAsString () const; @@ -186,7 +186,7 @@ public: protected: Mangled m_mangled; // uniqued symbol name/mangled name pair - lldb::SymbolType m_type; // symbol type + SymbolType m_type; // symbol type uint16_t m_type_data; // data specific to m_type uint16_t m_type_data_resolved:1, // True if the data in m_type_data has already been calculated m_is_synthetic:1, // non-zero if this symbol is not actually in the symbol table, but synthesized from other info in the object file. diff --git a/lldb/include/lldb/Symbol/Symtab.h b/lldb/include/lldb/Symbol/Symtab.h index 7ff009dd32c..c2a1d743cdd 100644 --- a/lldb/include/lldb/Symbol/Symtab.h +++ b/lldb/include/lldb/Symbol/Symtab.h @@ -42,7 +42,7 @@ public: Symbol * Resize (uint32_t count); uint32_t AddSymbol(const Symbol& symbol); size_t GetNumSymbols() const; - void Dump(Stream *s, Target *target, lldb::SortOrder sort_type); + void Dump(Stream *s, Target *target, SortOrder sort_type); void Dump(Stream *s, Target *target, std::vector<uint32_t>& indexes) const; uint32_t GetIndexForSymbol (const Symbol *symbol) const; Mutex & GetMutex () @@ -52,21 +52,21 @@ public: Symbol * FindSymbolByID (lldb::user_id_t uid) const; Symbol * SymbolAtIndex (uint32_t idx); const Symbol * SymbolAtIndex (uint32_t idx) const; - Symbol * FindSymbolWithType (lldb::SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, uint32_t &start_idx); -// const Symbol * FindSymbolWithType (lldb::SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, uint32_t &start_idx) const; - uint32_t AppendSymbolIndexesWithType (lldb::SymbolType symbol_type, std::vector<uint32_t>& indexes, uint32_t start_idx = 0, uint32_t end_index = UINT32_MAX) const; - uint32_t AppendSymbolIndexesWithTypeAndFlagsValue (lldb::SymbolType symbol_type, uint32_t flags_value, std::vector<uint32_t>& indexes, uint32_t start_idx = 0, uint32_t end_index = UINT32_MAX) const; - uint32_t AppendSymbolIndexesWithType (lldb::SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& matches, uint32_t start_idx = 0, uint32_t end_index = UINT32_MAX) const; + Symbol * FindSymbolWithType (SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, uint32_t &start_idx); +// const Symbol * FindSymbolWithType (SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, uint32_t &start_idx) const; + uint32_t AppendSymbolIndexesWithType (SymbolType symbol_type, std::vector<uint32_t>& indexes, uint32_t start_idx = 0, uint32_t end_index = UINT32_MAX) const; + uint32_t AppendSymbolIndexesWithTypeAndFlagsValue (SymbolType symbol_type, uint32_t flags_value, std::vector<uint32_t>& indexes, uint32_t start_idx = 0, uint32_t end_index = UINT32_MAX) const; + uint32_t AppendSymbolIndexesWithType (SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& matches, uint32_t start_idx = 0, uint32_t end_index = UINT32_MAX) const; uint32_t AppendSymbolIndexesWithName (const ConstString& symbol_name, std::vector<uint32_t>& matches); uint32_t AppendSymbolIndexesWithName (const ConstString& symbol_name, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& matches); - uint32_t AppendSymbolIndexesWithNameAndType (const ConstString& symbol_name, lldb::SymbolType symbol_type, std::vector<uint32_t>& matches); - uint32_t AppendSymbolIndexesWithNameAndType (const ConstString& symbol_name, lldb::SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& matches); - uint32_t AppendSymbolIndexesMatchingRegExAndType (const RegularExpression ®ex, lldb::SymbolType symbol_type, std::vector<uint32_t>& indexes); - uint32_t AppendSymbolIndexesMatchingRegExAndType (const RegularExpression ®ex, lldb::SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& indexes); - size_t FindAllSymbolsWithNameAndType (const ConstString &name, lldb::SymbolType symbol_type, std::vector<uint32_t>& symbol_indexes); - size_t FindAllSymbolsWithNameAndType (const ConstString &name, lldb::SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& symbol_indexes); - size_t FindAllSymbolsMatchingRexExAndType (const RegularExpression ®ex, lldb::SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& symbol_indexes); - Symbol * FindFirstSymbolWithNameAndType (const ConstString &name, lldb::SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility); + uint32_t AppendSymbolIndexesWithNameAndType (const ConstString& symbol_name, SymbolType symbol_type, std::vector<uint32_t>& matches); + uint32_t AppendSymbolIndexesWithNameAndType (const ConstString& symbol_name, SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& matches); + uint32_t AppendSymbolIndexesMatchingRegExAndType (const RegularExpression ®ex, SymbolType symbol_type, std::vector<uint32_t>& indexes); + uint32_t AppendSymbolIndexesMatchingRegExAndType (const RegularExpression ®ex, SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& indexes); + size_t FindAllSymbolsWithNameAndType (const ConstString &name, SymbolType symbol_type, std::vector<uint32_t>& symbol_indexes); + size_t FindAllSymbolsWithNameAndType (const ConstString &name, SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& symbol_indexes); + size_t FindAllSymbolsMatchingRexExAndType (const RegularExpression ®ex, SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility, std::vector<uint32_t>& symbol_indexes); + Symbol * FindFirstSymbolWithNameAndType (const ConstString &name, SymbolType symbol_type, Debug symbol_debug_type, Visibility symbol_visibility); Symbol * FindSymbolWithFileAddress (lldb::addr_t file_addr); // Symbol * FindSymbolContainingAddress (const Address& value, const uint32_t* indexes, uint32_t num_indexes); // Symbol * FindSymbolContainingAddress (const Address& value); diff --git a/lldb/include/lldb/Symbol/Type.h b/lldb/include/lldb/Symbol/Type.h index 90d876e3c50..316b6164408 100644 --- a/lldb/include/lldb/Symbol/Type.h +++ b/lldb/include/lldb/Symbol/Type.h @@ -128,7 +128,7 @@ public: DumpValueInMemory(ExecutionContext *exe_ctx, Stream *s, lldb::addr_t address, - lldb::AddressType address_type, + AddressType address_type, bool show_types, bool show_summary, bool verbose); @@ -136,13 +136,13 @@ public: bool ReadFromMemory (ExecutionContext *exe_ctx, lldb::addr_t address, - lldb::AddressType address_type, + AddressType address_type, DataExtractor &data); bool WriteToMemory (ExecutionContext *exe_ctx, lldb::addr_t address, - lldb::AddressType address_type, + AddressType address_type, DataExtractor &data); bool diff --git a/lldb/include/lldb/Target/LanguageRuntime.h b/lldb/include/lldb/Target/LanguageRuntime.h index 1b260498806..34ba5ace37d 100644 --- a/lldb/include/lldb/Target/LanguageRuntime.h +++ b/lldb/include/lldb/Target/LanguageRuntime.h @@ -14,7 +14,7 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Core/PluginInterface.h" #include "lldb/lldb-private.h" #include "lldb/Core/ValueObject.h" diff --git a/lldb/include/lldb/Target/ObjCLanguageRuntime.h b/lldb/include/lldb/Target/ObjCLanguageRuntime.h index bd4fc99c09f..e2fe9e1d238 100644 --- a/lldb/include/lldb/Target/ObjCLanguageRuntime.h +++ b/lldb/include/lldb/Target/ObjCLanguageRuntime.h @@ -58,10 +58,10 @@ public: virtual ClangUtilityFunction * CreateObjectChecker (const char *) = 0; - virtual lldb::ObjCRuntimeVersions + virtual ObjCRuntimeVersions GetRuntimeVersion () { - return lldb::eObjC_VersionUnknown; + return eObjC_VersionUnknown; } protected: diff --git a/lldb/include/lldb/Target/Platform.h b/lldb/include/lldb/Target/Platform.h index 1795a3dfe0d..36beecd82c2 100644 --- a/lldb/include/lldb/Target/Platform.h +++ b/lldb/include/lldb/Target/Platform.h @@ -17,7 +17,7 @@ // Other libraries and framework includes // Project includes -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Core/ArchSpec.h" #include "lldb/Core/PluginInterface.h" #include "lldb/Host/Mutex.h" @@ -335,7 +335,7 @@ namespace lldb_private { virtual uint32_t FindProcessesByName (const char *name, - lldb::NameMatchType name_match_type, + NameMatchType name_match_type, ProcessInfoList &proc_infos) = 0; virtual bool diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h index b935db29649..978f7affd61 100644 --- a/lldb/include/lldb/Target/Process.h +++ b/lldb/include/lldb/Target/Process.h @@ -59,7 +59,7 @@ public: const char *value, const ConstString &instance_name, const SettingEntry &entry, - lldb::VarSetOperationType op, + VarSetOperationType op, Error &err, bool pending); @@ -1431,7 +1431,7 @@ public: lldb::StateType GetState (); - lldb::ExecutionResults + ExecutionResults RunThreadPlan (ExecutionContext &exe_ctx, lldb::ThreadPlanSP &thread_plan_sp, bool stop_others, @@ -1441,7 +1441,7 @@ public: Stream &errors); static const char * - ExecutionResultAsCString (lldb::ExecutionResults result); + ExecutionResultAsCString (ExecutionResults result); protected: friend class CommandObjectProcessLaunch; diff --git a/lldb/include/lldb/Target/RegisterContext.h b/lldb/include/lldb/Target/RegisterContext.h index f218e99c409..ee2408416e9 100644 --- a/lldb/include/lldb/Target/RegisterContext.h +++ b/lldb/include/lldb/Target/RegisterContext.h @@ -43,13 +43,13 @@ public: virtual size_t GetRegisterCount () = 0; - virtual const lldb::RegisterInfo * + virtual const RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg) = 0; virtual size_t GetRegisterSetCount () = 0; - virtual const lldb::RegisterSet * + virtual const RegisterSet * GetRegisterSet (uint32_t reg_set) = 0; virtual bool @@ -109,7 +109,7 @@ public: return m_thread; } - const lldb::RegisterInfo * + const RegisterInfo * GetRegisterInfoByName (const char *reg_name, uint32_t start_idx = 0); uint64_t diff --git a/lldb/include/lldb/Target/SectionLoadList.h b/lldb/include/lldb/Target/SectionLoadList.h index fef1e1898fc..31970272f0e 100644 --- a/lldb/include/lldb/Target/SectionLoadList.h +++ b/lldb/include/lldb/Target/SectionLoadList.h @@ -17,7 +17,7 @@ // Other libraries and framework includes #include "llvm/ADT/DenseMap.h" // Project includes -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Host/Mutex.h" namespace lldb_private { diff --git a/lldb/include/lldb/Target/StopInfo.h b/lldb/include/lldb/Target/StopInfo.h index 17f2534247c..a47f1af3a70 100644 --- a/lldb/include/lldb/Target/StopInfo.h +++ b/lldb/include/lldb/Target/StopInfo.h @@ -14,7 +14,7 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" namespace lldb_private { diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h index 497308578f7..51be74792a7 100644 --- a/lldb/include/lldb/Target/Target.h +++ b/lldb/include/lldb/Target/Target.h @@ -15,7 +15,7 @@ // Other libraries and framework includes // Project includes -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Breakpoint/BreakpointList.h" #include "lldb/Breakpoint/BreakpointLocationCollection.h" #include "lldb/Core/Broadcaster.h" @@ -55,7 +55,7 @@ public: const char *value, const ConstString &instance_name, const SettingEntry &entry, - lldb::VarSetOperationType op, + VarSetOperationType op, Error &err, bool pending); @@ -65,42 +65,6 @@ public: StringList &value, Error *err); - lldb::ExecutionLevel - GetExecutionLevel () const - { - return m_execution_level; - } - - void - SetExecutionLevel (lldb::ExecutionLevel execution_level) - { - m_execution_level = execution_level; - } - - lldb::ExecutionMode - GetExecutionMode () const - { - return m_execution_mode; - } - - void - SetExecutionMode (lldb::ExecutionMode execution_mode) - { - m_execution_mode = execution_mode; - } - - lldb::ExecutionOSType - GetExecutionOSType () const - { - return m_execution_os_type; - } - - void - SetExecutionOSType (lldb::ExecutionOSType execution_os_type) - { - m_execution_os_type = execution_os_type; - } - protected: void @@ -112,9 +76,6 @@ protected: std::string m_expr_prefix_path; std::string m_expr_prefix_contents; - lldb::ExecutionLevel m_execution_level; - lldb::ExecutionMode m_execution_mode; - lldb::ExecutionOSType m_execution_os_type; }; @@ -492,7 +453,7 @@ public: // we provide a way for expressions to be evaluated from the Target itself. // If an expression is going to be run, then it should have a frame filled // in in th execution context. - lldb::ExecutionResults + ExecutionResults EvaluateExpression (const char *expression, StackFrame *frame, bool unwind_on_error, @@ -662,7 +623,7 @@ public: const char *index_value, const char *value, const SettingEntry &entry, - const lldb::VarSetOperationType op, + const VarSetOperationType op, Error&err); bool diff --git a/lldb/include/lldb/Target/Thread.h b/lldb/include/lldb/Target/Thread.h index 1b97f3038e8..edb426e7299 100644 --- a/lldb/include/lldb/Target/Thread.h +++ b/lldb/include/lldb/Target/Thread.h @@ -42,7 +42,7 @@ public: const char *value, const ConstString &instance_name, const SettingEntry &entry, - lldb::VarSetOperationType op, + VarSetOperationType op, Error &err, bool pending); @@ -270,10 +270,10 @@ public: bool ShouldStop (Event *event_ptr); - lldb::Vote + Vote ShouldReportStop (Event *event_ptr); - lldb::Vote + Vote ShouldReportRun (Event *event_ptr); // Return whether this thread matches the specification in ThreadSpec. This is a virtual @@ -442,7 +442,7 @@ public: //------------------------------------------------------------------ virtual ThreadPlan * QueueThreadPlanForStepRange (bool abort_other_plans, - lldb::StepType type, + StepType type, const AddressRange &range, const SymbolContext &addr_context, lldb::RunMode stop_other_threads, @@ -481,8 +481,8 @@ public: SymbolContext *addr_context, bool first_insn, bool stop_other_threads, - lldb::Vote stop_vote, // = lldb::eVoteYes, - lldb::Vote run_vote, // = lldb::eVoteNoOpinion); + Vote stop_vote, // = eVoteYes, + Vote run_vote, // = eVoteNoOpinion); uint32_t frame_idx); //------------------------------------------------------------------ diff --git a/lldb/include/lldb/Target/ThreadList.h b/lldb/include/lldb/Target/ThreadList.h index b9bba99e154..dcb8a6cb6b5 100644 --- a/lldb/include/lldb/Target/ThreadList.h +++ b/lldb/include/lldb/Target/ThreadList.h @@ -75,10 +75,10 @@ public: bool ShouldStop (Event *event_ptr); - lldb::Vote + Vote ShouldReportStop (Event *event_ptr); - lldb::Vote + Vote ShouldReportRun (Event *event_ptr); void diff --git a/lldb/include/lldb/Target/ThreadPlan.h b/lldb/include/lldb/Target/ThreadPlan.h index c684fa086ba..b6e4ca631ac 100644 --- a/lldb/include/lldb/Target/ThreadPlan.h +++ b/lldb/include/lldb/Target/ThreadPlan.h @@ -210,8 +210,8 @@ public: ThreadPlan (ThreadPlanKind kind, const char *name, Thread &thread, - lldb::Vote stop_vote, - lldb::Vote run_vote); + Vote stop_vote, + Vote run_vote); virtual ~ThreadPlan(); @@ -293,10 +293,10 @@ public: // Whether a "stop class" event should be reported to the "outside world". In general // if a thread plan is active, events should not be reported. - virtual lldb::Vote + virtual Vote ShouldReportStop (Event *event_ptr); - virtual lldb::Vote + virtual Vote ShouldReportRun (Event *event_ptr); virtual void @@ -409,8 +409,8 @@ protected: Thread &m_thread; - lldb::Vote m_stop_vote; - lldb::Vote m_run_vote; + Vote m_stop_vote; + Vote m_run_vote; private: //------------------------------------------------------------------ diff --git a/lldb/include/lldb/Target/ThreadPlanStepInRange.h b/lldb/include/lldb/Target/ThreadPlanStepInRange.h index cc115b6ff4c..2e105543d50 100644 --- a/lldb/include/lldb/Target/ThreadPlanStepInRange.h +++ b/lldb/include/lldb/Target/ThreadPlanStepInRange.h @@ -61,7 +61,7 @@ private: friend ThreadPlan * Thread::QueueThreadPlanForStepRange (bool abort_other_plans, - lldb::StepType type, + StepType type, const AddressRange &range, const SymbolContext &addr_context, lldb::RunMode stop_others, diff --git a/lldb/include/lldb/Target/ThreadPlanStepInstruction.h b/lldb/include/lldb/Target/ThreadPlanStepInstruction.h index da7c777aa2b..80a6263ad7b 100644 --- a/lldb/include/lldb/Target/ThreadPlanStepInstruction.h +++ b/lldb/include/lldb/Target/ThreadPlanStepInstruction.h @@ -38,8 +38,8 @@ protected: ThreadPlanStepInstruction (Thread &thread, bool step_over, bool stop_others, - lldb::Vote stop_vote, - lldb::Vote run_vote); + Vote stop_vote, + Vote run_vote); private: friend ThreadPlan * diff --git a/lldb/include/lldb/Target/ThreadPlanStepOut.h b/lldb/include/lldb/Target/ThreadPlanStepOut.h index e6db9b1e97f..2066cfe6c46 100644 --- a/lldb/include/lldb/Target/ThreadPlanStepOut.h +++ b/lldb/include/lldb/Target/ThreadPlanStepOut.h @@ -39,8 +39,8 @@ public: SymbolContext *addr_context, bool first_insn, bool stop_others, - lldb::Vote stop_vote, - lldb::Vote run_vote, + Vote stop_vote, + Vote run_vote, uint32_t frame_idx); protected: @@ -58,8 +58,8 @@ private: SymbolContext *addr_context, bool first_insn, bool stop_others, - lldb::Vote stop_vote, - lldb::Vote run_vote, + Vote stop_vote, + Vote run_vote, uint32_t frame_idx); // Need an appropriate marker for the current stack so we can tell step out diff --git a/lldb/include/lldb/Target/ThreadPlanStepOverRange.h b/lldb/include/lldb/Target/ThreadPlanStepOverRange.h index 7a069559ebf..79b01cd3966 100644 --- a/lldb/include/lldb/Target/ThreadPlanStepOverRange.h +++ b/lldb/include/lldb/Target/ThreadPlanStepOverRange.h @@ -42,7 +42,7 @@ private: friend ThreadPlan * Thread::QueueThreadPlanForStepRange (bool abort_other_plans, - lldb::StepType type, + StepType type, const AddressRange &range, const SymbolContext &addr_context, lldb::RunMode stop_others, diff --git a/lldb/include/lldb/Target/ThreadPlanStepRange.h b/lldb/include/lldb/Target/ThreadPlanStepRange.h index d2b214aed42..80cfac4a94a 100644 --- a/lldb/include/lldb/Target/ThreadPlanStepRange.h +++ b/lldb/include/lldb/Target/ThreadPlanStepRange.h @@ -31,7 +31,7 @@ public: virtual bool ValidatePlan (Stream *error); virtual bool PlanExplainsStop (); virtual bool ShouldStop (Event *event_ptr) = 0; - virtual lldb::Vote ShouldReportStop (Event *event_ptr); + virtual Vote ShouldReportStop (Event *event_ptr); virtual bool StopOthers (); virtual lldb::StateType GetPlanRunState (); virtual bool WillStop (); diff --git a/lldb/include/lldb/Target/ThreadPlanTestCondition.h b/lldb/include/lldb/Target/ThreadPlanTestCondition.h index 989d39fb43d..a27fc283643 100644 --- a/lldb/include/lldb/Target/ThreadPlanTestCondition.h +++ b/lldb/include/lldb/Target/ThreadPlanTestCondition.h @@ -39,7 +39,7 @@ public: virtual bool ValidatePlan (Stream *error); virtual bool PlanExplainsStop (); virtual bool ShouldStop (Event *event_ptr); - virtual lldb::Vote ShouldReportStop (Event *event_ptr); + virtual Vote ShouldReportStop (Event *event_ptr); virtual bool StopOthers (); virtual lldb::StateType GetPlanRunState (); virtual bool WillStop (); diff --git a/lldb/include/lldb/Utility/CleanUp.h b/lldb/include/lldb/Utility/CleanUp.h index 3bced8feeec..35eda02d85f 100644 --- a/lldb/include/lldb/Utility/CleanUp.h +++ b/lldb/include/lldb/Utility/CleanUp.h @@ -10,7 +10,7 @@ #ifndef liblldb_CleanUp_h_ #define liblldb_CleanUp_h_ -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" namespace lldb_utility { diff --git a/lldb/include/lldb/lldb-defines.h b/lldb/include/lldb/lldb-defines.h index 8584a158948..b1dae28df4c 100644 --- a/lldb/include/lldb/lldb-defines.h +++ b/lldb/include/lldb/lldb-defines.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_defines_h_ -#define LLDB_defines_h_ +#ifndef LLDB_lldb_defines_h_ +#define LLDB_lldb_defines_h_ #include "lldb/lldb-types.h" @@ -107,4 +107,4 @@ #endif // #if defined(__cplusplus) -#endif // LLDB_defines_h_ +#endif // LLDB_lldb_defines_h_ diff --git a/lldb/include/lldb/lldb-enumerations.h b/lldb/include/lldb/lldb-enumerations.h index 08f31c34d8c..a283ae888d0 100644 --- a/lldb/include/lldb/lldb-enumerations.h +++ b/lldb/include/lldb/lldb-enumerations.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_enumerations_h_ -#define LLDB_enumerations_h_ +#ifndef LLDB_lldb_enumerations_h_ +#define LLDB_lldb_enumerations_h_ namespace lldb { @@ -34,19 +34,6 @@ typedef enum StateType } StateType; //---------------------------------------------------------------------- -// Thread Step Types -//---------------------------------------------------------------------- -typedef enum StepType -{ - eStepTypeNone, - eStepTypeTrace, ///< Single step one instruction. - eStepTypeTraceOver, ///< Single step one instruction, stepping over. - eStepTypeInto, ///< Single step into a specified context. - eStepTypeOver, ///< Single step over a specified context. - eStepTypeOut ///< Single step out a specified context. -} StepType; - -//---------------------------------------------------------------------- // Launch Flags //---------------------------------------------------------------------- typedef enum LaunchFlags @@ -67,32 +54,6 @@ typedef enum RunMode { } RunMode; //---------------------------------------------------------------------- -// Address Types -//---------------------------------------------------------------------- -typedef enum AddressType -{ - eAddressTypeInvalid = 0, - eAddressTypeFile, ///< Address is an address as found in an object or symbol file - eAddressTypeLoad, ///< Address is an address as in the current target inferior process - eAddressTypeHost ///< Address is an address in the process that is running this code -} AddressType; - - //---------------------------------------------------------------------- - // Address Types - //---------------------------------------------------------------------- -typedef enum AddressClass -{ - eAddressClassInvalid, - eAddressClassUnknown, - eAddressClassCode, - eAddressClassCodeAlternateISA, - eAddressClassData, - eAddressClassDataConst, - eAddressClassDebug, - eAddressClassRuntime -} AddressClass; - -//---------------------------------------------------------------------- // Byte ordering definitions //---------------------------------------------------------------------- typedef enum ByteOrder @@ -207,50 +168,6 @@ typedef enum StopReason } StopReason; //---------------------------------------------------------------------- -// Votes - Need a tri-state, yes, no, no opinion... -//---------------------------------------------------------------------- -typedef enum Vote -{ - eVoteNo = -1, - eVoteNoOpinion = 0, - eVoteYes = 1 -} Vote; - -//---------------------------------------------------------------------- -// Symbol types -//---------------------------------------------------------------------- -typedef enum SymbolType -{ - eSymbolTypeAny = 0, - eSymbolTypeInvalid = 0, - eSymbolTypeAbsolute, - eSymbolTypeExtern, - eSymbolTypeCode, - eSymbolTypeData, - eSymbolTypeTrampoline, - eSymbolTypeRuntime, - eSymbolTypeException, - eSymbolTypeSourceFile, - eSymbolTypeHeaderFile, - eSymbolTypeObjectFile, - eSymbolTypeCommonBlock, - eSymbolTypeBlock, - eSymbolTypeLocal, - eSymbolTypeParam, - eSymbolTypeVariable, - eSymbolTypeVariableType, - eSymbolTypeLineEntry, - eSymbolTypeLineHeader, - eSymbolTypeScopeBegin, - eSymbolTypeScopeEnd, - eSymbolTypeAdditional, // When symbols take more than one entry, the extra entries get this type - eSymbolTypeCompiler, - eSymbolTypeInstrumentation, - eSymbolTypeUndefined -} SymbolType; - - -//---------------------------------------------------------------------- // Command Return Status Types //---------------------------------------------------------------------- typedef enum ReturnStatus @@ -279,7 +196,6 @@ typedef enum ConnectionStatus eConnectionStatusLostConnection // Lost connection while connected to a valid connection } ConnectionStatus; - typedef enum ErrorType { eErrorTypeInvalid, @@ -343,40 +259,6 @@ typedef enum Permissions ePermissionsExecutable = (1 << 2) } Permissions; -typedef enum SectionType -{ - eSectionTypeInvalid, - eSectionTypeCode, - eSectionTypeContainer, // The section contains child sections - eSectionTypeData, - eSectionTypeDataCString, // Inlined C string data - eSectionTypeDataCStringPointers, // Pointers to C string data - eSectionTypeDataSymbolAddress, // Address of a symbol in the symbol table - eSectionTypeData4, - eSectionTypeData8, - eSectionTypeData16, - eSectionTypeDataPointers, - eSectionTypeDebug, - eSectionTypeZeroFill, - eSectionTypeDataObjCMessageRefs, // Pointer to function pointer + selector - eSectionTypeDataObjCCFStrings, // Objective C const CFString/NSString objects - eSectionTypeDWARFDebugAbbrev, - eSectionTypeDWARFDebugAranges, - eSectionTypeDWARFDebugFrame, - eSectionTypeDWARFDebugInfo, - eSectionTypeDWARFDebugLine, - eSectionTypeDWARFDebugLoc, - eSectionTypeDWARFDebugMacInfo, - eSectionTypeDWARFDebugPubNames, - eSectionTypeDWARFDebugPubTypes, - eSectionTypeDWARFDebugRanges, - eSectionTypeDWARFDebugStr, - eSectionTypeEHFrame, - eSectionTypeOther - -} SectionType; - - typedef enum InputReaderAction { eInputReaderActivate, // reader is newly pushed onto the reader stack @@ -388,32 +270,6 @@ typedef enum InputReaderAction eInputReaderDone // reader was just popped off the stack and is done } InputReaderAction; - -typedef enum ArchitectureType -{ - eArchTypeInvalid, - eArchTypeMachO, - eArchTypeELF, - kNumArchTypes -} ArchitectureType; - -typedef enum FunctionNameType -{ - eFunctionNameTypeNone = 0u, - eFunctionNameTypeAuto = (1u << 1), // Automatically figure out which FunctionNameType - // bits to set based on the function name. - eFunctionNameTypeFull = (1u << 2), // The function name. - // For C this is the same as just the name of the function - // For C++ this is the demangled version of the mangled name. - // For ObjC this is the full function signature with the + or - // - and the square brackets and the class and selector - eFunctionNameTypeBase = (1u << 3), // The function name only, no namespaces or arguments and no class - // methods or selectors will be searched. - eFunctionNameTypeMethod = (1u << 4), // Find function by method name (C++) with no namespace or arguments - eFunctionNameTypeSelector = (1u << 5) // Find function by selector name (ObjC) names -} FunctionNameType; - - typedef enum BreakpointEventType { eBreakpointEventTypeInvalidType = (1u << 0), @@ -466,39 +322,6 @@ typedef enum AccessType eAccessPackage } AccessType; -//---------------------------------------------------------------------- -/// Settable state variable types. -/// -//---------------------------------------------------------------------- - -typedef enum SettableVariableType -{ - eSetVarTypeInt, - eSetVarTypeBoolean, - eSetVarTypeString, - eSetVarTypeArray, - eSetVarTypeDictionary, - eSetVarTypeEnum, - eSetVarTypeNone -} SettableVariableType; - -typedef enum VarSetOperationType -{ - eVarSetOperationReplace, - eVarSetOperationInsertBefore, - eVarSetOperationInsertAfter, - eVarSetOperationRemove, - eVarSetOperationAppend, - eVarSetOperationClear, - eVarSetOperationAssign, - eVarSetOperationInvalid -} VarSetOperationType; - -//---------------------------------------------------------------------- -/// Command argument types. -/// -//---------------------------------------------------------------------- - typedef enum CommandArgumentType { eArgTypeAddress = 0, @@ -564,146 +387,7 @@ typedef enum CommandArgumentType eArgTypeLastArg // Always keep this entry as the last entry in this enumeration!! } CommandArgumentType; -typedef enum ArgumentRepetitionType -{ - eArgRepeatPlain, // Exactly one occurrence - eArgRepeatOptional, // At most one occurrence, but it's optional - eArgRepeatPlus, // One or more occurrences - eArgRepeatStar, // Zero or more occurrences - eArgRepeatRange, // Repetition of same argument, from 1 to n - eArgRepeatPairPlain, // A pair of arguments that must always go together ([arg-type arg-value]), occurs exactly once - eArgRepeatPairOptional, // A pair that occurs at most once (optional) - eArgRepeatPairPlus, // One or more occurrences of a pair - eArgRepeatPairStar, // Zero or more occurrences of a pair - eArgRepeatPairRange, // A pair that repeats from 1 to n - eArgRepeatPairRangeOptional // A pair that repeats from 1 to n, but is optional -} ArgumentRepetitionType; - -typedef enum SortOrder -{ - eSortOrderNone, - eSortOrderByAddress, - eSortOrderByName -} SortOrder; - - -//---------------------------------------------------------------------- -// Used in conjunction with Host::GetLLDBResource () to find files that -// are related to -//---------------------------------------------------------------------- -typedef enum PathType -{ - ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists - ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc) - ePathTypeHeaderDir, // Find LLDB header file directory - ePathTypePythonDir, // Find Python modules (PYTHONPATH) directory - ePathTypeLLDBSystemPlugins, // System plug-ins directory - ePathTypeLLDBUserPlugins // User plug-ins directory -} PathType; - - -//---------------------------------------------------------------------- -// We can execute ThreadPlans on one thread with various fall-back modes -// (try other threads after timeout, etc.) This enum gives the result of -// thread plan executions. -//---------------------------------------------------------------------- -typedef enum ExecutionResults -{ - eExecutionSetupError, - eExecutionCompleted, - eExecutionDiscarded, - eExecutionInterrupted, - eExecutionTimedOut -} ExecutionResults; - -typedef enum ObjCRuntimeVersions { - eObjC_VersionUnknown = 0, - eAppleObjC_V1 = 1, - eAppleObjC_V2 = 2 -} ObjCRuntimeVersions; - - -//---------------------------------------------------------------------- -// LazyBool is for boolean values that need to be calculated lazily. -// Values start off set to eLazyBoolCalculate, and then they can be -// calculated once and set to eLazyBoolNo or eLazyBoolYes. -//---------------------------------------------------------------------- -typedef enum LazyBool { - eLazyBoolCalculate = -1, - eLazyBoolNo = 0, - eLazyBoolYes = 1 -} LazyBool; - -//------------------------------------------------------------------ -/// Execution Level -//------------------------------------------------------------------ -typedef enum ExecutionLevel -{ - eExecutionLevelAuto, // Automatically detect how to run an executable - eExecutionLevelKernel, // Execute a program as a kernel executable - eExecutionLevelUser // Execute a program as a user space executable -} ExecutionLevel; - - -//------------------------------------------------------------------ -/// Execution mode -//------------------------------------------------------------------ -typedef enum ExecutionMode -{ - // Automatically detect the execution mode - eExecutionModeAuto, - - // Execute with no shared libraries, everything is where the executable - // files say they are (file addresses == load addresses) - eExecutionModeStatic, - - // Execute with shared libraries using a dynamic loader plug-in to - // detect when shared libraries are loaded/unloaded. - eExecutionModeDynamic - -} ExecutionMode; - -//------------------------------------------------------------------ -/// Execution OS -//------------------------------------------------------------------ -typedef enum ExecutionOSType -{ - // Automatically detect the execution operating system - eExecutionOSTypeAuto, - - // There is no operating system (no processes or threads). - eExecutionOSTypeNone, - - // There is an OS, but when we execution stops, the entire OS is halted - // (common when debugging in eExecutionLevelKernel modes). Processes and - // threads can be queried, selected and switched between using memory - // reads/writes using a ProcessHelper plug-in (which has yet to be - // designed). - eExecutionOSTypeHalted, - - // There is live OS with debug services that we can talk to for process, - // thread, and other OS queries. - eExecutionOSTypeLive - -} ExecutionOSType; - - -//------------------------------------------------------------------ -/// Name matching -//------------------------------------------------------------------ -typedef enum NameMatchType -{ - eNameMatchIgnore, - eNameMatchEquals, - eNameMatchContains, - eNameMatchStartsWith, - eNameMatchEndsWith, - eNameMatchRegularExpression - -} NameMatchType; - - } // namespace lldb -#endif // LLDB_enumerations_h_ +#endif // LLDB_lldb_enumerations_h_ diff --git a/lldb/include/lldb/lldb-forward-rtti.h b/lldb/include/lldb/lldb-forward-rtti.h index 330adb033e6..81096d0a7f9 100644 --- a/lldb/include/lldb/lldb-forward-rtti.h +++ b/lldb/include/lldb/lldb-forward-rtti.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_forward_rtti_h_ -#define LLDB_forward_rtti_h_ +#ifndef LLDB_lldb_forward_rtti_h_ +#define LLDB_lldb_forward_rtti_h_ #if defined(__cplusplus) @@ -79,4 +79,4 @@ namespace lldb { #endif // #if defined(__cplusplus) -#endif // LLDB_forward_rtti_h_ +#endif // LLDB_lldb_forward_rtti_h_ diff --git a/lldb/include/lldb/lldb-forward.h b/lldb/include/lldb/lldb-forward.h index 3d23afafef7..6221f0271af 100644 --- a/lldb/include/lldb/lldb-forward.h +++ b/lldb/include/lldb/lldb-forward.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_forward_h_ -#define LLDB_forward_h_ +#ifndef LLDB_lldb_forward_h_ +#define LLDB_lldb_forward_h_ #if defined(__cplusplus) @@ -169,4 +169,4 @@ struct LineEntry; } // namespace lldb_private #endif // #if defined(__cplusplus) -#endif // LLDB_forward_h_ +#endif // LLDB_lldb_forward_h_ diff --git a/lldb/include/lldb/lldb-private-enumerations.h b/lldb/include/lldb/lldb-private-enumerations.h new file mode 100644 index 00000000000..c4b4d15254a --- /dev/null +++ b/lldb/include/lldb/lldb-private-enumerations.h @@ -0,0 +1,277 @@ +//===-- lldb-enumerations.h -------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef LLDB_lldb_private_enumerations_h_ +#define LLDB_lldb_private_enumerations_h_ + +namespace lldb_private { + +//---------------------------------------------------------------------- +// Thread Step Types +//---------------------------------------------------------------------- +typedef enum StepType +{ + eStepTypeNone, + eStepTypeTrace, ///< Single step one instruction. + eStepTypeTraceOver, ///< Single step one instruction, stepping over. + eStepTypeInto, ///< Single step into a specified context. + eStepTypeOver, ///< Single step over a specified context. + eStepTypeOut ///< Single step out a specified context. +} StepType; + +//---------------------------------------------------------------------- +// Address Types +//---------------------------------------------------------------------- +typedef enum AddressType +{ + eAddressTypeInvalid = 0, + eAddressTypeFile, ///< Address is an address as found in an object or symbol file + eAddressTypeLoad, ///< Address is an address as in the current target inferior process + eAddressTypeHost ///< Address is an address in the process that is running this code +} AddressType; + +//---------------------------------------------------------------------- +// Address Class +// +// A way of classifying an address used for disassembling and setting +// breakpoints. Many object files can track exactly what parts of their +// object files are code, data and other information. This is of course +// above and beyond just looking at the section types. For example, code +// might contain PC relative data and the object file might be able to +// tell us that an address in code is data. +//---------------------------------------------------------------------- +typedef enum AddressClass +{ + eAddressClassInvalid, + eAddressClassUnknown, + eAddressClassCode, + eAddressClassCodeAlternateISA, + eAddressClassData, + eAddressClassDebug, + eAddressClassRuntime +} AddressClass; + +//---------------------------------------------------------------------- +// Votes - Need a tri-state, yes, no, no opinion... +//---------------------------------------------------------------------- +typedef enum Vote +{ + eVoteNo = -1, + eVoteNoOpinion = 0, + eVoteYes = 1 +} Vote; + +//---------------------------------------------------------------------- +// Symbol types +//---------------------------------------------------------------------- +typedef enum SymbolType +{ + eSymbolTypeAny = 0, + eSymbolTypeInvalid = 0, + eSymbolTypeAbsolute, + eSymbolTypeExtern, + eSymbolTypeCode, + eSymbolTypeData, + eSymbolTypeTrampoline, + eSymbolTypeRuntime, + eSymbolTypeException, + eSymbolTypeSourceFile, + eSymbolTypeHeaderFile, + eSymbolTypeObjectFile, + eSymbolTypeCommonBlock, + eSymbolTypeBlock, + eSymbolTypeLocal, + eSymbolTypeParam, + eSymbolTypeVariable, + eSymbolTypeVariableType, + eSymbolTypeLineEntry, + eSymbolTypeLineHeader, + eSymbolTypeScopeBegin, + eSymbolTypeScopeEnd, + eSymbolTypeAdditional, // When symbols take more than one entry, the extra entries get this type + eSymbolTypeCompiler, + eSymbolTypeInstrumentation, + eSymbolTypeUndefined +} SymbolType; + +typedef enum SectionType +{ + eSectionTypeInvalid, + eSectionTypeCode, + eSectionTypeContainer, // The section contains child sections + eSectionTypeData, + eSectionTypeDataCString, // Inlined C string data + eSectionTypeDataCStringPointers, // Pointers to C string data + eSectionTypeDataSymbolAddress, // Address of a symbol in the symbol table + eSectionTypeData4, + eSectionTypeData8, + eSectionTypeData16, + eSectionTypeDataPointers, + eSectionTypeDebug, + eSectionTypeZeroFill, + eSectionTypeDataObjCMessageRefs, // Pointer to function pointer + selector + eSectionTypeDataObjCCFStrings, // Objective C const CFString/NSString objects + eSectionTypeDWARFDebugAbbrev, + eSectionTypeDWARFDebugAranges, + eSectionTypeDWARFDebugFrame, + eSectionTypeDWARFDebugInfo, + eSectionTypeDWARFDebugLine, + eSectionTypeDWARFDebugLoc, + eSectionTypeDWARFDebugMacInfo, + eSectionTypeDWARFDebugPubNames, + eSectionTypeDWARFDebugPubTypes, + eSectionTypeDWARFDebugRanges, + eSectionTypeDWARFDebugStr, + eSectionTypeEHFrame, + eSectionTypeOther + +} SectionType; + + +typedef enum ArchitectureType +{ + eArchTypeInvalid, + eArchTypeMachO, + eArchTypeELF, + kNumArchTypes +} ArchitectureType; + +typedef enum FunctionNameType +{ + eFunctionNameTypeNone = 0u, + eFunctionNameTypeAuto = (1u << 1), // Automatically figure out which FunctionNameType + // bits to set based on the function name. + eFunctionNameTypeFull = (1u << 2), // The function name. + // For C this is the same as just the name of the function + // For C++ this is the demangled version of the mangled name. + // For ObjC this is the full function signature with the + or + // - and the square brackets and the class and selector + eFunctionNameTypeBase = (1u << 3), // The function name only, no namespaces or arguments and no class + // methods or selectors will be searched. + eFunctionNameTypeMethod = (1u << 4), // Find function by method name (C++) with no namespace or arguments + eFunctionNameTypeSelector = (1u << 5) // Find function by selector name (ObjC) names +} FunctionNameType; + +//---------------------------------------------------------------------- +/// Settable state variable types. +/// +//---------------------------------------------------------------------- + +typedef enum SettableVariableType +{ + eSetVarTypeInt, + eSetVarTypeBoolean, + eSetVarTypeString, + eSetVarTypeArray, + eSetVarTypeDictionary, + eSetVarTypeEnum, + eSetVarTypeNone +} SettableVariableType; + +typedef enum VarSetOperationType +{ + eVarSetOperationReplace, + eVarSetOperationInsertBefore, + eVarSetOperationInsertAfter, + eVarSetOperationRemove, + eVarSetOperationAppend, + eVarSetOperationClear, + eVarSetOperationAssign, + eVarSetOperationInvalid +} VarSetOperationType; + +typedef enum ArgumentRepetitionType +{ + eArgRepeatPlain, // Exactly one occurrence + eArgRepeatOptional, // At most one occurrence, but it's optional + eArgRepeatPlus, // One or more occurrences + eArgRepeatStar, // Zero or more occurrences + eArgRepeatRange, // Repetition of same argument, from 1 to n + eArgRepeatPairPlain, // A pair of arguments that must always go together ([arg-type arg-value]), occurs exactly once + eArgRepeatPairOptional, // A pair that occurs at most once (optional) + eArgRepeatPairPlus, // One or more occurrences of a pair + eArgRepeatPairStar, // Zero or more occurrences of a pair + eArgRepeatPairRange, // A pair that repeats from 1 to n + eArgRepeatPairRangeOptional // A pair that repeats from 1 to n, but is optional +} ArgumentRepetitionType; + +typedef enum SortOrder +{ + eSortOrderNone, + eSortOrderByAddress, + eSortOrderByName +} SortOrder; + + +//---------------------------------------------------------------------- +// Used in conjunction with Host::GetLLDBResource () to find files that +// are related to +//---------------------------------------------------------------------- +typedef enum PathType +{ + ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists + ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc) + ePathTypeHeaderDir, // Find LLDB header file directory + ePathTypePythonDir, // Find Python modules (PYTHONPATH) directory + ePathTypeLLDBSystemPlugins, // System plug-ins directory + ePathTypeLLDBUserPlugins // User plug-ins directory +} PathType; + + +//---------------------------------------------------------------------- +// We can execute ThreadPlans on one thread with various fall-back modes +// (try other threads after timeout, etc.) This enum gives the result of +// thread plan executions. +//---------------------------------------------------------------------- +typedef enum ExecutionResults +{ + eExecutionSetupError, + eExecutionCompleted, + eExecutionDiscarded, + eExecutionInterrupted, + eExecutionTimedOut +} ExecutionResults; + +typedef enum ObjCRuntimeVersions { + eObjC_VersionUnknown = 0, + eAppleObjC_V1 = 1, + eAppleObjC_V2 = 2 +} ObjCRuntimeVersions; + + +//---------------------------------------------------------------------- +// LazyBool is for boolean values that need to be calculated lazily. +// Values start off set to eLazyBoolCalculate, and then they can be +// calculated once and set to eLazyBoolNo or eLazyBoolYes. +//---------------------------------------------------------------------- +typedef enum LazyBool { + eLazyBoolCalculate = -1, + eLazyBoolNo = 0, + eLazyBoolYes = 1 +} LazyBool; + +//------------------------------------------------------------------ +/// Name matching +//------------------------------------------------------------------ +typedef enum NameMatchType +{ + eNameMatchIgnore, + eNameMatchEquals, + eNameMatchContains, + eNameMatchStartsWith, + eNameMatchEndsWith, + eNameMatchRegularExpression + +} NameMatchType; + + +} // namespace lldb + + +#endif // LLDB_lldb_private_enumerations_h_ diff --git a/lldb/include/lldb/lldb-private-interfaces.h b/lldb/include/lldb/lldb-private-interfaces.h index c50fa0b9fdd..21f2af06a39 100644 --- a/lldb/include/lldb/lldb-private-interfaces.h +++ b/lldb/include/lldb/lldb-private-interfaces.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef liblldb_lldb_interfaces_h_ -#define liblldb_lldb_interfaces_h_ +#ifndef liblldb_lldb_private_interfaces_h_ +#define liblldb_lldb_private_interfaces_h_ #if defined(__cplusplus) @@ -34,8 +34,10 @@ namespace lldb_private typedef UnwindAssemblyProfiler* (*UnwindAssemblyProfilerCreateInstance) (const ArchSpec &arch); typedef ArchDefaultUnwindPlan* (*ArchDefaultUnwindPlanCreateInstance) (const ArchSpec &arch); typedef ArchVolatileRegs* (*ArchVolatileRegsCreateInstance) (const ArchSpec &arch); + typedef int (*ComparisonFunction)(const void *, const void *); + } // namespace lldb_private #endif // #if defined(__cplusplus) -#endif // liblldb_lldb_interfaces_h_ +#endif // liblldb_lldb_private_interfaces_h_ diff --git a/lldb/include/lldb/lldb-private-log.h b/lldb/include/lldb/lldb-private-log.h index 8e5b3b1062c..ef45ebf0d48 100644 --- a/lldb/include/lldb/lldb-private-log.h +++ b/lldb/include/lldb/lldb-private-log.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef liblldb_lldb_log_h_ -#define liblldb_lldb_log_h_ +#ifndef liblldb_lldb_private_log_h_ +#define liblldb_lldb_private_log_h_ // C Includes // C++ Includes @@ -82,4 +82,4 @@ ListLogCategories (Stream *strm); } // namespace lldb_private -#endif // liblldb_lldb_log_h_ +#endif // liblldb_lldb_private_log_h_ diff --git a/lldb/include/lldb/lldb-private-types.h b/lldb/include/lldb/lldb-private-types.h new file mode 100644 index 00000000000..ddad6788449 --- /dev/null +++ b/lldb/include/lldb/lldb-private-types.h @@ -0,0 +1,99 @@ +//===-- lldb-private-types.h ------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef liblldb_lldb_private_types_h_ +#define liblldb_lldb_private_types_h_ + +#if defined(__cplusplus) + +#include "lldb/lldb-private.h" + +namespace lldb_private +{ + //---------------------------------------------------------------------- + // Every register is described in detail including its name, alternate + // name (optional), encoding, size in bytes and the default display + // format. + //---------------------------------------------------------------------- + typedef struct + { + const char *name; // Name of this register, can't be NULL + const char *alt_name; // Alternate name of this register, can be NULL + uint32_t byte_size; // Size in bytes of the register + uint32_t byte_offset; // The byte offset in the register context data where this register's value is found + lldb::Encoding encoding; // Encoding of the register bits + lldb::Format format; // Default display format + uint32_t kinds[lldb::kNumRegisterKinds]; // Holds all of the various register numbers for all register kinds + } RegisterInfo; + + //---------------------------------------------------------------------- + // Registers are grouped into register sets + //---------------------------------------------------------------------- + typedef struct + { + const char * name; // Name of this register set + const char * short_name; // A short name for this register set + size_t num_registers; // The number of registers in REGISTERS array below + const uint32_t *registers; // An array of register numbers in this set + } RegisterSet; + + typedef struct + { + int value; + const char * string_value; + const char * usage; + } OptionEnumValueElement; + + typedef struct + { + uint32_t usage_mask; // Used to mark options that can be used together. If (1 << n & usage_mask) != 0 + // then this option belongs to option set n. + bool required; // This option is required (in the current usage level) + const char * long_option; // Full name for this option. + char short_option; // Single character for this option. + int option_has_arg; // no_argument, required_argument or optional_argument + OptionEnumValueElement *enum_values; // If non-NULL an array of enum values. + uint32_t completionType; // Cookie the option class can use to do define the argument completion. + lldb::CommandArgumentType argument_type; // Type of argument this option takes + const char * usage_text; // Full text explaining what this options does and what (if any) argument to + // pass it. + } OptionDefinition; + + + enum OpcodeType + { + eOpcode8, + eOpcode16, + eOpcode32, + eOpcode64, + eOpcodeBytes + }; + + struct Opcode + { + OpcodeType type; + union + { + uint8_t inst8; + uint16_t inst16; + uint32_t inst32; + uint64_t inst64; + struct + { + uint8_t length; + uint8_t bytes[16]; // This must be big enough to handle any opcode for any supported target. + } inst; + } data; + }; + +} // namespace lldb_private + +#endif // #if defined(__cplusplus) + +#endif // liblldb_lldb_private_types_h_ diff --git a/lldb/include/lldb/lldb-private.h b/lldb/include/lldb/lldb-private.h index 1a4dfcbd708..6a3ec9f838e 100644 --- a/lldb/include/lldb/lldb-private.h +++ b/lldb/include/lldb/lldb-private.h @@ -12,9 +12,11 @@ #if defined(__cplusplus) -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" +#include "lldb/lldb-private-enumerations.h" #include "lldb/lldb-private-interfaces.h" #include "lldb/lldb-private-log.h" +#include "lldb/lldb-private-types.h" namespace lldb_private { @@ -65,13 +67,13 @@ const char * GetVersion (); const char * -GetVoteAsCString (lldb::Vote vote); +GetVoteAsCString (Vote vote); const char * -GetSectionTypeAsCString (lldb::SectionType sect_type); +GetSectionTypeAsCString (SectionType sect_type); bool -NameMatches (const char *name, lldb::NameMatchType match_type, const char *match); +NameMatches (const char *name, NameMatchType match_type, const char *match); } // namespace lldb_private diff --git a/lldb/include/lldb/lldb-include.h b/lldb/include/lldb/lldb-public.h index e259c0bc150..1f2466415ee 100644 --- a/lldb/include/lldb/lldb-include.h +++ b/lldb/include/lldb/lldb-public.h @@ -7,10 +7,13 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_include_h_ -#define LLDB_include_h_ +#ifndef LLDB_lldb_h_ +#define LLDB_lldb_h_ #include "lldb/lldb-defines.h" +#include "lldb/lldb-enumerations.h" +#include "lldb/lldb-forward.h" #include "lldb/lldb-forward-rtti.h" +#include "lldb/lldb-types.h" -#endif // LLDB_include_h_ +#endif // LLDB_lldb_h_ diff --git a/lldb/include/lldb/lldb-types.h b/lldb/include/lldb/lldb-types.h index 193d758b808..5851a4bc5bc 100644 --- a/lldb/include/lldb/lldb-types.h +++ b/lldb/include/lldb/lldb-types.h @@ -7,19 +7,13 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_types_h_ -#define LLDB_types_h_ +#ifndef LLDB_lldb_types_h_ +#define LLDB_lldb_types_h_ #include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" #include "lldb/Utility/SharingPtr.h" -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- -// MACOSX START -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- - #include <assert.h> #include <pthread.h> #include <signal.h> @@ -88,79 +82,15 @@ const lldb::thread_t lldb_invalid_host_thread_const = { NULL, 0 } ; #define LLDB_INVALID_HOST_TIME { 0, 0 } -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- -// MACOSX END -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- - -#ifdef SWIG -#define CONST_CHAR_PTR char * -#else -#define CONST_CHAR_PTR const char * -#endif - -namespace lldb { +namespace lldb +{ typedef uint64_t addr_t; typedef uint32_t user_id_t; typedef int32_t pid_t; typedef uint32_t tid_t; typedef int32_t break_id_t; typedef void * clang_type_t; - - //---------------------------------------------------------------------- - // Every register is described in detail including its name, alternate - // name (optional), encoding, size in bytes and the default display - // format. - //---------------------------------------------------------------------- - typedef struct - { - CONST_CHAR_PTR name; // Name of this register, can't be NULL - CONST_CHAR_PTR alt_name; // Alternate name of this register, can be NULL - uint32_t byte_size; // Size in bytes of the register - uint32_t byte_offset; // The byte offset in the register context data where this register's value is found - lldb::Encoding encoding; // Encoding of the register bits - lldb::Format format; // Default display format - uint32_t kinds[kNumRegisterKinds]; // Holds all of the various register numbers for all register kinds - } RegisterInfo; - - //---------------------------------------------------------------------- - // Registers are grouped into register sets - //---------------------------------------------------------------------- - typedef struct - { - CONST_CHAR_PTR name; // Name of this register set - CONST_CHAR_PTR short_name; // A short name for this register set - size_t num_registers; // The number of registers in REGISTERS array below - const uint32_t *registers; // An array of register numbers in this set - } RegisterSet; - - typedef struct - { - int value; - CONST_CHAR_PTR string_value; - CONST_CHAR_PTR usage; - } OptionEnumValueElement; - - typedef struct - { - uint32_t usage_mask; // Used to mark options that can be used together. If (1 << n & usage_mask) != 0 - // then this option belongs to option set n. - bool required; // This option is required (in the current usage level) - CONST_CHAR_PTR long_option; // Full name for this option. - char short_option; // Single character for this option. - int option_has_arg; // no_argument, required_argument or optional_argument - OptionEnumValueElement *enum_values;// If non-NULL an array of enum values. - uint32_t completionType; // Cookie the option class can use to do define the argument completion. - lldb::CommandArgumentType argument_type; // Type of argument this option takes - CONST_CHAR_PTR usage_text; // Full text explaining what this options does and what (if any) argument to - // pass it. - } OptionDefinition; - - - typedef int (*comparison_function)(const void *, const void *); } -#undef CONST_CHAR_PTR -#endif // LLDB_types_h_ +#endif // LLDB_lldb_types_h_ diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj index 5ab9f04012d..89413904d00 100644 --- a/lldb/lldb.xcodeproj/project.pbxproj +++ b/lldb/lldb.xcodeproj/project.pbxproj @@ -370,7 +370,6 @@ 26B1FCBC13381071002886E2 /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C37410F3F61B009D5894 /* libobjc.dylib */; }; 26B1FCBD13381071002886E2 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C74CB6212288704006A8171 /* Carbon.framework */; }; 26B1FCC21338115F002886E2 /* Host.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7EE810F1B88F00F91463 /* Host.mm */; }; - 26B42B1F1187A92B0079C8C8 /* lldb-include.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B42B1E1187A92B0079C8C8 /* lldb-include.h */; settings = {ATTRIBUTES = (Public, ); }; }; 26B42C4D1187ABA50079C8C8 /* LLDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B42C4C1187ABA50079C8C8 /* LLDB.h */; settings = {ATTRIBUTES = (Public, ); }; }; 26C72C94124322890068DC16 /* SBStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C72C93124322890068DC16 /* SBStream.h */; settings = {ATTRIBUTES = (Public, ); }; }; 26C72C961243229A0068DC16 /* SBStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26C72C951243229A0068DC16 /* SBStream.cpp */; }; @@ -608,6 +607,8 @@ 2618EE641315B29C001D6D71 /* ThreadGDBRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadGDBRemote.h; sourceTree = "<group>"; }; 261B5A5211C3F2AD00AABD0A /* SharingPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharingPtr.cpp; path = source/Utility/SharingPtr.cpp; sourceTree = "<group>"; }; 261B5A5311C3F2AD00AABD0A /* SharingPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharingPtr.h; path = include/lldb/Utility/SharingPtr.h; sourceTree = "<group>"; }; + 26217930133BC8640083B112 /* lldb-private-types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "lldb-private-types.h"; path = "include/lldb/lldb-private-types.h"; sourceTree = "<group>"; }; + 26217932133BCB850083B112 /* lldb-private-enumerations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "lldb-private-enumerations.h"; path = "include/lldb/lldb-private-enumerations.h"; sourceTree = "<group>"; }; 263664921140A4930075843B /* Debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Debugger.cpp; path = source/Core/Debugger.cpp; sourceTree = "<group>"; }; 263664941140A4C10075843B /* Debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Debugger.h; path = include/lldb/Core/Debugger.h; sourceTree = "<group>"; }; 26368A3B126B697600E8659F /* darwin-debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "darwin-debug.cpp"; path = "tools/darwin-debug/darwin-debug.cpp"; sourceTree = "<group>"; }; @@ -629,6 +630,7 @@ 2660D9F611922A1300958FBD /* StringExtractor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringExtractor.cpp; path = source/Utility/StringExtractor.cpp; sourceTree = "<group>"; }; 2660D9F711922A1300958FBD /* StringExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringExtractor.h; path = source/Utility/StringExtractor.h; sourceTree = "<group>"; }; 2660D9FE11922A7F00958FBD /* ThreadPlanStepUntil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadPlanStepUntil.cpp; path = source/Target/ThreadPlanStepUntil.cpp; sourceTree = "<group>"; }; + 26651A14133BEC76005B64B7 /* lldb-public.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "lldb-public.h"; path = "include/lldb/lldb-public.h"; sourceTree = "<group>"; }; 26680207115FD0ED008E1FE4 /* LLDB.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LLDB.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 266960591199F4230075C61A /* build-llvm.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "build-llvm.pl"; sourceTree = "<group>"; }; 2669605A1199F4230075C61A /* build-swig-wrapper-classes.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "build-swig-wrapper-classes.sh"; sourceTree = "<group>"; }; @@ -682,7 +684,6 @@ 26A3B4AD1181454800381BC2 /* ObjectContainerBSDArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectContainerBSDArchive.h; sourceTree = "<group>"; }; 26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LLDBWrapPython.cpp; path = source/LLDBWrapPython.cpp; sourceTree = "<group>"; }; 26B167A41123BF5500DC7B4F /* ThreadSafeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadSafeValue.h; path = include/lldb/Core/ThreadSafeValue.h; sourceTree = "<group>"; }; - 26B42B1E1187A92B0079C8C8 /* lldb-include.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "lldb-include.h"; path = "include/lldb/lldb-include.h"; sourceTree = "<group>"; }; 26B42C4C1187ABA50079C8C8 /* LLDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LLDB.h; path = include/lldb/API/LLDB.h; sourceTree = "<group>"; }; 26B4E26E112F35F700AB3F64 /* TimeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TimeValue.h; path = include/lldb/Host/TimeValue.h; sourceTree = "<group>"; }; 26B8B42212EEC52A00A831B2 /* UniqueDWARFASTType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueDWARFASTType.h; sourceTree = "<group>"; }; @@ -1263,8 +1264,10 @@ 26BC7E7410F1B85900F91463 /* lldb.cpp */, 26BC7E7510F1B85900F91463 /* lldb-log.cpp */, 26BC7C2A10F1B3BC00F91463 /* lldb-private.h */, + 26217932133BCB850083B112 /* lldb-private-enumerations.h */, 26BC7C2810F1B3BC00F91463 /* lldb-private-interfaces.h */, 26BC7D5D10F1B77400F91463 /* lldb-private-log.h */, + 26217930133BC8640083B112 /* lldb-private-types.h */, 262D3190111B4341004E6F88 /* API */, 26BC7CEB10F1B70800F91463 /* Breakpoint */, 26BC7D0D10F1B71D00F91463 /* Commands */, @@ -1560,9 +1563,9 @@ children = ( 26BC7C2510F1B3BC00F91463 /* lldb-defines.h */, 26BC7C2610F1B3BC00F91463 /* lldb-enumerations.h */, - 26DE1E6911616C2E00A093E2 /* lldb-forward-rtti.h */, 26DE1E6A11616C2E00A093E2 /* lldb-forward.h */, - 26B42B1E1187A92B0079C8C8 /* lldb-include.h */, + 26DE1E6911616C2E00A093E2 /* lldb-forward-rtti.h */, + 26651A14133BEC76005B64B7 /* lldb-public.h */, 26BC7C2910F1B3BC00F91463 /* lldb-types.h */, 26B42C4C1187ABA50079C8C8 /* LLDB.h */, 9A9830FC1125FC5800A56CB0 /* SBDefines.h */, @@ -2452,7 +2455,6 @@ 2668020F115FD12C008E1FE4 /* lldb-enumerations.h in Headers */, 26DE1E6C11616C2E00A093E2 /* lldb-forward.h in Headers */, 26DE1E6B11616C2E00A093E2 /* lldb-forward-rtti.h in Headers */, - 26B42B1F1187A92B0079C8C8 /* lldb-include.h in Headers */, 26680214115FD12C008E1FE4 /* lldb-types.h in Headers */, 26B42C4D1187ABA50079C8C8 /* LLDB.h in Headers */, 26DE204311618ACA00A093E2 /* SBAddress.h in Headers */, diff --git a/lldb/scripts/Python/build-swig-Python.sh b/lldb/scripts/Python/build-swig-Python.sh index a4304fa0926..f34e5fae00a 100755 --- a/lldb/scripts/Python/build-swig-Python.sh +++ b/lldb/scripts/Python/build-swig-Python.sh @@ -31,7 +31,7 @@ else fi -HEADER_FILES="${SRC_ROOT}/include/lldb/lldb-include.h"\ +HEADER_FILES="${SRC_ROOT}/include/lldb/lldb.h"\ " ${SRC_ROOT}/include/lldb/lldb-defines.h"\ " ${SRC_ROOT}/include/lldb/lldb-enumerations.h"\ " ${SRC_ROOT}/include/lldb/lldb-forward.h"\ diff --git a/lldb/scripts/lldb.swig b/lldb/scripts/lldb.swig index c97d88a5dbd..89fb7e46664 100644 --- a/lldb/scripts/lldb.swig +++ b/lldb/scripts/lldb.swig @@ -116,7 +116,7 @@ /* The liblldb header files to be included. */ %{ -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/API/SBAddress.h" #include "lldb/API/SBBlock.h" #include "lldb/API/SBBreakpoint.h" diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp index 57fff384788..5c86d99c73c 100644 --- a/lldb/source/API/SBDebugger.cpp +++ b/lldb/source/API/SBDebugger.cpp @@ -9,7 +9,7 @@ #include "lldb/API/SBDebugger.h" -#include "lldb/lldb-include.h" +#include "lldb/lldb-private.h" #include "lldb/API/SBListener.h" #include "lldb/API/SBBroadcaster.h" @@ -679,7 +679,10 @@ SBDebugger::SetInternalVariable (const char *var_name, const char *value, const { lldb::UserSettingsControllerSP root_settings_controller = lldb_private::Debugger::GetSettingsController(); - Error err = root_settings_controller->SetVariable (var_name, value, lldb::eVarSetOperationAssign, true, + Error err = root_settings_controller->SetVariable (var_name, + value, + eVarSetOperationAssign, + true, debugger_instance_name); SBError sb_error; sb_error.SetError (err); @@ -691,7 +694,7 @@ lldb::SBStringList SBDebugger::GetInternalVariableValue (const char *var_name, const char *debugger_instance_name) { SBStringList ret_value; - lldb::SettableVariableType var_type; + SettableVariableType var_type; lldb_private::Error err; lldb::UserSettingsControllerSP root_settings_controller = lldb_private::Debugger::GetSettingsController(); diff --git a/lldb/source/API/SBTarget.cpp b/lldb/source/API/SBTarget.cpp index d1a1f275e33..44f8b1dc40d 100644 --- a/lldb/source/API/SBTarget.cpp +++ b/lldb/source/API/SBTarget.cpp @@ -9,7 +9,7 @@ #include "lldb/API/SBTarget.h" -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/API/SBFileSpec.h" #include "lldb/API/SBModule.h" diff --git a/lldb/source/Commands/CommandObjectArgs.cpp b/lldb/source/Commands/CommandObjectArgs.cpp index 6075e10ca58..6810b45300c 100644 --- a/lldb/source/Commands/CommandObjectArgs.cpp +++ b/lldb/source/Commands/CommandObjectArgs.cpp @@ -71,7 +71,7 @@ CommandObjectArgs::CommandOptions::ResetOptionValues () Options::ResetOptionValues(); } -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectArgs::CommandOptions::GetDefinitions () { return g_option_table; @@ -265,7 +265,7 @@ CommandObjectArgs::Execute return result.Succeeded(); } -lldb::OptionDefinition +OptionDefinition CommandObjectArgs::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "debug", 'g', no_argument, NULL, 0, eArgTypeNone, "Enable verbose debug logging of the expression parsing and evaluation."}, diff --git a/lldb/source/Commands/CommandObjectArgs.h b/lldb/source/Commands/CommandObjectArgs.h index 70f73f041d8..544d343df22 100644 --- a/lldb/source/Commands/CommandObjectArgs.h +++ b/lldb/source/Commands/CommandObjectArgs.h @@ -39,12 +39,12 @@ namespace lldb_private { void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; }; CommandObjectArgs (CommandInterpreter &interpreter); diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp index 598e6a3ea8b..c7bbf85c0b0 100644 --- a/lldb/source/Commands/CommandObjectBreakpoint.cpp +++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp @@ -70,7 +70,7 @@ CommandObjectBreakpointSet::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectBreakpointSet::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "shlib", 's', required_argument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName, @@ -127,7 +127,7 @@ CommandObjectBreakpointSet::CommandOptions::g_option_table[] = { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectBreakpointSet::CommandOptions::GetDefinitions () { return g_option_table; @@ -649,7 +649,7 @@ CommandObjectBreakpointList::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectBreakpointList::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "internal", 'i', no_argument, NULL, 0, eArgTypeNone, @@ -669,7 +669,7 @@ CommandObjectBreakpointList::CommandOptions::g_option_table[] = { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectBreakpointList::CommandOptions::GetDefinitions () { return g_option_table; @@ -1060,7 +1060,7 @@ CommandObjectBreakpointClear::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectBreakpointClear::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "file", 'f', required_argument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename, @@ -1072,7 +1072,7 @@ CommandObjectBreakpointClear::CommandOptions::g_option_table[] = { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectBreakpointClear::CommandOptions::GetDefinitions () { return g_option_table; @@ -1376,7 +1376,7 @@ CommandObjectBreakpointModify::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectBreakpointModify::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "ignore-count", 'i', required_argument, NULL, NULL, eArgTypeCount, "Set the number of times this breakpoint is skipped before stopping." }, @@ -1390,7 +1390,7 @@ CommandObjectBreakpointModify::CommandOptions::g_option_table[] = { 0, false, NULL, 0 , 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectBreakpointModify::CommandOptions::GetDefinitions () { return g_option_table; diff --git a/lldb/source/Commands/CommandObjectBreakpoint.h b/lldb/source/Commands/CommandObjectBreakpoint.h index 6f31a5ffc29..fdfd1d90bf6 100644 --- a/lldb/source/Commands/CommandObjectBreakpoint.h +++ b/lldb/source/Commands/CommandObjectBreakpoint.h @@ -87,12 +87,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -153,12 +153,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -254,12 +254,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition * + const OptionDefinition * GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -314,12 +314,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp index f88264b6c1b..3af812c2d91 100644 --- a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp +++ b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp @@ -48,7 +48,7 @@ CommandObjectBreakpointCommandAdd::CommandOptions::~CommandOptions () // FIXME: "script-type" needs to have its contents determined dynamically, so somebody can add a new scripting // language to lldb and have it pickable here without having to change this enumeration by hand and rebuild lldb proper. -static lldb::OptionEnumValueElement +static OptionEnumValueElement g_script_option_enumeration[4] = { { eScriptLanguageNone, "command", "Commands are in the lldb command interpreter language"}, @@ -57,7 +57,7 @@ g_script_option_enumeration[4] = { 0, NULL, NULL } }; -lldb::OptionDefinition +OptionDefinition CommandObjectBreakpointCommandAdd::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "one-liner", 'o', required_argument, NULL, NULL, eArgTypeOneLiner, @@ -72,7 +72,7 @@ CommandObjectBreakpointCommandAdd::CommandOptions::g_option_table[] = { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectBreakpointCommandAdd::CommandOptions::GetDefinitions () { return g_option_table; diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.h b/lldb/source/Commands/CommandObjectBreakpointCommand.h index 51131d2ee04..5e3e1a1abff 100644 --- a/lldb/source/Commands/CommandObjectBreakpointCommand.h +++ b/lldb/source/Commands/CommandObjectBreakpointCommand.h @@ -106,12 +106,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp index 9230aea8ba1..49fc0222bbd 100644 --- a/lldb/source/Commands/CommandObjectCommands.cpp +++ b/lldb/source/Commands/CommandObjectCommands.cpp @@ -75,7 +75,7 @@ private: m_stop_on_continue = true; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -83,7 +83,7 @@ private: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -93,7 +93,7 @@ private: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; CommandOptions m_options; @@ -165,7 +165,7 @@ public: } }; -lldb::OptionDefinition +OptionDefinition CommandObjectCommandsSource::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "stop-on-error", 'e', required_argument, NULL, 0, eArgTypeBoolean, "If true, stop executing commands on error."}, diff --git a/lldb/source/Commands/CommandObjectDisassemble.cpp b/lldb/source/Commands/CommandObjectDisassemble.cpp index ecfd30f648e..26752b86fbd 100644 --- a/lldb/source/Commands/CommandObjectDisassemble.cpp +++ b/lldb/source/Commands/CommandObjectDisassemble.cpp @@ -136,13 +136,13 @@ CommandObjectDisassemble::CommandOptions::ResetOptionValues () raw = false; } -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectDisassemble::CommandOptions::GetDefinitions () { return g_option_table; } -lldb::OptionDefinition +OptionDefinition CommandObjectDisassemble::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "bytes", 'b', no_argument, NULL, 0, eArgTypeNone, "Show opcode bytes when disassembling."}, diff --git a/lldb/source/Commands/CommandObjectDisassemble.h b/lldb/source/Commands/CommandObjectDisassemble.h index a36ae88cb15..4794ee5fd71 100644 --- a/lldb/source/Commands/CommandObjectDisassemble.h +++ b/lldb/source/Commands/CommandObjectDisassemble.h @@ -41,7 +41,7 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); bool show_mixed; // Show mixed source/assembly @@ -53,7 +53,7 @@ public: lldb::addr_t m_start_addr; lldb::addr_t m_end_addr; bool m_at_pc; - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; }; CommandObjectDisassemble (CommandInterpreter &interpreter); diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp index 0daad3a5260..e7b11837c8e 100644 --- a/lldb/source/Commands/CommandObjectExpression.cpp +++ b/lldb/source/Commands/CommandObjectExpression.cpp @@ -105,7 +105,7 @@ CommandObjectExpression::CommandOptions::ResetOptionValues () show_summary = true; } -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectExpression::CommandOptions::GetDefinitions () { return g_option_table; @@ -236,7 +236,7 @@ CommandObjectExpression::EvaluateExpression { lldb::ValueObjectSP result_valobj_sp; - lldb::ExecutionResults exe_results; + ExecutionResults exe_results; bool keep_in_memory = true; @@ -375,7 +375,7 @@ CommandObjectExpression::ExecuteRawCommandString return false; } -lldb::OptionDefinition +OptionDefinition CommandObjectExpression::CommandOptions::g_option_table[] = { //{ LLDB_OPT_SET_ALL, false, "language", 'l', required_argument, NULL, 0, "[c|c++|objc|objc++]", "Sets the language to use when parsing the expression."}, diff --git a/lldb/source/Commands/CommandObjectExpression.h b/lldb/source/Commands/CommandObjectExpression.h index 9cbdf34f570..5ddb0db6ddc 100644 --- a/lldb/source/Commands/CommandObjectExpression.h +++ b/lldb/source/Commands/CommandObjectExpression.h @@ -40,12 +40,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; //Language language; lldb::Encoding encoding; lldb::Format format; diff --git a/lldb/source/Commands/CommandObjectFile.cpp b/lldb/source/Commands/CommandObjectFile.cpp index 2c8d561ce6a..7d17af9f004 100644 --- a/lldb/source/Commands/CommandObjectFile.cpp +++ b/lldb/source/Commands/CommandObjectFile.cpp @@ -35,14 +35,14 @@ CommandObjectFile::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectFile::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "arch", 'a', required_argument, NULL, 0, eArgTypeArchitecture, "Specify the architecture to be used when the process is launched."}, { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition * +const OptionDefinition * CommandObjectFile::CommandOptions::GetDefinitions () { return g_option_table; diff --git a/lldb/source/Commands/CommandObjectFile.h b/lldb/source/Commands/CommandObjectFile.h index 4820b20a12b..bccb4bc2e47 100644 --- a/lldb/source/Commands/CommandObjectFile.h +++ b/lldb/source/Commands/CommandObjectFile.h @@ -55,12 +55,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp index 0bc30f43e40..8efb1649bf3 100644 --- a/lldb/source/Commands/CommandObjectFrame.cpp +++ b/lldb/source/Commands/CommandObjectFrame.cpp @@ -139,7 +139,7 @@ public: relative_frame_offset = INT32_MIN; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -147,7 +147,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; int32_t relative_frame_offset; }; @@ -271,7 +271,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectFrameSelect::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "relative", 'r', required_argument, NULL, 0, eArgTypeOffset, "A relative frame index offset from the current frame index."}, @@ -372,7 +372,7 @@ public: globals.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -380,7 +380,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; bool use_objc:1, use_regex:1, show_args:1, @@ -724,7 +724,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectFrameVariable::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "debug", 'D', no_argument, NULL, 0, eArgTypeNone, "Enable verbose debug information."}, diff --git a/lldb/source/Commands/CommandObjectImage.cpp b/lldb/source/Commands/CommandObjectImage.cpp index 0092b39a816..ed196475a0b 100644 --- a/lldb/source/Commands/CommandObjectImage.cpp +++ b/lldb/source/Commands/CommandObjectImage.cpp @@ -156,7 +156,7 @@ DumpBasename (Stream &strm, const FileSpec *file_spec_ptr, uint32_t width) static void -DumpModuleSymtab (CommandInterpreter &interpreter, Stream &strm, Module *module, lldb::SortOrder sort_order) +DumpModuleSymtab (CommandInterpreter &interpreter, Stream &strm, Module *module, SortOrder sort_order) { if (module) { @@ -741,7 +741,7 @@ public: case 's': { bool found_one = false; - m_sort_order = (lldb::SortOrder) Args::StringToOptionEnum (option_arg, + m_sort_order = (SortOrder) Args::StringToOptionEnum (option_arg, g_option_table[option_idx].enum_values, eSortOrderNone, &found_one); @@ -767,14 +767,14 @@ public: m_sort_order = eSortOrderNone; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; } // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; SortOrder m_sort_order; }; @@ -784,7 +784,7 @@ protected: CommandOptions m_options; }; -static lldb::OptionEnumValueElement +static OptionEnumValueElement g_sort_option_enumeration[4] = { { eSortOrderNone, "none", "No sorting, use the original symbol table order."}, @@ -794,7 +794,7 @@ g_sort_option_enumeration[4] = }; -lldb::OptionDefinition +OptionDefinition CommandObjectImageDumpSymtab::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "sort", 's', required_argument, g_sort_option_enumeration, 0, eArgTypeSortOrder, "Supply a sort order when dumping the symbol table."}, @@ -1171,7 +1171,7 @@ public: m_format_array.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -1179,7 +1179,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. typedef std::vector< std::pair<char, uint32_t> > FormatWidthCollection; @@ -1311,7 +1311,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectImageList::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "arch", 'a', optional_argument, NULL, 0, eArgTypeWidth, "Display the architecture when listing images."}, @@ -1441,7 +1441,7 @@ public: m_verbose = false; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -1449,7 +1449,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; int m_type; // Should be a eLookupTypeXXX enum after parsing options std::string m_str; // Holds name lookup FileSpec m_file; // Files for file lookups @@ -1679,7 +1679,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectImageLookup::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, true, "address", 'a', required_argument, NULL, 0, eArgTypeAddress, "Lookup an address in one or more executable images."}, diff --git a/lldb/source/Commands/CommandObjectLog.cpp b/lldb/source/Commands/CommandObjectLog.cpp index b887f1cc9f4..d49485a2d16 100644 --- a/lldb/source/Commands/CommandObjectLog.cpp +++ b/lldb/source/Commands/CommandObjectLog.cpp @@ -213,7 +213,7 @@ public: log_options = 0; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -221,7 +221,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -235,7 +235,7 @@ protected: LogStreamMap m_log_streams; }; -lldb::OptionDefinition +OptionDefinition CommandObjectLogEnable::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "file", 'f', required_argument, NULL, 0, eArgTypeFilename, "Set the destination file to log to."}, diff --git a/lldb/source/Commands/CommandObjectMemory.cpp b/lldb/source/Commands/CommandObjectMemory.cpp index 8c8b6bfebbf..4225f860b61 100644 --- a/lldb/source/Commands/CommandObjectMemory.cpp +++ b/lldb/source/Commands/CommandObjectMemory.cpp @@ -174,7 +174,7 @@ public: m_output_as_binary = false; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -182,7 +182,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. lldb::Format m_format; @@ -409,7 +409,7 @@ protected: #define SET1 LLDB_OPT_SET_1 #define SET2 LLDB_OPT_SET_2 -lldb::OptionDefinition +OptionDefinition CommandObjectMemoryRead::CommandOptions::g_option_table[] = { { SET1 , false, "format", 'f', required_argument, NULL, 0, eArgTypeFormat, "The format that will be used to display the memory. Defaults to bytes with ASCII (--format=Y)."}, @@ -500,7 +500,7 @@ public: m_infile_offset = 0; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -508,7 +508,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. lldb::Format m_format; @@ -864,7 +864,7 @@ protected: #define SET1 LLDB_OPT_SET_1 #define SET2 LLDB_OPT_SET_2 -lldb::OptionDefinition +OptionDefinition CommandObjectMemoryWrite::CommandOptions::g_option_table[] = { { SET1 , false, "format", 'f', required_argument, NULL, 0, eArgTypeFormat, "The format value types that will be decoded and written to memory."}, diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp index 0294d678822..0e321d035b9 100644 --- a/lldb/source/Commands/CommandObjectPlatform.cpp +++ b/lldb/source/Commands/CommandObjectPlatform.cpp @@ -132,7 +132,7 @@ protected: os_version_update = UINT32_MAX; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -140,7 +140,7 @@ protected: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -151,7 +151,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectPlatformCreate::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "sdk-version", 'v', required_argument, NULL, 0, eArgTypeNone, "Specify the initial SDK version to use prior to connecting." }, diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp index ece8fe10aaf..7eb7c4a16ff 100644 --- a/lldb/source/Commands/CommandObjectProcess.cpp +++ b/lldb/source/Commands/CommandObjectProcess.cpp @@ -94,7 +94,7 @@ public: no_stdio = false; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -102,7 +102,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -404,7 +404,7 @@ protected: #define SET2 LLDB_OPT_SET_2 #define SET3 LLDB_OPT_SET_3 -lldb::OptionDefinition +OptionDefinition CommandObjectProcessLaunch::CommandOptions::g_option_table[] = { { SET1 | SET2 | SET3, false, "stop-at-entry", 's', no_argument, NULL, 0, eArgTypeNone, "Stop at the entry point of the program when launching a process."}, @@ -489,7 +489,7 @@ public: waitfor = false; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -512,7 +512,7 @@ public: // We are only completing the name option for now... - const lldb::OptionDefinition *opt_defs = GetDefinitions(); + const OptionDefinition *opt_defs = GetDefinitions(); if (opt_defs[opt_defs_index].short_option == 'n') { // Are we in the name? @@ -527,7 +527,7 @@ public: if (platform_sp) { ProcessInfoList process_infos; - platform_sp->FindProcessesByName (partial_name, partial_name ? lldb::eNameMatchStartsWith : lldb::eNameMatchIgnore, process_infos); + platform_sp->FindProcessesByName (partial_name, partial_name ? eNameMatchStartsWith : eNameMatchIgnore, process_infos); const uint32_t num_matches = process_infos.GetSize(); if (num_matches > 0) { @@ -545,7 +545,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -817,7 +817,7 @@ protected: }; -lldb::OptionDefinition +OptionDefinition CommandObjectProcessAttach::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "plugin", 'P', required_argument, NULL, 0, eArgTypePlugin, "Name of the process plugin you want to use."}, @@ -1015,7 +1015,7 @@ public: plugin_name.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -1023,7 +1023,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -1133,7 +1133,7 @@ protected: }; -lldb::OptionDefinition +OptionDefinition CommandObjectProcessConnect::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "plugin", 'p', required_argument, NULL, 0, eArgTypePlugin, "Name of the process plugin you want to use."}, @@ -1607,7 +1607,7 @@ public: pass.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -1615,7 +1615,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -1848,7 +1848,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectProcessHandle::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "stop", 's', required_argument, NULL, 0, eArgTypeBoolean, "Whether or not the process should be stopped if the signal is received." }, diff --git a/lldb/source/Commands/CommandObjectSettings.cpp b/lldb/source/Commands/CommandObjectSettings.cpp index 0924b9cb231..348885d4dfc 100644 --- a/lldb/source/Commands/CommandObjectSettings.cpp +++ b/lldb/source/Commands/CommandObjectSettings.cpp @@ -163,7 +163,7 @@ CommandObjectSettingsSet::Execute (Args& command, CommandReturnObject &result) { Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, - lldb::eVarSetOperationAssign, + eVarSetOperationAssign, m_options.m_override, m_interpreter.GetDebugger().GetInstanceName().AsCString()); if (err.Fail ()) @@ -209,7 +209,7 @@ CommandObjectSettingsSet::HandleArgumentCompletion (Args &input, && completion_str.compare (matches.GetStringAtIndex(0)) == 0)) { matches.Clear(); - lldb::UserSettingsControllerSP root_settings = Debugger::GetSettingsController(); + UserSettingsControllerSP root_settings = Debugger::GetSettingsController(); if (cursor_index == 1) { // The user is at the end of the variable name, which is complete and valid. @@ -248,7 +248,7 @@ CommandObjectSettingsSet::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectSettingsSet::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "no-override", 'n', no_argument, NULL, NULL, eArgTypeNone, "Prevents already existing instances and pending settings from being assigned this new value. Using this option means that only the default or specified instance setting values will be updated." }, @@ -256,7 +256,7 @@ CommandObjectSettingsSet::CommandOptions::g_option_table[] = { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectSettingsSet::CommandOptions::GetDefinitions () { return g_option_table; @@ -341,7 +341,7 @@ CommandObjectSettingsShow::Execute (Args& command, if (command.GetArgumentCount()) { // The user requested to see the value of a particular variable. - lldb::SettableVariableType var_type; + SettableVariableType var_type; const char *variable_name = command.GetArgumentAtIndex (0); StringList value = root_settings->GetVariable (variable_name, var_type, m_interpreter.GetDebugger().GetInstanceName().AsCString(), @@ -365,16 +365,16 @@ CommandObjectSettingsShow::Execute (Args& command, if (value.GetSize() == 0) result.AppendMessageWithFormat ("%s%s = ''\n", variable_name, type_name); - else if ((var_type != lldb::eSetVarTypeArray) && (var_type != lldb::eSetVarTypeDictionary)) + else if ((var_type != eSetVarTypeArray) && (var_type != eSetVarTypeDictionary)) result.AppendMessageWithFormat ("%s%s = '%s'\n", variable_name, type_name, value.GetStringAtIndex (0)); else { result.AppendMessageWithFormat ("%s%s:\n", variable_name, type_name); for (unsigned i = 0, e = value.GetSize(); i != e; ++i) { - if (var_type == lldb::eSetVarTypeArray) + if (var_type == eSetVarTypeArray) result.AppendMessageWithFormat (" [%d]: '%s'\n", i, value.GetStringAtIndex (i)); - else if (var_type == lldb::eSetVarTypeDictionary) + else if (var_type == eSetVarTypeDictionary) result.AppendMessageWithFormat (" '%s'\n", value.GetStringAtIndex (i)); } } @@ -615,7 +615,7 @@ CommandObjectSettingsRemove::Execute ( Args& command, Error err = root_settings->SetVariable (var_name_string.c_str(), NULL, - lldb::eVarSetOperationRemove, + eVarSetOperationRemove, true, m_interpreter.GetDebugger().GetInstanceName().AsCString(), index_value_string.c_str()); @@ -765,7 +765,7 @@ CommandObjectSettingsReplace::Execute ( Args& command, { Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, - lldb::eVarSetOperationReplace, + eVarSetOperationReplace, true, m_interpreter.GetDebugger().GetInstanceName().AsCString(), index_value_string.c_str()); @@ -911,7 +911,7 @@ CommandObjectSettingsInsertBefore::Execute ( Args& { Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, - lldb::eVarSetOperationInsertBefore, + eVarSetOperationInsertBefore, true, m_interpreter.GetDebugger().GetInstanceName().AsCString(), index_value_string.c_str()); @@ -1058,7 +1058,7 @@ CommandObjectSettingsInsertAfter::Execute ( Args& co { Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, - lldb::eVarSetOperationInsertAfter, + eVarSetOperationInsertAfter, true, m_interpreter.GetDebugger().GetInstanceName().AsCString(), index_value_string.c_str()); @@ -1183,7 +1183,7 @@ CommandObjectSettingsAppend::Execute (Args& command, { Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, - lldb::eVarSetOperationAppend, + eVarSetOperationAppend, true, m_interpreter.GetDebugger().GetInstanceName().AsCString()); if (err.Fail ()) @@ -1279,7 +1279,7 @@ CommandObjectSettingsClear::Execute ( Args& command, Error err = root_settings->SetVariable (var_name, NULL, - lldb::eVarSetOperationClear, + eVarSetOperationClear, false, m_interpreter.GetDebugger().GetInstanceName().AsCString()); diff --git a/lldb/source/Commands/CommandObjectSettings.h b/lldb/source/Commands/CommandObjectSettings.h index 9f369642b51..7d78c08f65d 100644 --- a/lldb/source/Commands/CommandObjectSettings.h +++ b/lldb/source/Commands/CommandObjectSettings.h @@ -70,12 +70,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectSource.cpp b/lldb/source/Commands/CommandObjectSource.cpp index bc9fc371f59..2c7fb33a763 100644 --- a/lldb/source/Commands/CommandObjectSource.cpp +++ b/lldb/source/Commands/CommandObjectSource.cpp @@ -81,12 +81,12 @@ class CommandObjectSourceInfo : public CommandObject start_line = 0; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; } - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. FileSpec file_spec; @@ -131,7 +131,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectSourceInfo::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "line", 'l', required_argument, NULL, 0, eArgTypeLineNum, "The line number at which to start the display source."}, @@ -210,12 +210,12 @@ class CommandObjectSourceList : public CommandObject m_modules.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; } - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. FileSpec file_spec; @@ -568,7 +568,7 @@ protected: }; -lldb::OptionDefinition +OptionDefinition CommandObjectSourceList::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "count", 'c', required_argument, NULL, 0, eArgTypeCount, "The number of source lines to display."}, diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp index f6c7a1cfa57..1780f2b4a5c 100644 --- a/lldb/source/Commands/CommandObjectTarget.cpp +++ b/lldb/source/Commands/CommandObjectTarget.cpp @@ -501,7 +501,7 @@ public: ~CommandOptions () {} - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -606,7 +606,7 @@ public: } - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; std::string m_class_name; std::string m_function_name; @@ -824,7 +824,7 @@ private: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectTargetStopHookAdd::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "shlib", 's', required_argument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName, diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index 487cfc96b56..977f63fee35 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -305,7 +305,7 @@ public: m_start = 0; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -313,7 +313,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. uint32_t m_count; @@ -466,7 +466,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectThreadBacktrace::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "count", 'c', required_argument, NULL, 0, eArgTypeCount, "How many frames to display (-1 for all)"}, @@ -551,7 +551,7 @@ public: m_avoid_regexp.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -559,7 +559,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. bool m_avoid_no_debug; @@ -775,7 +775,7 @@ protected: CommandOptions m_options; }; -static lldb::OptionEnumValueElement +static OptionEnumValueElement g_tri_running_mode[] = { { eOnlyThisThread, "this-thread", "Run only this thread"}, @@ -784,7 +784,7 @@ g_tri_running_mode[] = { 0, NULL, NULL } }; -static lldb::OptionEnumValueElement +static OptionEnumValueElement g_duo_running_mode[] = { { eOnlyThisThread, "this-thread", "Run only this thread"}, @@ -792,7 +792,7 @@ g_duo_running_mode[] = { 0, NULL, NULL } }; -lldb::OptionDefinition +OptionDefinition CommandObjectThreadStepWithTypeAndScope::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "avoid-no-debug", 'a', required_argument, NULL, 0, eArgTypeBoolean, "A boolean value that sets whether step-in will step over functions with no debug information."}, @@ -1050,7 +1050,7 @@ public: m_stop_others = false; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -1061,7 +1061,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. }; @@ -1259,7 +1259,7 @@ protected: }; -lldb::OptionDefinition +OptionDefinition CommandObjectThreadUntil::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "frame", 'f', required_argument, NULL, 0, eArgTypeFrameIndex, "Frame index for until operation - defaults to 0"}, diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp index 12de3aaaeb0..004798e7bd3 100644 --- a/lldb/source/Core/Address.cpp +++ b/lldb/source/Core/Address.cpp @@ -377,7 +377,7 @@ Address::Dump (Stream *s, ExecutionContextScope *exe_scope, DumpStyle style, Dum case DumpStyleResolvedDescriptionNoModule: if (IsSectionOffset()) { - lldb::AddressType addr_type = eAddressTypeLoad; + AddressType addr_type = eAddressTypeLoad; addr_t addr = GetLoadAddress (target); if (addr == LLDB_INVALID_ADDRESS) { @@ -809,7 +809,7 @@ Address::ResolveLinkedAddress () } } -lldb::AddressClass +AddressClass Address::GetAddressClass () const { Module *module = GetModule(); diff --git a/lldb/source/Core/ArchSpec.cpp b/lldb/source/Core/ArchSpec.cpp index b44aa21842c..17134938d09 100644 --- a/lldb/source/Core/ArchSpec.cpp +++ b/lldb/source/Core/ArchSpec.cpp @@ -285,7 +285,7 @@ ArchSpec::ArchSpec(const llvm::Triple &triple) : SetTriple(triple); } -ArchSpec::ArchSpec (lldb::ArchitectureType arch_type, uint32_t cpu, uint32_t subtype) : +ArchSpec::ArchSpec (ArchitectureType arch_type, uint32_t cpu, uint32_t subtype) : m_triple (), m_core (kCore_invalid), m_byte_order (eByteOrderInvalid) @@ -463,7 +463,7 @@ ArchSpec::SetTriple (const char *triple_cstr) } bool -ArchSpec::SetArchitecture (lldb::ArchitectureType arch_type, uint32_t cpu, uint32_t sub) +ArchSpec::SetArchitecture (ArchitectureType arch_type, uint32_t cpu, uint32_t sub) { m_core = kCore_invalid; bool update_triple = true; diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp index 89ceab95006..ca0dde920bd 100644 --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -762,7 +762,7 @@ Debugger::FormatPrompt RegisterKind reg_kind = kNumRegisterKinds; uint32_t reg_num = LLDB_INVALID_REGNUM; FileSpec format_file_spec; - const lldb::RegisterInfo *reg_info = NULL; + const RegisterInfo *reg_info = NULL; RegisterContext *reg_ctx = NULL; // Each variable must set success to true below... @@ -1440,7 +1440,7 @@ DebuggerInstanceSettings::UpdateInstanceSettingsVariable (const ConstString &var const char *value, const ConstString &instance_name, const SettingEntry &entry, - lldb::VarSetOperationType op, + VarSetOperationType op, Error &err, bool pending) { diff --git a/lldb/source/Core/EmulateInstruction.cpp b/lldb/source/Core/EmulateInstruction.cpp index d596cdd2291..05ded393560 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_inst_pc (LLDB_INVALID_ADDRESS) + m_opcode_pc (LLDB_INVALID_ADDRESS) { - ::memset (&m_inst, 0, sizeof (m_inst)); + ::memset (&m_opcode, 0, sizeof (m_opcode)); } uint64_t diff --git a/lldb/source/Core/Section.cpp b/lldb/source/Core/Section.cpp index d2682f5bded..0765c546384 100644 --- a/lldb/source/Core/Section.cpp +++ b/lldb/source/Core/Section.cpp @@ -567,7 +567,7 @@ SectionList::FindSectionByID (user_id_t sect_id) const SectionSP -SectionList::FindSectionByType (lldb::SectionType sect_type, bool check_children, uint32_t start_idx) const +SectionList::FindSectionByType (SectionType sect_type, bool check_children, uint32_t start_idx) const { SectionSP sect_sp; uint32_t num_sections = m_sections.size(); diff --git a/lldb/source/Core/Value.cpp b/lldb/source/Core/Value.cpp index 98aac432231..2d8ac9147ce 100644 --- a/lldb/source/Core/Value.cpp +++ b/lldb/source/Core/Value.cpp @@ -208,7 +208,7 @@ Value::GetValueType() const return m_value_type; } -lldb::AddressType +AddressType Value::GetValueAddressType () const { if (m_context_type == eContextTypeValue) @@ -515,7 +515,7 @@ Value::GetValueAsData (ExecutionContext *exe_ctx, clang::ASTContext *ast_context Error error; lldb::addr_t address = LLDB_INVALID_ADDRESS; - lldb::AddressType address_type = eAddressTypeFile; + AddressType address_type = eAddressTypeFile; switch (m_value_type) { default: @@ -663,7 +663,7 @@ Value::GetValueAsData (ExecutionContext *exe_ctx, clang::ASTContext *ast_context } else { - error.SetErrorStringWithFormat ("unsupported lldb::AddressType value (%i)", address_type); + error.SetErrorStringWithFormat ("unsupported AddressType value (%i)", address_type); } } else @@ -714,7 +714,7 @@ Value::ResolveValue(ExecutionContext *exe_ctx, clang::ASTContext *ast_context) case eValueTypeLoadAddress: // load address value case eValueTypeHostAddress: // host address value (for memory in the process that is using liblldb) { - lldb::AddressType address_type = m_value_type == eValueTypeLoadAddress ? eAddressTypeLoad : eAddressTypeHost; + AddressType address_type = m_value_type == eValueTypeLoadAddress ? eAddressTypeLoad : eAddressTypeHost; lldb::addr_t addr = m_value.ULongLong(LLDB_INVALID_ADDRESS); DataExtractor data; if (ClangASTType::ReadFromMemory (ast_context, opaque_clang_qual_type, exe_ctx, addr, address_type, data)) diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp index 9346db4280c..948ace752d1 100644 --- a/lldb/source/Core/ValueObject.cpp +++ b/lldb/source/Core/ValueObject.cpp @@ -439,7 +439,7 @@ ValueObject::GetSummaryAsCString (ExecutionContextScope *exe_scope) if (process != NULL) { lldb::addr_t cstr_address = LLDB_INVALID_ADDRESS; - lldb::AddressType cstr_address_type = eAddressTypeInvalid; + AddressType cstr_address_type = eAddressTypeInvalid; size_t cstr_len = 0; if (type_flags.Test (ClangASTContext::eTypeIsArray)) @@ -521,7 +521,7 @@ ValueObject::GetSummaryAsCString (ExecutionContextScope *exe_scope) } else if (ClangASTContext::IsFunctionPointerType (clang_type)) { - lldb::AddressType func_ptr_address_type = eAddressTypeInvalid; + AddressType func_ptr_address_type = eAddressTypeInvalid; lldb::addr_t func_ptr_address = GetPointerValue (func_ptr_address_type, true); if (func_ptr_address != 0 && func_ptr_address != LLDB_INVALID_ADDRESS) @@ -684,7 +684,7 @@ ValueObject::GetValueAsCString (ExecutionContextScope *exe_scope) } addr_t -ValueObject::GetAddressOf (lldb::AddressType &address_type, bool scalar_is_load_address) +ValueObject::GetAddressOf (AddressType &address_type, bool scalar_is_load_address) { switch (m_value.GetValueType()) { @@ -710,7 +710,7 @@ ValueObject::GetAddressOf (lldb::AddressType &address_type, bool scalar_is_load_ } addr_t -ValueObject::GetPointerValue (lldb::AddressType &address_type, bool scalar_is_load_address) +ValueObject::GetPointerValue (AddressType &address_type, bool scalar_is_load_address) { lldb::addr_t address = LLDB_INVALID_ADDRESS; address_type = eAddressTypeInvalid; @@ -1145,7 +1145,7 @@ ValueObject::DumpValueObject { // We have a pointer or reference whose value is an address. // Make sure that address is not NULL - lldb::AddressType ptr_address_type; + AddressType ptr_address_type; if (valobj->GetPointerValue (ptr_address_type, true) == 0) print_children = false; @@ -1339,7 +1339,7 @@ ValueObject::Dereference (Error &error) ValueObject::AddressOf (Error &error) { lldb::ValueObjectSP valobj_sp; - lldb::AddressType address_type = eAddressTypeInvalid; + AddressType address_type = eAddressTypeInvalid; const bool scalar_is_load_address = false; lldb::addr_t addr = GetAddressOf (address_type, scalar_is_load_address); error.Clear(); diff --git a/lldb/source/Core/ValueObjectConstResult.cpp b/lldb/source/Core/ValueObjectConstResult.cpp index 253c374c90c..55273a9a7be 100644 --- a/lldb/source/Core/ValueObjectConstResult.cpp +++ b/lldb/source/Core/ValueObjectConstResult.cpp @@ -97,7 +97,7 @@ ValueObjectConstResult::ValueObjectConstResult void *clang_type, const ConstString &name, lldb::addr_t address, - lldb::AddressType address_type, + AddressType address_type, uint8_t addr_byte_size ) : ValueObject (NULL), diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp index aa45992fe48..d528d380ae0 100644 --- a/lldb/source/Expression/ClangExpressionDeclMap.cpp +++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp @@ -470,7 +470,7 @@ ClangExpressionDeclMap::GetSymbolAddress SymbolContextList sc_list; - m_parser_vars->m_exe_ctx->target->GetImages().FindSymbolsWithNameAndType(name, lldb::eSymbolTypeAny, sc_list); + m_parser_vars->m_exe_ctx->target->GetImages().FindSymbolsWithNameAndType(name, eSymbolTypeAny, sc_list); if (!sc_list.GetSize()) return false; @@ -598,7 +598,7 @@ ClangExpressionDeclMap::GetObjectPointer return false; } - lldb::RegisterInfo *register_info = location_value->GetRegisterInfo(); + RegisterInfo *register_info = location_value->GetRegisterInfo(); if (!register_info) { @@ -990,7 +990,7 @@ ClangExpressionDeclMap::DoMaterializeOnePersistentVariable var_sp->GetTypeFromUser().GetOpaqueQualType(), var_sp->GetName(), mem, - lldb::eAddressTypeLoad, + eAddressTypeLoad, pvar_byte_size)); } @@ -1000,7 +1000,7 @@ ClangExpressionDeclMap::DoMaterializeOnePersistentVariable return false; } - if (var_sp->m_live_sp->GetValue().GetValueAddressType() != lldb::eAddressTypeLoad) + if (var_sp->m_live_sp->GetValue().GetValueAddressType() != eAddressTypeLoad) { err.SetErrorStringWithFormat("The address of the memory area for %s is in an incorrect format", var_sp->GetName().GetCString()); return false; @@ -1084,7 +1084,7 @@ ClangExpressionDeclMap::DoMaterializeOnePersistentVariable var_sp->GetTypeFromUser().GetOpaqueQualType(), var_sp->GetName(), mem, - lldb::eAddressTypeLoad, + eAddressTypeLoad, pvar_byte_size)); // Clear the flag if the variable will never be deallocated. @@ -1221,7 +1221,7 @@ ClangExpressionDeclMap::DoMaterializeOneVariable lldb::addr_t mem; // The address of a spare memory area aused to hold the variable. - lldb::RegisterInfo *register_info = location_value->GetRegisterInfo(); + RegisterInfo *register_info = location_value->GetRegisterInfo(); if (!register_info) { @@ -1250,7 +1250,7 @@ ClangExpressionDeclMap::DoMaterializeOneVariable return false; } - if (expr_var->m_live_sp->GetValue().GetValueAddressType() != lldb::eAddressTypeLoad) + if (expr_var->m_live_sp->GetValue().GetValueAddressType() != eAddressTypeLoad) { err.SetErrorStringWithFormat("The address of the memory area for %s is in an incorrect format", name.GetCString()); return false; @@ -1348,7 +1348,7 @@ ClangExpressionDeclMap::DoMaterializeOneVariable type.GetOpaqueQualType(), name, mem, - lldb::eAddressTypeLoad, + eAddressTypeLoad, value_byte_size)); // Now write the location of the area into the struct. @@ -1432,7 +1432,7 @@ ClangExpressionDeclMap::DoMaterializeOneRegister bool dematerialize, ExecutionContext &exe_ctx, RegisterContext ®_ctx, - const lldb::RegisterInfo ®_info, + const RegisterInfo ®_info, lldb::addr_t addr, Error &err ) @@ -1762,7 +1762,7 @@ ClangExpressionDeclMap::GetDecls (NameSearchContext &context, const ConstString if (m_parser_vars->m_exe_ctx->GetRegisterContext()) { - const lldb::RegisterInfo *reg_info(m_parser_vars->m_exe_ctx->GetRegisterContext()->GetRegisterInfoByName(reg_name)); + const RegisterInfo *reg_info(m_parser_vars->m_exe_ctx->GetRegisterContext()->GetRegisterInfoByName(reg_name)); if (reg_info) AddOneRegister(context, reg_info); diff --git a/lldb/source/Expression/ClangExpressionParser.cpp b/lldb/source/Expression/ClangExpressionParser.cpp index e228cc5e080..e9e49e3aff3 100644 --- a/lldb/source/Expression/ClangExpressionParser.cpp +++ b/lldb/source/Expression/ClangExpressionParser.cpp @@ -214,7 +214,7 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope, { if (process->GetObjCLanguageRuntime()) { - if (process->GetObjCLanguageRuntime()->GetRuntimeVersion() == lldb::eAppleObjC_V2) + if (process->GetObjCLanguageRuntime()->GetRuntimeVersion() == eAppleObjC_V2) { m_compiler->getLangOpts().ObjCNonFragileABI = true; // NOT i386 m_compiler->getLangOpts().ObjCNonFragileABI2 = true; // NOT i386 diff --git a/lldb/source/Expression/ClangExpressionVariable.cpp b/lldb/source/Expression/ClangExpressionVariable.cpp index bf1a3dad648..c5bc5c48ef6 100644 --- a/lldb/source/Expression/ClangExpressionVariable.cpp +++ b/lldb/source/Expression/ClangExpressionVariable.cpp @@ -62,16 +62,16 @@ ClangExpressionVariable::GetValueObject() return m_frozen_sp; } -lldb::RegisterInfo * +RegisterInfo * ClangExpressionVariable::GetRegisterInfo() { return m_frozen_sp->GetValue().GetRegisterInfo(); } void -ClangExpressionVariable::SetRegisterInfo (const lldb::RegisterInfo *reg_info) +ClangExpressionVariable::SetRegisterInfo (const RegisterInfo *reg_info) { - return m_frozen_sp->GetValue().SetContext (Value::eContextTypeRegisterInfo, const_cast<lldb::RegisterInfo *>(reg_info)); + return m_frozen_sp->GetValue().SetContext (Value::eContextTypeRegisterInfo, const_cast<RegisterInfo *>(reg_info)); } lldb::clang_type_t diff --git a/lldb/source/Expression/ClangFunction.cpp b/lldb/source/Expression/ClangFunction.cpp index c3a365763dd..9d7f7540fdc 100644 --- a/lldb/source/Expression/ClangFunction.cpp +++ b/lldb/source/Expression/ClangFunction.cpp @@ -286,7 +286,7 @@ ClangFunction::WriteFunctionArguments (ExecutionContext &exe_ctx, Error error; using namespace clang; - lldb::ExecutionResults return_value = lldb::eExecutionSetupError; + ExecutionResults return_value = eExecutionSetupError; Process *process = exe_ctx.process; @@ -461,13 +461,13 @@ ClangFunction::DeallocateFunctionResults (ExecutionContext &exe_ctx, lldb::addr_ exe_ctx.process->DeallocateMemory(args_addr); } -lldb::ExecutionResults +ExecutionResults ClangFunction::ExecuteFunction(ExecutionContext &exe_ctx, Stream &errors, Value &results) { return ExecuteFunction (exe_ctx, errors, 1000, true, results); } -lldb::ExecutionResults +ExecutionResults ClangFunction::ExecuteFunction(ExecutionContext &exe_ctx, Stream &errors, bool stop_others, Value &results) { const bool try_all_threads = false; @@ -475,7 +475,7 @@ ClangFunction::ExecuteFunction(ExecutionContext &exe_ctx, Stream &errors, bool s return ExecuteFunction (exe_ctx, NULL, errors, stop_others, NULL, try_all_threads, discard_on_error, results); } -lldb::ExecutionResults +ExecutionResults ClangFunction::ExecuteFunction( ExecutionContext &exe_ctx, Stream &errors, @@ -490,7 +490,7 @@ ClangFunction::ExecuteFunction( } // This is the static function -lldb::ExecutionResults +ExecutionResults ClangFunction::ExecuteFunction ( ExecutionContext &exe_ctx, lldb::addr_t function_address, @@ -506,7 +506,7 @@ ClangFunction::ExecuteFunction ( errors, stop_others, discard_on_error, this_arg)); if (call_plan_sp == NULL) - return lldb::eExecutionSetupError; + return eExecutionSetupError; call_plan_sp->SetPrivate(true); @@ -514,7 +514,7 @@ ClangFunction::ExecuteFunction ( single_thread_timeout_usec, errors); } -lldb::ExecutionResults +ExecutionResults ClangFunction::ExecuteFunction( ExecutionContext &exe_ctx, lldb::addr_t *args_addr_ptr, @@ -526,7 +526,7 @@ ClangFunction::ExecuteFunction( Value &results) { using namespace clang; - lldb::ExecutionResults return_value = lldb::eExecutionSetupError; + ExecutionResults return_value = eExecutionSetupError; lldb::addr_t args_addr; @@ -536,12 +536,12 @@ ClangFunction::ExecuteFunction( args_addr = LLDB_INVALID_ADDRESS; if (CompileFunction(errors) != 0) - return lldb::eExecutionSetupError; + return eExecutionSetupError; if (args_addr == LLDB_INVALID_ADDRESS) { if (!InsertFunction(exe_ctx, args_addr, errors)) - return lldb::eExecutionSetupError; + return eExecutionSetupError; } return_value = ClangFunction::ExecuteFunction (exe_ctx, @@ -556,7 +556,7 @@ ClangFunction::ExecuteFunction( if (args_addr_ptr != NULL) *args_addr_ptr = args_addr; - if (return_value != lldb::eExecutionCompleted) + if (return_value != eExecutionCompleted) return return_value; FetchFunctionResults(exe_ctx, args_addr, results); @@ -564,7 +564,7 @@ ClangFunction::ExecuteFunction( if (args_addr_ptr == NULL) DeallocateFunctionResults(exe_ctx, args_addr); - return lldb::eExecutionCompleted; + return eExecutionCompleted; } clang::ASTConsumer * diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp index 715677e5b19..dda810ef7b5 100644 --- a/lldb/source/Expression/ClangUserExpression.cpp +++ b/lldb/source/Expression/ClangUserExpression.cpp @@ -453,7 +453,7 @@ ClangUserExpression::FinalizeJITExecution (Stream &error_stream, return true; } -lldb::ExecutionResults +ExecutionResults ClangUserExpression::Execute (Stream &error_stream, ExecutionContext &exe_ctx, bool discard_on_error, @@ -471,7 +471,7 @@ ClangUserExpression::Execute (Stream &error_stream, error_stream.Printf("We don't currently support executing DWARF expressions"); - return lldb::eExecutionSetupError; + return eExecutionSetupError; } else if (m_jit_start_addr != LLDB_INVALID_ADDRESS) { @@ -481,7 +481,7 @@ ClangUserExpression::Execute (Stream &error_stream, lldb::addr_t cmd_ptr = NULL; if (!PrepareToExecuteJITExpression (error_stream, exe_ctx, struct_address, object_ptr, cmd_ptr)) - return lldb::eExecutionSetupError; + return eExecutionSetupError; const bool stop_others = true; const bool try_all_threads = true; @@ -497,7 +497,7 @@ ClangUserExpression::Execute (Stream &error_stream, shared_ptr_to_me)); if (call_plan_sp == NULL || !call_plan_sp->ValidatePlan (NULL)) - return lldb::eExecutionSetupError; + return eExecutionSetupError; call_plan_sp->SetPrivate(true); @@ -506,7 +506,7 @@ ClangUserExpression::Execute (Stream &error_stream, if (log) log->Printf("-- [ClangUserExpression::Execute] Execution of expression begins --"); - lldb::ExecutionResults execution_result = exe_ctx.process->RunThreadPlan (exe_ctx, + ExecutionResults execution_result = exe_ctx.process->RunThreadPlan (exe_ctx, call_plan_sp, stop_others, try_all_threads, @@ -517,7 +517,7 @@ ClangUserExpression::Execute (Stream &error_stream, if (log) log->Printf("-- [ClangUserExpression::Execute] Execution of expression completed --"); - if (execution_result == lldb::eExecutionInterrupted) + if (execution_result == eExecutionInterrupted) { if (discard_on_error) error_stream.Printf ("Expression execution was interrupted. The process has been returned to the state before execution."); @@ -526,21 +526,21 @@ ClangUserExpression::Execute (Stream &error_stream, return execution_result; } - else if (execution_result != lldb::eExecutionCompleted) + else if (execution_result != eExecutionCompleted) { error_stream.Printf ("Couldn't execute function; result was %s\n", Process::ExecutionResultAsCString (execution_result)); return execution_result; } if (FinalizeJITExecution (error_stream, exe_ctx, result)) - return lldb::eExecutionCompleted; + return eExecutionCompleted; else - return lldb::eExecutionSetupError; + return eExecutionSetupError; } else { error_stream.Printf("Expression can't be run; neither DWARF nor a JIT compiled function is present"); - return lldb::eExecutionSetupError; + return eExecutionSetupError; } } @@ -553,7 +553,7 @@ ClangUserExpression::DwarfOpcodeStream () return *m_dwarf_opcodes.get(); } -lldb::ExecutionResults +ExecutionResults ClangUserExpression::Evaluate (ExecutionContext &exe_ctx, bool discard_on_error, bool keep_in_memory, @@ -564,14 +564,14 @@ ClangUserExpression::Evaluate (ExecutionContext &exe_ctx, lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); Error error; - lldb::ExecutionResults execution_results = lldb::eExecutionSetupError; + ExecutionResults execution_results = eExecutionSetupError; if (exe_ctx.process == NULL) { error.SetErrorString ("Must have a process to evaluate expressions."); result_valobj_sp.reset (new ValueObjectConstResult (error)); - return lldb::eExecutionSetupError; + return eExecutionSetupError; } if (!exe_ctx.process->GetDynamicCheckers()) @@ -591,7 +591,7 @@ ClangUserExpression::Evaluate (ExecutionContext &exe_ctx, error.SetErrorString (install_errors.GetString().c_str()); result_valobj_sp.reset (new ValueObjectConstResult (error)); - return lldb::eExecutionSetupError; + return eExecutionSetupError; } exe_ctx.process->SetDynamicCheckers(dynamic_checkers); @@ -641,7 +641,7 @@ ClangUserExpression::Evaluate (ExecutionContext &exe_ctx, user_expression_sp, expr_result); - if (execution_results != lldb::eExecutionCompleted) + if (execution_results != eExecutionCompleted) { if (log) log->Printf("== [ClangUserExpression::Evaluate] Execution completed abnormally =="); diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp index 2b7832e77d3..09d66fdefa8 100644 --- a/lldb/source/Expression/DWARFExpression.cpp +++ b/lldb/source/Expression/DWARFExpression.cpp @@ -588,8 +588,8 @@ DWARFExpression::GetDescription (Stream *s, lldb::DescriptionLevel level, addr_t } else { - if (m_data.GetAddressByteSize() == 4 && begin_addr_offset == 0xFFFFFFFFull || - m_data.GetAddressByteSize() == 8 && begin_addr_offset == 0xFFFFFFFFFFFFFFFFull) + if ((m_data.GetAddressByteSize() == 4 && (begin_addr_offset == UINT32_MAX)) || + (m_data.GetAddressByteSize() == 8 && (begin_addr_offset == UINT64_MAX))) { curr_base_addr = end_addr_offset + location_list_base_addr; // We have a new base address @@ -2388,7 +2388,7 @@ DWARFExpression::Evaluate case Value::eValueTypeLoadAddress: case Value::eValueTypeHostAddress: { - lldb::AddressType address_type = (value_type == Value::eValueTypeLoadAddress ? eAddressTypeLoad : eAddressTypeHost); + AddressType address_type = (value_type == Value::eValueTypeLoadAddress ? eAddressTypeLoad : eAddressTypeHost); lldb::addr_t addr = stack.back().GetScalar().ULongLong(LLDB_INVALID_ADDRESS); if (!ClangASTType::WriteToMemory (ast_context, clang_type, diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp index e6c4bdeec2a..515070e5930 100644 --- a/lldb/source/Host/common/Host.cpp +++ b/lldb/source/Host/common/Host.cpp @@ -273,20 +273,20 @@ Host::GetArchitecture (SystemDefaultArchitecture arch_kind) if (cputype & CPU_ARCH_ABI64) { // We have a 64 bit kernel on a 64 bit system - g_host_arch_32.SetArchitecture (lldb::eArchTypeMachO, ~(CPU_ARCH_MASK) & cputype, cpusubtype); - g_host_arch_64.SetArchitecture (lldb::eArchTypeMachO, cputype, cpusubtype); + g_host_arch_32.SetArchitecture (eArchTypeMachO, ~(CPU_ARCH_MASK) & cputype, cpusubtype); + g_host_arch_64.SetArchitecture (eArchTypeMachO, cputype, cpusubtype); } else { // We have a 32 bit kernel on a 64 bit system - g_host_arch_32.SetArchitecture (lldb::eArchTypeMachO, cputype, cpusubtype); + g_host_arch_32.SetArchitecture (eArchTypeMachO, cputype, cpusubtype); cputype |= CPU_ARCH_ABI64; - g_host_arch_64.SetArchitecture (lldb::eArchTypeMachO, cputype, cpusubtype); + g_host_arch_64.SetArchitecture (eArchTypeMachO, cputype, cpusubtype); } } else { - g_host_arch_32.SetArchitecture (lldb::eArchTypeMachO, cputype, cpusubtype); + g_host_arch_32.SetArchitecture (eArchTypeMachO, cputype, cpusubtype); g_host_arch_64.Clear(); } } diff --git a/lldb/source/Host/macosx/Host.mm b/lldb/source/Host/macosx/Host.mm index 3231be9ed8a..f6fd4c11dd2 100644 --- a/lldb/source/Host/macosx/Host.mm +++ b/lldb/source/Host/macosx/Host.mm @@ -958,7 +958,7 @@ GetMacOSXProcessCPUType (ProcessInfo &process_info) case llvm::MachO::CPUTypeX86_64: sub = llvm::MachO::CPUSubType_X86_64_ALL; break; default: break; } - process_info.GetArchitecture ().SetArchitecture (lldb::eArchTypeMachO, cpu, sub); + process_info.GetArchitecture ().SetArchitecture (eArchTypeMachO, cpu, sub); return true; } } diff --git a/lldb/source/Interpreter/Args.cpp b/lldb/source/Interpreter/Args.cpp index d278873b813..df276baff6f 100644 --- a/lldb/source/Interpreter/Args.cpp +++ b/lldb/source/Interpreter/Args.cpp @@ -796,7 +796,7 @@ Args::StringToVersion (const char *s, uint32_t &major, uint32_t &minor, uint32_t int32_t -Args::StringToOptionEnum (const char *s, lldb::OptionEnumValueElement *enum_values, int32_t fail_value, bool *success_ptr) +Args::StringToOptionEnum (const char *s, OptionEnumValueElement *enum_values, int32_t fail_value, bool *success_ptr) { if (enum_values && s && s[0]) { diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index 0fd9dabe750..98786f7c5cc 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -76,7 +76,7 @@ CommandInterpreter::CommandInterpreter StreamString var_name; var_name.Printf ("[%s].script-lang", dbg_name); debugger.GetSettingsController()->SetVariable (var_name.GetData(), lang_name.c_str(), - lldb::eVarSetOperationAssign, false, + eVarSetOperationAssign, false, m_debugger.GetInstanceName().AsCString()); SetEventName (eBroadcastBitThreadShouldExit, "thread-should-exit"); SetEventName (eBroadcastBitResetPrompt, "reset-prompt"); diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp index 38d5cfbedac..dff61198643 100644 --- a/lldb/source/Interpreter/CommandObject.cpp +++ b/lldb/source/Interpreter/CommandObject.cpp @@ -489,7 +489,7 @@ CommandObject::GetArgumentName (CommandArgumentType arg_type) } bool -CommandObject::IsPairType (lldb::ArgumentRepetitionType arg_repeat_type) +CommandObject::IsPairType (ArgumentRepetitionType arg_repeat_type) { if ((arg_repeat_type == eArgRepeatPairPlain) || (arg_repeat_type == eArgRepeatPairOptional) diff --git a/lldb/source/Interpreter/Options.cpp b/lldb/source/Interpreter/Options.cpp index cd810c6e0bc..630f24cbf3f 100644 --- a/lldb/source/Interpreter/Options.cpp +++ b/lldb/source/Interpreter/Options.cpp @@ -177,7 +177,7 @@ Options::BuildValidOptionSets () if (num_options == 0) return; - const lldb::OptionDefinition *full_options_table = GetDefinitions(); + const OptionDefinition *full_options_table = GetDefinitions(); m_required_options.resize(1); m_optional_options.resize(1); @@ -230,7 +230,7 @@ Options::BuildValidOptionSets () uint32_t Options::NumCommandOptions () { - const lldb::OptionDefinition *full_options_table = GetDefinitions (); + const OptionDefinition *full_options_table = GetDefinitions (); if (full_options_table == NULL) return 0; @@ -258,7 +258,7 @@ Options::GetLongOptions () uint32_t i; uint32_t j; - const lldb::OptionDefinition *full_options_table = GetDefinitions(); + const OptionDefinition *full_options_table = GetDefinitions(); std::bitset<256> option_seen; @@ -368,7 +368,7 @@ Options::GenerateOptionUsage { const uint32_t screen_width = interpreter.GetDebugger().GetTerminalWidth(); - const lldb::OptionDefinition *full_options_table = GetDefinitions(); + const OptionDefinition *full_options_table = GetDefinitions(); const uint32_t save_indent_level = strm.GetIndentLevel(); const char *name; diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp index dd9e06626bf..739b4cfbc94 100644 --- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp +++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp @@ -24,8 +24,8 @@ using namespace lldb; using namespace lldb_private; // Convenient macro definitions. -#define APSR_C Bit32(m_inst_cpsr, CPSR_C_POS) -#define APSR_V Bit32(m_inst_cpsr, CPSR_V_POS) +#define APSR_C Bit32(m_opcode_cpsr, CPSR_C_POS) +#define APSR_V Bit32(m_opcode_cpsr, CPSR_V_POS) #define AlignPC(pc_val) (pc_val & 0xFFFFFFFC) @@ -848,10 +848,10 @@ EmulateInstructionARM::EmulateMUL (ARMEncoding encoding) { // APSR.N = result<31>; // APSR.Z = IsZeroBit(result); - m_new_inst_cpsr = m_inst_cpsr; + m_new_inst_cpsr = m_opcode_cpsr; SetBit32 (m_new_inst_cpsr, CPSR_N_POS, Bit32 (result, 31)); SetBit32 (m_new_inst_cpsr, CPSR_Z_POS, result == 0 ? 1 : 0); - if (m_new_inst_cpsr != m_inst_cpsr) + if (m_new_inst_cpsr != m_opcode_cpsr) { if (!WriteRegisterUnsigned (context, eRegisterKindGeneric, LLDB_REGNUM_GENERIC_FLAGS, m_new_inst_cpsr)) return false; @@ -5959,7 +5959,7 @@ EmulateInstructionARM::EmulateLDRRegister (ARMEncoding encoding) addr_t address; // offset = Shift(R[m], shift_t, shift_n, APSR.C); -- Note "The APSR is an application level alias for the CPSR". - addr_t offset = Shift (Rm, shift_t, shift_n, Bit32 (m_inst_cpsr, APSR_C)); + addr_t offset = Shift (Rm, shift_t, shift_n, Bit32 (m_opcode_cpsr, APSR_C)); // offset_addr = if add then (R[n] + offset) else (R[n] - offset); if (add) @@ -9920,7 +9920,7 @@ bool EmulateInstructionARM::ReadInstruction () { bool success = false; - m_inst_cpsr = ReadRegisterUnsigned (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_FLAGS, 0, &success); + m_opcode_cpsr = ReadRegisterUnsigned (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_FLAGS, 0, &success); if (success) { addr_t pc = ReadRegisterUnsigned (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_ADDRESS, &success); @@ -9930,37 +9930,37 @@ EmulateInstructionARM::ReadInstruction () read_inst_context.type = eContextReadOpcode; read_inst_context.SetNoArgs (); - if (m_inst_cpsr & MASK_CPSR_T) + if (m_opcode_cpsr & MASK_CPSR_T) { - m_inst_mode = eModeThumb; + m_opcode_mode = eModeThumb; uint32_t thumb_opcode = MemARead(read_inst_context, pc, 2, 0, &success); if (success) { - if ((m_inst.opcode.inst16 & 0xe000) != 0xe000 || ((m_inst.opcode.inst16 & 0x1800u) == 0)) + if ((m_opcode.data.inst16 & 0xe000) != 0xe000 || ((m_opcode.data.inst16 & 0x1800u) == 0)) { - m_inst.opcode_type = eOpcode16; - m_inst.opcode.inst16 = thumb_opcode; + m_opcode.type = eOpcode16; + m_opcode.data.inst16 = thumb_opcode; } else { - m_inst.opcode_type = eOpcode32; - m_inst.opcode.inst32 = (thumb_opcode << 16) | MemARead(read_inst_context, pc + 2, 2, 0, &success); + m_opcode.type = eOpcode32; + m_opcode.data.inst32 = (thumb_opcode << 16) | MemARead(read_inst_context, pc + 2, 2, 0, &success); } } } else { - m_inst_mode = eModeARM; - m_inst.opcode_type = eOpcode32; - m_inst.opcode.inst32 = MemARead(read_inst_context, pc, 4, 0, &success); + m_opcode_mode = eModeARM; + m_opcode.type = eOpcode32; + m_opcode.data.inst32 = MemARead(read_inst_context, pc, 4, 0, &success); } } } if (!success) { - m_inst_mode = eModeInvalid; - m_inst_pc = LLDB_INVALID_ADDRESS; + m_opcode_mode = eModeInvalid; + m_opcode_pc = LLDB_INVALID_ADDRESS; } return success; } @@ -9974,7 +9974,7 @@ EmulateInstructionARM::ArchVersion () bool EmulateInstructionARM::ConditionPassed () { - if (m_inst_cpsr == 0) + if (m_opcode_cpsr == 0) return false; const uint32_t cond = CurrentCond (); @@ -9985,23 +9985,23 @@ EmulateInstructionARM::ConditionPassed () bool result = false; switch (UnsignedBits(cond, 3, 1)) { - case 0: result = (m_inst_cpsr & MASK_CPSR_Z) != 0; break; - case 1: result = (m_inst_cpsr & MASK_CPSR_C) != 0; break; - case 2: result = (m_inst_cpsr & MASK_CPSR_N) != 0; break; - case 3: result = (m_inst_cpsr & MASK_CPSR_V) != 0; break; - case 4: result = ((m_inst_cpsr & MASK_CPSR_C) != 0) && ((m_inst_cpsr & MASK_CPSR_Z) == 0); break; + case 0: result = (m_opcode_cpsr & MASK_CPSR_Z) != 0; break; + case 1: result = (m_opcode_cpsr & MASK_CPSR_C) != 0; break; + case 2: result = (m_opcode_cpsr & MASK_CPSR_N) != 0; break; + case 3: result = (m_opcode_cpsr & MASK_CPSR_V) != 0; break; + case 4: result = ((m_opcode_cpsr & MASK_CPSR_C) != 0) && ((m_opcode_cpsr & MASK_CPSR_Z) == 0); break; case 5: { - bool n = (m_inst_cpsr & MASK_CPSR_N); - bool v = (m_inst_cpsr & MASK_CPSR_V); + bool n = (m_opcode_cpsr & MASK_CPSR_N); + bool v = (m_opcode_cpsr & MASK_CPSR_V); result = n == v; } break; case 6: { - bool n = (m_inst_cpsr & MASK_CPSR_N); - bool v = (m_inst_cpsr & MASK_CPSR_V); - result = n == v && ((m_inst_cpsr & MASK_CPSR_Z) == 0); + bool n = (m_opcode_cpsr & MASK_CPSR_N); + bool v = (m_opcode_cpsr & MASK_CPSR_V); + result = n == v && ((m_opcode_cpsr & MASK_CPSR_Z) == 0); } break; case 7: @@ -10017,31 +10017,31 @@ EmulateInstructionARM::ConditionPassed () uint32_t EmulateInstructionARM::CurrentCond () { - switch (m_inst_mode) + switch (m_opcode_mode) { default: case eModeInvalid: break; case eModeARM: - return UnsignedBits(m_inst.opcode.inst32, 31, 28); + return UnsignedBits(m_opcode.data.inst32, 31, 28); case eModeThumb: // For T1 and T3 encodings of the Branch instruction, it returns the 4-bit // 'cond' field of the encoding. - if (m_inst.opcode_type == eOpcode16 && - Bits32(m_inst.opcode.inst16, 15, 12) == 0x0d && - Bits32(m_inst.opcode.inst16, 11, 7) != 0x0f) + if (m_opcode.type == eOpcode16 && + Bits32(m_opcode.data.inst16, 15, 12) == 0x0d && + Bits32(m_opcode.data.inst16, 11, 7) != 0x0f) { - return Bits32(m_inst.opcode.inst16, 11, 7); + return Bits32(m_opcode.data.inst16, 11, 7); } - else if (m_inst.opcode_type == eOpcode32 && - Bits32(m_inst.opcode.inst32, 31, 27) == 0x1e && - Bits32(m_inst.opcode.inst32, 15, 14) == 0x02 && - Bits32(m_inst.opcode.inst32, 12, 12) == 0x00 && - Bits32(m_inst.opcode.inst32, 25, 22) <= 0x0d) + else if (m_opcode.type == eOpcode32 && + Bits32(m_opcode.data.inst32, 31, 27) == 0x1e && + Bits32(m_opcode.data.inst32, 15, 14) == 0x02 && + Bits32(m_opcode.data.inst32, 12, 12) == 0x00 && + Bits32(m_opcode.data.inst32, 25, 22) <= 0x0d) { - return Bits32(m_inst.opcode.inst32, 25, 22); + return Bits32(m_opcode.data.inst32, 25, 22); } return m_it_session.GetCond(); @@ -10083,7 +10083,7 @@ EmulateInstructionARM::BadMode (uint32_t mode) bool EmulateInstructionARM::CurrentModeIsPrivileged () { - uint32_t mode = Bits32 (m_inst_cpsr, 4, 0); + uint32_t mode = Bits32 (m_opcode_cpsr, 4, 0); if (BadMode (mode)) return false; @@ -10101,7 +10101,7 @@ EmulateInstructionARM::CPSRWriteByInstr (uint32_t value, uint32_t bytemask, bool uint32_t tmp_cpsr = 0; - tmp_cpsr = tmp_cpsr | (Bits32 (m_inst_cpsr, 23, 20) << 20); + tmp_cpsr = tmp_cpsr | (Bits32 (m_opcode_cpsr, 23, 20) << 20); if (BitIsSet (bytemask, 3)) { @@ -10134,7 +10134,7 @@ EmulateInstructionARM::CPSRWriteByInstr (uint32_t value, uint32_t bytemask, bool tmp_cpsr = tmp_cpsr | Bits32 (value, 4, 0); } - m_inst_cpsr = tmp_cpsr; + m_opcode_cpsr = tmp_cpsr; } @@ -10222,16 +10222,16 @@ EmulateInstructionARM::ALUWritePC (Context &context, uint32_t addr) EmulateInstructionARM::Mode EmulateInstructionARM::CurrentInstrSet () { - return m_inst_mode; + return m_opcode_mode; } -// Set the 'T' bit of our CPSR. The m_inst_mode gets updated when the next +// Set the 'T' bit of our CPSR. The m_opcode_mode gets updated when the next // ReadInstruction() is performed. This function has a side effect of updating // the m_new_inst_cpsr member variable if necessary. bool EmulateInstructionARM::SelectInstrSet (Mode arm_or_thumb) { - m_new_inst_cpsr = m_inst_cpsr; + m_new_inst_cpsr = m_opcode_cpsr; switch (arm_or_thumb) { default: @@ -10401,14 +10401,14 @@ EmulateInstructionARM::WriteFlags (Context &context, const uint32_t carry, const uint32_t overflow) { - m_new_inst_cpsr = m_inst_cpsr; + m_new_inst_cpsr = m_opcode_cpsr; SetBit32(m_new_inst_cpsr, CPSR_N_POS, Bit32(result, CPSR_N_POS)); SetBit32(m_new_inst_cpsr, CPSR_Z_POS, result == 0 ? 1 : 0); if (carry != ~0u) SetBit32(m_new_inst_cpsr, CPSR_C_POS, carry); if (overflow != ~0u) SetBit32(m_new_inst_cpsr, CPSR_V_POS, overflow); - if (m_new_inst_cpsr != m_inst_cpsr) + if (m_new_inst_cpsr != m_opcode_cpsr) { if (!WriteRegisterUnsigned (context, eRegisterKindGeneric, LLDB_REGNUM_GENERIC_FLAGS, m_new_inst_cpsr)) return false; @@ -10420,7 +10420,7 @@ bool EmulateInstructionARM::EvaluateInstruction () { // Advance the ITSTATE bits to their values for the next instruction. - if (m_inst_mode == eModeThumb && m_it_session.InITBlock()) + if (m_opcode_mode == eModeThumb && m_it_session.InITBlock()) m_it_session.ITAdvance(); return false; diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h index 9e5611a4077..d7985176a71 100644 --- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h +++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h @@ -105,8 +105,8 @@ public: read_reg_callback, write_reg_callback), m_arm_isa (0), - m_inst_mode (eModeInvalid), - m_inst_cpsr (0), + m_opcode_mode (eModeInvalid), + m_opcode_cpsr (0), m_it_session () { } @@ -733,8 +733,8 @@ protected: EmulateRFE (ARMEncoding encoding); uint32_t m_arm_isa; - Mode m_inst_mode; - uint32_t m_inst_cpsr; + Mode m_opcode_mode; + uint32_t m_opcode_cpsr; uint32_t m_new_inst_cpsr; // This can get updated by the opcode. ITSession m_it_session; }; diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp index 11880642182..ca2d3e2d356 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp @@ -136,7 +136,7 @@ AppleObjCRuntime::GetObjectDescription (Stream &str, Value &value, ExecutionCont try_all_threads, unwind_on_error, ret); - if (results != lldb::eExecutionCompleted) + if (results != eExecutionCompleted) { str.Printf("Error evaluating Print Object function: %d.\n", results); return false; @@ -246,7 +246,7 @@ AppleObjCRuntime::GetStepThroughTrampolinePlan (Thread &thread, bool stop_others //------------------------------------------------------------------ // Static Functions //------------------------------------------------------------------ -enum lldb::ObjCRuntimeVersions +enum ObjCRuntimeVersions AppleObjCRuntime::GetObjCVersion (Process *process, ModuleSP &objc_module_sp) { ModuleList &images = process->GetTarget().GetImages(); @@ -259,21 +259,21 @@ AppleObjCRuntime::GetObjCVersion (Process *process, ModuleSP &objc_module_sp) objc_module_sp = module_sp; ObjectFile *ofile = module_sp->GetObjectFile(); if (!ofile) - return lldb::eObjC_VersionUnknown; + return eObjC_VersionUnknown; SectionList *sections = ofile->GetSectionList(); if (!sections) - return lldb::eObjC_VersionUnknown; + return eObjC_VersionUnknown; SectionSP v1_telltale_section_sp = sections->FindSectionByName(ConstString ("__OBJC")); if (v1_telltale_section_sp) { - return lldb::eAppleObjC_V1; + return eAppleObjC_V1; } - return lldb::eAppleObjC_V2; + return eAppleObjC_V2; } } - return lldb::eObjC_VersionUnknown; + return eObjC_VersionUnknown; } void diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h index 157743427fb..8c2920db33b 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h @@ -67,7 +67,7 @@ protected: static bool AppleIsModuleObjCLibrary (const lldb::ModuleSP &module_sp); - static enum lldb::ObjCRuntimeVersions + static enum ObjCRuntimeVersions GetObjCVersion (Process *process, ModuleSP &objc_module_sp); //------------------------------------------------------------------ diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp index a9203db8b3e..4bb1edc40d5 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp @@ -59,7 +59,7 @@ AppleObjCRuntimeV1::CreateInstance (Process *process, lldb::LanguageType languag { ModuleSP objc_module_sp; - if (AppleObjCRuntime::GetObjCVersion (process, objc_module_sp) == lldb::eAppleObjC_V1) + if (AppleObjCRuntime::GetObjCVersion (process, objc_module_sp) == eAppleObjC_V1) return new AppleObjCRuntimeV1 (process); else return NULL; diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h index 832a165b80b..1e65713dba1 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h @@ -64,10 +64,10 @@ public: virtual void SetExceptionBreakpoints (); - virtual lldb::ObjCRuntimeVersions + virtual ObjCRuntimeVersions GetRuntimeVersion () { - return lldb::eAppleObjC_V1; + return eAppleObjC_V1; } protected: diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index 2ad83888ab3..11c2a091cf4 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -65,7 +65,7 @@ AppleObjCRuntimeV2::CreateInstance (Process *process, lldb::LanguageType languag { ModuleSP objc_module_sp; - if (AppleObjCRuntime::GetObjCVersion (process, objc_module_sp) == lldb::eAppleObjC_V2) + if (AppleObjCRuntime::GetObjCVersion (process, objc_module_sp) == eAppleObjC_V2) return new AppleObjCRuntimeV2 (process, objc_module_sp); else return NULL; diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h index e4bb556afd1..e6c13710642 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h @@ -65,10 +65,10 @@ public: virtual void SetExceptionBreakpoints (); - virtual lldb::ObjCRuntimeVersions + virtual ObjCRuntimeVersions GetRuntimeVersion () { - return lldb::eAppleObjC_V2; + return eAppleObjC_V2; } protected: diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp index b213e11b425..39e1d8dca0a 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp @@ -28,16 +28,21 @@ using namespace lldb_private; //---------------------------------------------------------------------- // ThreadPlanStepThroughObjCTrampoline constructor //---------------------------------------------------------------------- -AppleThreadPlanStepThroughObjCTrampoline::AppleThreadPlanStepThroughObjCTrampoline( - Thread &thread, - AppleObjCTrampolineHandler *trampoline_handler, - lldb::addr_t args_addr, - lldb::addr_t object_addr, - lldb::addr_t isa_addr, - lldb::addr_t sel_addr, - bool stop_others) : - ThreadPlan (ThreadPlan::eKindGeneric, "MacOSX Step through ObjC Trampoline", thread, - lldb::eVoteNoOpinion, lldb::eVoteNoOpinion), +AppleThreadPlanStepThroughObjCTrampoline::AppleThreadPlanStepThroughObjCTrampoline +( + Thread &thread, + AppleObjCTrampolineHandler *trampoline_handler, + lldb::addr_t args_addr, + lldb::addr_t object_addr, + lldb::addr_t isa_addr, + lldb::addr_t sel_addr, + bool stop_others +) : + ThreadPlan (ThreadPlan::eKindGeneric, + "MacOSX Step through ObjC Trampoline", + thread, + eVoteNoOpinion, + eVoteNoOpinion), m_trampoline_handler (trampoline_handler), m_args_addr (args_addr), m_object_addr (object_addr), diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp index 4fe64898e32..786a2cec6ea 100644 --- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp +++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp @@ -190,7 +190,7 @@ ObjectContainerUniversalMachO::GetArchitectureAtIndex (uint32_t idx, ArchSpec& a { if (idx < m_header.nfat_arch) { - arch.SetArchitecture (lldb::eArchTypeMachO, m_fat_archs[idx].cputype, m_fat_archs[idx].cpusubtype); + arch.SetArchitecture (eArchTypeMachO, m_fat_archs[idx].cputype, m_fat_archs[idx].cpusubtype); return true; } return false; diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp index 67b6a5ed449..379186a2352 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp @@ -754,7 +754,7 @@ ObjectFileELF::Dump(Stream *s) section_list->Dump(s, NULL, true, UINT32_MAX); Symtab *symtab = GetSymtab(); if (symtab) - symtab->Dump(s, NULL, lldb::eSortOrderNone); + symtab->Dump(s, NULL, eSortOrderNone); s->EOL(); DumpDependentModules(s); s->EOL(); @@ -1041,7 +1041,7 @@ ObjectFileELF::GetArchitecture (ArchSpec &arch) if (!ParseHeader()) return false; - arch.SetArchitecture (lldb::eArchTypeELF, m_header.e_machine, LLDB_INVALID_CPUTYPE); + arch.SetArchitecture (eArchTypeELF, m_header.e_machine, LLDB_INVALID_CPUTYPE); arch.GetTriple().setOSName (Host::GetOSString().GetCString()); arch.GetTriple().setVendorName(Host::GetVendorString().GetCString()); return true; diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 72c21fede3a..7c845ec4181 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -202,7 +202,7 @@ ObjectFileMachO::GetAddressByteSize () const return m_data.GetAddressByteSize (); } -lldb::AddressClass +AddressClass ObjectFileMachO::GetAddressClass (lldb::addr_t file_addr) { Symtab *symtab = GetSymtab(); @@ -217,7 +217,7 @@ ObjectFileMachO::GetAddressClass (lldb::addr_t file_addr) const Section *section = range_ptr->GetBaseAddress().GetSection(); if (section) { - const lldb::SectionType section_type = section->GetType(); + const SectionType section_type = section->GetType(); switch (section_type) { case eSectionTypeInvalid: return eAddressClassUnknown; @@ -233,7 +233,7 @@ ObjectFileMachO::GetAddressClass (lldb::addr_t file_addr) case eSectionTypeContainer: return eAddressClassUnknown; case eSectionTypeData: return eAddressClassData; - case eSectionTypeDataCString: return eAddressClassDataConst; + case eSectionTypeDataCString: return eAddressClassData; case eSectionTypeDataCStringPointers: return eAddressClassData; case eSectionTypeDataSymbolAddress: return eAddressClassData; case eSectionTypeData4: return eAddressClassData; @@ -241,8 +241,8 @@ ObjectFileMachO::GetAddressClass (lldb::addr_t file_addr) case eSectionTypeData16: return eAddressClassData; case eSectionTypeDataPointers: return eAddressClassData; case eSectionTypeZeroFill: return eAddressClassData; - case eSectionTypeDataObjCMessageRefs: return eAddressClassDataConst; - case eSectionTypeDataObjCCFStrings: return eAddressClassDataConst; + case eSectionTypeDataObjCMessageRefs: return eAddressClassData; + case eSectionTypeDataObjCCFStrings: return eAddressClassData; case eSectionTypeDebug: return eAddressClassDebug; case eSectionTypeDWARFDebugAbbrev: return eAddressClassDebug; case eSectionTypeDWARFDebugAranges: return eAddressClassDebug; @@ -261,7 +261,7 @@ ObjectFileMachO::GetAddressClass (lldb::addr_t file_addr) } } - const lldb::SymbolType symbol_type = symbol->GetType(); + const SymbolType symbol_type = symbol->GetType(); switch (symbol_type) { case eSymbolTypeAny: return eAddressClassUnknown; @@ -1659,7 +1659,7 @@ ObjectFileMachO::GetEntryPointAddress () SymbolContextList contexts; SymbolContext context; - if (!m_module->FindSymbolsWithNameAndType(ConstString ("start"), lldb::eSymbolTypeCode, contexts)) + if (!m_module->FindSymbolsWithNameAndType(ConstString ("start"), eSymbolTypeCode, contexts)) return m_entry_point_address; contexts.GetContextAtIndex(0, context); @@ -1675,7 +1675,7 @@ bool ObjectFileMachO::GetArchitecture (ArchSpec &arch) { lldb_private::Mutex::Locker locker(m_mutex); - arch.SetArchitecture (lldb::eArchTypeMachO, m_header.cputype, m_header.cpusubtype); + arch.SetArchitecture (eArchTypeMachO, m_header.cputype, m_header.cpusubtype); return true; } diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h index bd25062c38e..0cd96ba4344 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h @@ -74,7 +74,7 @@ public: virtual size_t GetAddressByteSize () const; - virtual lldb::AddressClass + virtual lldb_private::AddressClass GetAddressClass (lldb::addr_t file_addr); virtual lldb_private::Symtab * diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp index 24789302a69..60046936bec 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp @@ -130,7 +130,7 @@ PlatformMacOSX::GetFile (const FileSpec &platform_file, uint32_t PlatformMacOSX::FindProcessesByName (const char *name_match, - lldb::NameMatchType name_match_type, + NameMatchType name_match_type, ProcessInfoList &process_infos) { uint32_t match_count = 0; diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h index 851db84e4ba..c0346cbc3d7 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h @@ -85,7 +85,7 @@ namespace lldb_private { virtual uint32_t FindProcessesByName (const char *name_match, - lldb::NameMatchType name_match_type, + NameMatchType name_match_type, ProcessInfoList &process_infos); virtual bool diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp index d56ed3fcec2..0d8886bb504 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp @@ -420,7 +420,7 @@ PlatformRemoteiOS::GetFile (const FileSpec &platform_file, uint32_t PlatformRemoteiOS::FindProcessesByName (const char *name_match, - lldb::NameMatchType name_match_type, + NameMatchType name_match_type, ProcessInfoList &process_infos) { // TODO: if connected, send a packet to get the remote process infos by name diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h index a6bfc44eb15..aec84c0e7cc 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h @@ -96,7 +96,7 @@ namespace lldb_private { virtual uint32_t FindProcessesByName (const char *name_match, - lldb::NameMatchType name_match_type, + NameMatchType name_match_type, ProcessInfoList &process_infos); virtual bool diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp index 6c955e0a18e..65978f263dc 100644 --- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp +++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp @@ -128,7 +128,7 @@ PlatformRemoteGDBServer::~PlatformRemoteGDBServer() uint32_t PlatformRemoteGDBServer::FindProcessesByName (const char *name_match, - lldb::NameMatchType name_match_type, + NameMatchType name_match_type, ProcessInfoList &process_infos) { return 0; diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h index 9551cd8a081..82259d80617 100644 --- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h +++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h @@ -86,7 +86,7 @@ namespace lldb_private { virtual uint32_t FindProcessesByName (const char *name_match, - lldb::NameMatchType name_match_type, + NameMatchType name_match_type, ProcessInfoList &process_infos); virtual bool diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp index e9756881886..3c049f67739 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp @@ -369,7 +369,7 @@ MachException::Message::Reply(task_t task, pid_t pid, int signal) else err.Clear(); - if (log && log->GetMask().Test(PD_LOG_EXCEPTIONS) || err.Fail()) + if (log && (log->GetMask().Test(PD_LOG_EXCEPTIONS) || err.Fail())) err.PutToLog(log.get(), "::ptrace (request = PT_THUPDATE, pid = %i, tid = 0x%4.4x, signal = %i)", state_pid, state.thread_port, signal); } diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp index cac805ef560..35805b52d7e 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp @@ -186,7 +186,7 @@ RegisterContextMach_arm::~RegisterContextMach_arm() #define DEFINE_DBG(reg, i) #reg, NULL, sizeof(((RegisterContextMach_arm::DBG *)NULL)->reg[i]), DBG_OFFSET(reg[i]), eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, dbg_##reg##i } #define REG_CONTEXT_SIZE (sizeof (RegisterContextMach_arm::GPR) + sizeof (RegisterContextMach_arm::FPU) + sizeof (RegisterContextMach_arm::EXC)) // General purpose registers -static lldb::RegisterInfo +static RegisterInfo g_register_infos[] = { // NAME ALT SZ OFFSET ENCODING FORMAT COMPILER DWARF GENERIC LLDB NATIVE diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h index 3f9654c72c8..ef4b7af4e82 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h @@ -65,13 +65,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t set); virtual bool @@ -297,7 +297,7 @@ protected: static size_t GetRegisterInfosCount (); - static const lldb::RegisterInfo * + static const lldb_private::RegisterInfo * GetRegisterInfos (); }; diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.h b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.h index 7a3c5dad08b..969fa9a1417 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.h +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.h @@ -33,13 +33,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t set); virtual bool @@ -249,7 +249,7 @@ protected: static size_t GetRegisterInfosCount (); - static const lldb::RegisterInfo * + static const lldb_private::RegisterInfo * GetRegisterInfos (); }; diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp index 9995b0d2da0..098a168ed38 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp @@ -342,7 +342,7 @@ RegisterContextMach_x86_64::GetRegisterInfosCount () return k_num_register_infos; } -const RegisterInfo * +const lldb_private::RegisterInfo * RegisterContextMach_x86_64::GetRegisterInfos () { return g_register_infos; diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.h b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.h index 316575c9aa7..5b0bdc7ed31 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.h +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.h @@ -32,13 +32,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t set); virtual bool @@ -253,7 +253,7 @@ protected: static size_t GetRegisterInfosCount (); - static const lldb::RegisterInfo * + static const lldb_private::RegisterInfo * GetRegisterInfos (); }; diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.h b/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.h index f75a9b84fc5..ac2c5609cdc 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.h +++ b/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.h @@ -40,13 +40,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t reg_set); virtual bool diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp index 4a84e46e2cf..851d924c661 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp @@ -57,7 +57,7 @@ RegisterContextMacOSXFrameBackchain::GetRegisterCount () return m_thread.GetRegisterContext()->GetRegisterCount(); } -const lldb::RegisterInfo * +const RegisterInfo * RegisterContextMacOSXFrameBackchain::GetRegisterInfoAtIndex (uint32_t reg) { return m_thread.GetRegisterContext()->GetRegisterInfoAtIndex(reg); @@ -71,7 +71,7 @@ RegisterContextMacOSXFrameBackchain::GetRegisterSetCount () -const lldb::RegisterSet * +const RegisterSet * RegisterContextMacOSXFrameBackchain::GetRegisterSet (uint32_t reg_set) { return m_thread.GetRegisterContext()->GetRegisterSet (reg_set); diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h index 7997a23a194..bc7c2a0e90a 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h +++ b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h @@ -41,13 +41,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t reg_set); virtual bool diff --git a/lldb/source/Plugins/Process/Utility/UnwindLLDB.h b/lldb/source/Plugins/Process/Utility/UnwindLLDB.h index 1c01a3dbc74..97b08826206 100644 --- a/lldb/source/Plugins/Process/Utility/UnwindLLDB.h +++ b/lldb/source/Plugins/Process/Utility/UnwindLLDB.h @@ -12,7 +12,7 @@ #include <vector> -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Symbol/FuncUnwinders.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/RegisterContext.h" diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index e158e5c6237..f8a0600fb81 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -859,7 +859,7 @@ GDBRemoteCommunicationClient::GetHostInfo () { if (cpu != LLDB_INVALID_CPUTYPE) { - m_host_arch.SetArchitecture (lldb::eArchTypeMachO, cpu, sub); + m_host_arch.SetArchitecture (eArchTypeMachO, cpu, sub); if (pointer_byte_size) { assert (pointer_byte_size == m_host_arch.GetAddressByteSize()); @@ -943,7 +943,7 @@ GDBRemoteCommunicationClient::SendAttach const lldb_private::ArchSpec & GDBRemoteCommunicationClient::GetHostArchitecture () { - if (m_supports_qHostInfo == lldb::eLazyBoolCalculate) + if (m_supports_qHostInfo == eLazyBoolCalculate) GetHostInfo (); return m_host_arch; } diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h index 410d80de316..39ddb622218 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h @@ -237,15 +237,15 @@ protected: //------------------------------------------------------------------ // Classes that inherit from GDBRemoteCommunicationClient can see and modify these //------------------------------------------------------------------ - lldb::LazyBool m_supports_not_sending_acks; - lldb::LazyBool m_supports_thread_suffix; - lldb::LazyBool m_supports_qHostInfo; - lldb::LazyBool m_supports_vCont_all; - lldb::LazyBool m_supports_vCont_any; - lldb::LazyBool m_supports_vCont_c; - lldb::LazyBool m_supports_vCont_C; - lldb::LazyBool m_supports_vCont_s; - lldb::LazyBool m_supports_vCont_S; + lldb_private::LazyBool m_supports_not_sending_acks; + lldb_private::LazyBool m_supports_thread_suffix; + lldb_private::LazyBool m_supports_qHostInfo; + lldb_private::LazyBool m_supports_vCont_all; + lldb_private::LazyBool m_supports_vCont_any; + lldb_private::LazyBool m_supports_vCont_c; + lldb_private::LazyBool m_supports_vCont_C; + lldb_private::LazyBool m_supports_vCont_s; + lldb_private::LazyBool m_supports_vCont_S; // If we need to send a packet while the target is running, the m_async_XXX // member variables take care of making this happen. diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp index 73d3535499a..556fa511b3a 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp @@ -92,7 +92,7 @@ GDBRemoteRegisterContext::GetRegisterCount () return m_reg_info.GetNumRegisters (); } -const lldb::RegisterInfo * +const RegisterInfo * GDBRemoteRegisterContext::GetRegisterInfoAtIndex (uint32_t reg) { return m_reg_info.GetRegisterInfoAtIndex (reg); @@ -106,7 +106,7 @@ GDBRemoteRegisterContext::GetRegisterSetCount () -const lldb::RegisterSet * +const RegisterSet * GDBRemoteRegisterContext::GetRegisterSet (uint32_t reg_set) { return m_reg_info.GetRegisterSet (reg_set); @@ -474,7 +474,7 @@ GDBRemoteRegisterContext::ConvertRegisterKindToRegisterNumber (uint32_t kind, ui void GDBRemoteDynamicRegisterInfo::HardcodeARMRegisters() { - static lldb::RegisterInfo + static RegisterInfo g_register_infos[] = { // NAME ALT SZ OFF ENCODING FORMAT COMPILER DWARF GENERIC GDB LLDB NATIVE @@ -555,7 +555,7 @@ GDBRemoteDynamicRegisterInfo::HardcodeARMRegisters() { "d30", NULL, 8, 420, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d30, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 73 }}, { "d31", NULL, 8, 428, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d31, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 74 }}, }; - static const uint32_t num_registers = sizeof (g_register_infos)/sizeof (lldb::RegisterInfo); + static const uint32_t num_registers = sizeof (g_register_infos)/sizeof (RegisterInfo); static ConstString gpr_reg_set ("General Purpose Registers"); static ConstString vfp_reg_set ("Floating Point Registers"); for (uint32_t i=0; i<num_registers; ++i) diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h index ac6bbe5c95d..3848ffcd50d 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h @@ -46,7 +46,10 @@ public: } void - AddRegister (lldb::RegisterInfo ®_info, lldb_private::ConstString ®_name, lldb_private::ConstString ®_alt_name, lldb_private::ConstString &set_name) + AddRegister (lldb_private::RegisterInfo ®_info, + lldb_private::ConstString ®_name, + lldb_private::ConstString ®_alt_name, + lldb_private::ConstString &set_name) { const uint32_t reg_num = m_regs.size(); m_reg_names.push_back (reg_name); @@ -94,7 +97,7 @@ public: return m_reg_data_byte_size; } - const lldb::RegisterInfo * + const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t i) const { if (i < m_regs.size()) @@ -102,7 +105,7 @@ public: return NULL; } - const lldb::RegisterSet * + const lldb_private::RegisterSet * GetRegisterSet (uint32_t i) const { if (i < m_sets.size()) @@ -122,7 +125,7 @@ public: m_set_names.push_back(set_name); m_set_reg_nums.resize(m_set_reg_nums.size()+1); - lldb::RegisterSet new_set = { set_name.AsCString(), NULL, 0, NULL }; + lldb_private::RegisterSet new_set = { set_name.AsCString(), NULL, 0, NULL }; m_sets.push_back (new_set); return m_sets.size() - 1; } @@ -157,8 +160,8 @@ protected: //------------------------------------------------------------------ // Classes that inherit from GDBRemoteRegisterContext can see and modify these //------------------------------------------------------------------ - typedef std::vector <lldb::RegisterInfo> reg_collection; - typedef std::vector <lldb::RegisterSet> set_collection; + typedef std::vector <lldb_private::RegisterInfo> reg_collection; + typedef std::vector <lldb_private::RegisterSet> set_collection; typedef std::vector <uint32_t> reg_num_collection; typedef std::vector <reg_num_collection> set_reg_num_collection; typedef std::vector <lldb_private::ConstString> name_collection; @@ -195,13 +198,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t reg_set); virtual bool diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h index 8585d0112a8..991d92907f4 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h @@ -168,7 +168,7 @@ public: const DWARFDebugRanges* DebugRanges() const; const lldb_private::DataExtractor& - GetCachedSectionData (uint32_t got_flag, lldb::SectionType sect_type, lldb_private::DataExtractor &data); + GetCachedSectionData (uint32_t got_flag, lldb_private::SectionType sect_type, lldb_private::DataExtractor &data); static bool SupportedVersion(uint16_t version); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp index 880d826bcd3..2c9a7c39c4a 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp @@ -852,7 +852,11 @@ SymbolFileDWARFDebugMap::GetCompileUnitInfoForSymbolWithIndex (uint32_t symbol_i CompileUnitInfo *comp_unit_info = NULL; if (oso_index_count) { - comp_unit_info = (CompileUnitInfo*)bsearch(&symbol_idx, &m_compile_unit_infos[0], m_compile_unit_infos.size(), sizeof(CompileUnitInfo), (comparison_function)SymbolContainsSymbolWithIndex); + comp_unit_info = (CompileUnitInfo*)bsearch(&symbol_idx, + &m_compile_unit_infos[0], + m_compile_unit_infos.size(), + sizeof(CompileUnitInfo), + (ComparisonFunction)SymbolContainsSymbolWithIndex); } if (oso_idx_ptr) @@ -872,7 +876,11 @@ SymbolFileDWARFDebugMap::GetCompileUnitInfoForSymbolWithID (user_id_t symbol_id, CompileUnitInfo *comp_unit_info = NULL; if (oso_index_count) { - comp_unit_info = (CompileUnitInfo*)bsearch(&symbol_id, &m_compile_unit_infos[0], m_compile_unit_infos.size(), sizeof(CompileUnitInfo), (comparison_function)SymbolContainsSymbolWithID); + comp_unit_info = (CompileUnitInfo*)::bsearch (&symbol_id, + &m_compile_unit_infos[0], + m_compile_unit_infos.size(), + sizeof(CompileUnitInfo), + (ComparisonFunction)SymbolContainsSymbolWithID); } if (oso_idx_ptr) diff --git a/lldb/source/Symbol/ClangASTType.cpp b/lldb/source/Symbol/ClangASTType.cpp index 6e68f9b9202..1d3b02fe5db 100644 --- a/lldb/source/Symbol/ClangASTType.cpp +++ b/lldb/source/Symbol/ClangASTType.cpp @@ -1305,7 +1305,7 @@ ClangASTType::ReadFromMemory ( lldb_private::ExecutionContext *exe_ctx, lldb::addr_t addr, - lldb::AddressType address_type, + AddressType address_type, lldb_private::DataExtractor &data ) { @@ -1325,11 +1325,11 @@ ClangASTType::ReadFromMemory clang_type_t clang_type, lldb_private::ExecutionContext *exe_ctx, lldb::addr_t addr, - lldb::AddressType address_type, + AddressType address_type, lldb_private::DataExtractor &data ) { - if (address_type == lldb::eAddressTypeFile) + if (address_type == eAddressTypeFile) { // Can't convert a file address to anything valid without more // context (which Module it came from) @@ -1347,7 +1347,7 @@ ClangASTType::ReadFromMemory uint8_t* dst = (uint8_t*)data.PeekData(0, byte_size); if (dst != NULL) { - if (address_type == lldb::eAddressTypeHost) + if (address_type == eAddressTypeHost) { // The address is an address in this process, so just copy it memcpy (dst, (uint8_t*)NULL + addr, byte_size); @@ -1370,7 +1370,7 @@ ClangASTType::WriteToMemory ( lldb_private::ExecutionContext *exe_ctx, lldb::addr_t addr, - lldb::AddressType address_type, + AddressType address_type, StreamString &new_value ) { @@ -1389,11 +1389,11 @@ ClangASTType::WriteToMemory clang_type_t clang_type, lldb_private::ExecutionContext *exe_ctx, lldb::addr_t addr, - lldb::AddressType address_type, + AddressType address_type, StreamString &new_value ) { - if (address_type == lldb::eAddressTypeFile) + if (address_type == eAddressTypeFile) { // Can't convert a file address to anything valid without more // context (which Module it came from) @@ -1404,7 +1404,7 @@ ClangASTType::WriteToMemory if (byte_size > 0) { - if (address_type == lldb::eAddressTypeHost) + if (address_type == eAddressTypeHost) { // The address is an address in this process, so just copy it memcpy ((void *)addr, new_value.GetData(), byte_size); diff --git a/lldb/source/Symbol/DWARFCallFrameInfo.cpp b/lldb/source/Symbol/DWARFCallFrameInfo.cpp index 46da6319c85..3fb84f42f61 100644 --- a/lldb/source/Symbol/DWARFCallFrameInfo.cpp +++ b/lldb/source/Symbol/DWARFCallFrameInfo.cpp @@ -125,7 +125,7 @@ DWARFCallFrameInfo::ParseCIE (const dw_offset_t cie_offset) const uint32_t length = m_cfi_data.GetU32(&offset); const dw_offset_t cie_id = m_cfi_data.GetU32(&offset); const dw_offset_t end_offset = cie_offset + length + 4; - if (length > 0 && (!m_is_eh_frame && cie_id == 0xfffffffful) || (m_is_eh_frame && cie_id == 0ul)) + if (length > 0 && ((!m_is_eh_frame && cie_id == 0xfffffffful) || (m_is_eh_frame && cie_id == 0ul))) { size_t i; // cie.offset = cie_offset; diff --git a/lldb/source/Symbol/ObjectFile.cpp b/lldb/source/Symbol/ObjectFile.cpp index fde35a0d36b..458420893ae 100644 --- a/lldb/source/Symbol/ObjectFile.cpp +++ b/lldb/source/Symbol/ObjectFile.cpp @@ -102,7 +102,7 @@ ObjectFile::SetModulesArchitecture (const ArchSpec &new_arch) return m_module->SetArchitecture (new_arch); } -lldb::AddressClass +AddressClass ObjectFile::GetAddressClass (lldb::addr_t file_addr) { Symtab *symtab = GetSymtab(); @@ -117,14 +117,14 @@ ObjectFile::GetAddressClass (lldb::addr_t file_addr) const Section *section = range_ptr->GetBaseAddress().GetSection(); if (section) { - const lldb::SectionType section_type = section->GetType(); + const SectionType section_type = section->GetType(); switch (section_type) { case eSectionTypeInvalid: return eAddressClassUnknown; case eSectionTypeCode: return eAddressClassCode; case eSectionTypeContainer: return eAddressClassUnknown; case eSectionTypeData: return eAddressClassData; - case eSectionTypeDataCString: return eAddressClassDataConst; + case eSectionTypeDataCString: return eAddressClassData; case eSectionTypeDataCStringPointers: return eAddressClassData; case eSectionTypeDataSymbolAddress: return eAddressClassData; case eSectionTypeData4: return eAddressClassData; @@ -132,8 +132,8 @@ ObjectFile::GetAddressClass (lldb::addr_t file_addr) case eSectionTypeData16: return eAddressClassData; case eSectionTypeDataPointers: return eAddressClassData; case eSectionTypeZeroFill: return eAddressClassData; - case eSectionTypeDataObjCMessageRefs: return eAddressClassDataConst; - case eSectionTypeDataObjCCFStrings: return eAddressClassDataConst; + case eSectionTypeDataObjCMessageRefs: return eAddressClassData; + case eSectionTypeDataObjCCFStrings: return eAddressClassData; case eSectionTypeDebug: return eAddressClassDebug; case eSectionTypeDWARFDebugAbbrev: return eAddressClassDebug; case eSectionTypeDWARFDebugAranges: return eAddressClassDebug; @@ -152,7 +152,7 @@ ObjectFile::GetAddressClass (lldb::addr_t file_addr) } } - const lldb::SymbolType symbol_type = symbol->GetType(); + const SymbolType symbol_type = symbol->GetType(); switch (symbol_type) { case eSymbolTypeAny: return eAddressClassUnknown; diff --git a/lldb/source/Symbol/Symtab.cpp b/lldb/source/Symbol/Symtab.cpp index 09f80c7a970..e12cc4cfa26 100644 --- a/lldb/source/Symbol/Symtab.cpp +++ b/lldb/source/Symbol/Symtab.cpp @@ -74,7 +74,7 @@ Symtab::GetNumSymbols() const } void -Symtab::Dump (Stream *s, Target *target, lldb::SortOrder sort_order) +Symtab::Dump (Stream *s, Target *target, SortOrder sort_order) { Mutex::Locker locker (m_mutex); @@ -749,7 +749,11 @@ static SymbolSearchInfo FindIndexPtrForSymbolContainingAddress(Symtab* symtab, addr_t file_addr, const uint32_t* indexes, uint32_t num_indexes) { SymbolSearchInfo info = { symtab, file_addr, NULL, NULL, 0 }; - bsearch(&info, indexes, num_indexes, sizeof(uint32_t), (comparison_function)SymbolWithClosestFileAddress); + ::bsearch (&info, + indexes, + num_indexes, + sizeof(uint32_t), + (ComparisonFunction)SymbolWithClosestFileAddress); return info; } @@ -851,7 +855,11 @@ Symtab::FindSymbolWithFileAddress (addr_t file_addr) SymbolSearchInfo info = { this, file_addr, NULL, NULL, 0 }; - uint32_t* match = (uint32_t*)bsearch(&info, &m_addr_indexes[0], m_addr_indexes.size(), sizeof(uint32_t), (comparison_function)SymbolWithFileAddress); + uint32_t* match = (uint32_t*)::bsearch (&info, + &m_addr_indexes[0], + m_addr_indexes.size(), + sizeof(uint32_t), + (ComparisonFunction)SymbolWithFileAddress); if (match) return SymbolAtIndex (*match); return NULL; @@ -865,7 +873,11 @@ Symtab::FindSymbolContainingFileAddress (addr_t file_addr, const uint32_t* index SymbolSearchInfo info = { this, file_addr, NULL, NULL, 0 }; - bsearch(&info, indexes, num_indexes, sizeof(uint32_t), (comparison_function)SymbolWithClosestFileAddress); + ::bsearch (&info, + indexes, + num_indexes, + sizeof(uint32_t), + (ComparisonFunction)SymbolWithClosestFileAddress); if (info.match_symbol) { diff --git a/lldb/source/Symbol/Type.cpp b/lldb/source/Symbol/Type.cpp index 7cd9857ee2d..379fa202799 100644 --- a/lldb/source/Symbol/Type.cpp +++ b/lldb/source/Symbol/Type.cpp @@ -352,7 +352,7 @@ Type::DumpValueInMemory ExecutionContext *exe_ctx, Stream *s, lldb::addr_t address, - lldb::AddressType address_type, + AddressType address_type, bool show_types, bool show_summary, bool verbose @@ -374,9 +374,9 @@ Type::DumpValueInMemory bool -Type::ReadFromMemory (ExecutionContext *exe_ctx, lldb::addr_t addr, lldb::AddressType address_type, DataExtractor &data) +Type::ReadFromMemory (ExecutionContext *exe_ctx, lldb::addr_t addr, AddressType address_type, DataExtractor &data) { - if (address_type == lldb::eAddressTypeFile) + if (address_type == eAddressTypeFile) { // Can't convert a file address to anything valid without more // context (which Module it came from) @@ -393,7 +393,7 @@ Type::ReadFromMemory (ExecutionContext *exe_ctx, lldb::addr_t addr, lldb::Addres uint8_t* dst = (uint8_t*)data.PeekData(0, byte_size); if (dst != NULL) { - if (address_type == lldb::eAddressTypeHost) + if (address_type == eAddressTypeHost) { // The address is an address in this process, so just copy it memcpy (dst, (uint8_t*)NULL + addr, byte_size); @@ -413,7 +413,7 @@ Type::ReadFromMemory (ExecutionContext *exe_ctx, lldb::addr_t addr, lldb::Addres bool -Type::WriteToMemory (ExecutionContext *exe_ctx, lldb::addr_t addr, lldb::AddressType address_type, DataExtractor &data) +Type::WriteToMemory (ExecutionContext *exe_ctx, lldb::addr_t addr, AddressType address_type, DataExtractor &data) { return false; } diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index c5d470d029e..54c60f55b54 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -2693,7 +2693,7 @@ Process::PopProcessInputReader () void Process::SettingsInitialize () { - static std::vector<lldb::OptionEnumValueElement> g_plugins; + static std::vector<OptionEnumValueElement> g_plugins; int i=0; const char *name; @@ -2781,13 +2781,13 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, if (thread_plan_sp.get() == NULL) { errors.Printf("RunThreadPlan called with empty thread plan."); - return lldb::eExecutionSetupError; + return eExecutionSetupError; } if (m_private_state.GetValue() != eStateStopped) { errors.Printf ("RunThreadPlan called while the private state was not stopped."); - return lldb::eExecutionSetupError; + return eExecutionSetupError; } // Save this value for restoration of the execution context after we run @@ -2854,7 +2854,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, if (!resume_error.Success()) { errors.Printf("Error resuming inferior: \"%s\".\n", resume_error.AsCString()); - return_value = lldb::eExecutionSetupError; + return_value = eExecutionSetupError; break; } @@ -2869,7 +2869,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, log->Printf("Didn't get any event after initial resume, exiting."); errors.Printf("Didn't get any event after initial resume, exiting."); - return_value = lldb::eExecutionSetupError; + return_value = eExecutionSetupError; break; } @@ -2880,7 +2880,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, log->Printf("Didn't get running event after initial resume, got %s instead.", StateAsCString(stop_state)); errors.Printf("Didn't get running event after initial resume, got %s instead.", StateAsCString(stop_state)); - return_value = lldb::eExecutionSetupError; + return_value = eExecutionSetupError; break; } @@ -2930,12 +2930,12 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, // Yay, we're done. if (log) log->Printf ("Execution completed successfully."); - return_value = lldb::eExecutionCompleted; + return_value = eExecutionCompleted; break; case lldb::eStateCrashed: if (log) log->Printf ("Execution crashed."); - return_value = lldb::eExecutionInterrupted; + return_value = eExecutionInterrupted; break; case lldb::eStateRunning: do_resume = false; @@ -2944,7 +2944,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, default: if (log) log->Printf("Execution stopped with unexpected state: %s.", StateAsCString(stop_state)); - return_value = lldb::eExecutionInterrupted; + return_value = eExecutionInterrupted; break; } if (keep_going) @@ -2956,7 +2956,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, { if (log) log->Printf ("got_event was true, but the event pointer was null. How odd..."); - return_value = lldb::eExecutionInterrupted; + return_value = eExecutionInterrupted; break; } } @@ -3019,7 +3019,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, if (log) log->Printf ("Process::RunThreadPlan(): Even though we timed out, the call plan was done. " "Exiting wait loop."); - return_value = lldb::eExecutionCompleted; + return_value = eExecutionCompleted; break; } @@ -3027,7 +3027,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, { if (log) log->Printf ("try_all_threads was false, we stopped so now we're quitting."); - return_value = lldb::eExecutionInterrupted; + return_value = eExecutionInterrupted; break; } @@ -3046,7 +3046,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, // Running all threads failed, so return Interrupted. if (log) log->Printf("Process::RunThreadPlan(): running all threads timed out."); - return_value = lldb::eExecutionInterrupted; + return_value = eExecutionInterrupted; break; } } @@ -3055,7 +3055,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, { if (log) log->Printf("Process::RunThreadPlan(): halt said it succeeded, but I got no event. " "I'm getting out of here passing Interrupted."); - return_value = lldb::eExecutionInterrupted; + return_value = eExecutionInterrupted; break; } } @@ -3075,7 +3075,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, // This is not going anywhere, bag out. if (log) log->Printf ("Process::RunThreadPlan(): halt failed: and waiting for the stopped event failed."); - return_value = lldb::eExecutionInterrupted; + return_value = eExecutionInterrupted; break; } else @@ -3093,7 +3093,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, if (log) log->Printf ("Process::RunThreadPlan(): Even though we timed out, the call plan was done. " "Exiting wait loop."); - return_value = lldb::eExecutionCompleted; + return_value = eExecutionCompleted; break; } @@ -3112,7 +3112,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, // Running all threads failed, so return Interrupted. if (log) log->Printf("Process::RunThreadPlan(): running all threads timed out."); - return_value = lldb::eExecutionInterrupted; + return_value = eExecutionInterrupted; break; } } @@ -3120,7 +3120,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, { log->Printf ("Process::RunThreadPlan(): halt failed, I waited and didn't get" " a stopped event, instead got %s.", StateAsCString(stop_state)); - return_value = lldb::eExecutionInterrupted; + return_value = eExecutionInterrupted; break; } } @@ -3230,13 +3230,13 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, { if (log) log->Printf("Process::RunThreadPlan(): thread plan is done"); - return_value = lldb::eExecutionCompleted; + return_value = eExecutionCompleted; } else if (exe_ctx.thread->WasThreadPlanDiscarded (thread_plan_sp.get())) { if (log) log->Printf("Process::RunThreadPlan(): thread plan was discarded"); - return_value = lldb::eExecutionDiscarded; + return_value = eExecutionDiscarded; } else { @@ -3279,19 +3279,19 @@ Process::ExecutionResultAsCString (ExecutionResults result) switch (result) { - case lldb::eExecutionCompleted: + case eExecutionCompleted: result_name = "eExecutionCompleted"; break; - case lldb::eExecutionDiscarded: + case eExecutionDiscarded: result_name = "eExecutionDiscarded"; break; - case lldb::eExecutionInterrupted: + case eExecutionInterrupted: result_name = "eExecutionInterrupted"; break; - case lldb::eExecutionSetupError: + case eExecutionSetupError: result_name = "eExecutionSetupError"; break; - case lldb::eExecutionTimedOut: + case eExecutionTimedOut: result_name = "eExecutionTimedOut"; break; } @@ -3411,7 +3411,7 @@ ProcessInstanceSettings::UpdateInstanceSettingsVariable (const ConstString &var_ const char *value, const ConstString &instance_name, const SettingEntry &entry, - lldb::VarSetOperationType op, + VarSetOperationType op, Error &err, bool pending) { diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index 8cc0a725125..3dc11049f6c 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -1314,7 +1314,7 @@ Target::SettingsController::SetGlobalVariable (const ConstString &var_name, const char *index_value, const char *value, const SettingEntry &entry, - const lldb::VarSetOperationType op, + const VarSetOperationType op, Error&err) { if (var_name == GetSettingNameForDefaultArch()) @@ -1357,10 +1357,7 @@ TargetInstanceSettings::TargetInstanceSettings ) : InstanceSettings (owner, name ? name : InstanceSettings::InvalidName().AsCString(), live_instance), m_expr_prefix_path (), - m_expr_prefix_contents (), - m_execution_level (eExecutionLevelAuto), - m_execution_mode (eExecutionModeAuto), - m_execution_os_type (eExecutionOSTypeAuto) + m_expr_prefix_contents () { // CopyInstanceSettings is a pure virtual function in InstanceSettings; it therefore cannot be called // until the vtables for TargetInstanceSettings are properly set up, i.e. AFTER all the initializers. @@ -1412,12 +1409,10 @@ TargetInstanceSettings::UpdateInstanceSettingsVariable (const ConstString &var_n const char *value, const ConstString &instance_name, const SettingEntry &entry, - lldb::VarSetOperationType op, + VarSetOperationType op, Error &err, bool pending) { - int new_enum = -1; - if (var_name == GetSettingNameForExpressionPrefix ()) { switch (op) @@ -1426,7 +1421,7 @@ TargetInstanceSettings::UpdateInstanceSettingsVariable (const ConstString &var_n err.SetErrorToGenericError (); err.SetErrorString ("Unrecognized operation. Cannot update value.\n"); return; - case lldb::eVarSetOperationAssign: + case eVarSetOperationAssign: { FileSpec file_spec(value, true); @@ -1450,34 +1445,16 @@ TargetInstanceSettings::UpdateInstanceSettingsVariable (const ConstString &var_n m_expr_prefix_contents.assign(reinterpret_cast<const char *>(data_sp->GetBytes()), data_sp->GetByteSize()); } return; - case lldb::eVarSetOperationAppend: + case eVarSetOperationAppend: err.SetErrorToGenericError (); err.SetErrorString ("Cannot append to a path.\n"); return; - case lldb::eVarSetOperationClear: + case eVarSetOperationClear: m_expr_prefix_path.clear (); m_expr_prefix_contents.clear (); return; } } - else if (var_name == GetSettingNameForExecutionLevel ()) - { - UserSettingsController::UpdateEnumVariable (entry.enum_values, &new_enum, value, err); - if (err.Success()) - m_execution_level = (ExecutionLevel)new_enum; - } - else if (var_name == GetSettingNameForExecutionMode ()) - { - UserSettingsController::UpdateEnumVariable (entry.enum_values, &new_enum, value, err); - if (err.Success()) - m_execution_mode = (ExecutionMode)new_enum; - } - else if (var_name == GetSettingNameForExecutionOSType ()) - { - UserSettingsController::UpdateEnumVariable (entry.enum_values, &new_enum, value, err); - if (err.Success()) - m_execution_os_type = (ExecutionOSType)new_enum; - } } void @@ -1490,9 +1467,6 @@ TargetInstanceSettings::CopyInstanceSettings (const lldb::InstanceSettingsSP &ne m_expr_prefix_path = new_settings_ptr->m_expr_prefix_path; m_expr_prefix_contents = new_settings_ptr->m_expr_prefix_contents; - m_execution_level = new_settings_ptr->m_execution_level; - m_execution_mode = new_settings_ptr->m_execution_mode; - m_execution_os_type = new_settings_ptr->m_execution_os_type; } bool @@ -1505,18 +1479,6 @@ TargetInstanceSettings::GetInstanceSettingsValue (const SettingEntry &entry, { value.AppendString (m_expr_prefix_path.c_str(), m_expr_prefix_path.size()); } - else if (var_name == GetSettingNameForExecutionLevel ()) - { - value.AppendString (UserSettingsController::EnumToString (entry.enum_values, m_execution_level)); - } - else if (var_name == GetSettingNameForExecutionMode ()) - { - value.AppendString (UserSettingsController::EnumToString (entry.enum_values, m_execution_mode)); - } - else if (var_name == GetSettingNameForExecutionOSType ()) - { - value.AppendString (UserSettingsController::EnumToString (entry.enum_values, m_execution_os_type)); - } else { if (err) @@ -1553,45 +1515,11 @@ Target::SettingsController::global_settings_table[] = { NULL , eSetVarTypeNone , NULL , NULL, false, false, NULL } }; -static lldb::OptionEnumValueElement -g_execution_level_enums[] = -{ - { eExecutionLevelAuto , "auto" , "Automatically detect the execution level (user/kernel)." }, - { eExecutionLevelKernel , "kernel" , "Treat executables as kernel executables." }, - { eExecutionLevelUser , "user" , "Treat executables as user space executables." }, - { 0 , NULL , NULL } -}; - -static lldb::OptionEnumValueElement -g_execution_mode_enums[] = -{ - { eExecutionModeAuto , "auto" , "Automatically detect the execution mode (static/dynamic)." }, - { eExecutionModeStatic , "static" , "All executables are static and addresses at the virtual addresses in the object files." }, - { eExecutionModeDynamic , "dynamic" , "Executables and shared libraries are dynamically loaded.." }, - { 0 , NULL , NULL } -}; - -static lldb::OptionEnumValueElement -g_execution_os_enums[] = -{ - { eExecutionOSTypeAuto , "auto" , "Automatically detect the execution OS (none/halted/live)." }, - { eExecutionOSTypeNone , "none" , "There is no operating system available (no processes or threads)." }, - { eExecutionOSTypeHalted, "halted" , "There is an operating system, but it is halted when the debugger is halted. " - "Processes and threads must be discovered by accessing symbols and reading " - "memory." }, - { eExecutionOSTypeLive , "live" , "There is a live operating system with debug services that can be used to " - "get processes, threads and theirs states." }, - { 0, NULL, NULL } -}; - SettingEntry Target::SettingsController::instance_settings_table[] = { - // var-name var-type default enum-table init'd hidden help-text - // ================= ================== =========== ========================= ====== ====== ========================================================================= - { TSC_EXPR_PREFIX , eSetVarTypeString , NULL , NULL , false, false, "Path to a file containing expressions to be prepended to all expressions." }, - { TSC_EXEC_LEVEL , eSetVarTypeEnum , "auto" , g_execution_level_enums , false, false, "Sets the execution level for a target." }, - { TSC_EXEC_MODE , eSetVarTypeEnum , "auto" , g_execution_mode_enums , false, false, "Sets the execution mode for a target." }, - { TSC_EXEC_OS_TYPE , eSetVarTypeEnum , "auto" , g_execution_os_enums , false, false, "Sets the execution OS for a target." }, - { NULL , eSetVarTypeNone , NULL , NULL , false, false, NULL } + // var-name var-type default enum init'd hidden help-text + // ================= ================== =========== ==== ====== ====== ========================================================================= + { TSC_EXPR_PREFIX , eSetVarTypeString , NULL , NULL, false, false, "Path to a file containing expressions to be prepended to all expressions." }, + { NULL , eSetVarTypeNone , NULL , NULL, false, false, NULL } }; diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp index 6c1dc40a7b7..95685e961f5 100644 --- a/lldb/source/Target/Thread.cpp +++ b/lldb/source/Target/Thread.cpp @@ -1190,7 +1190,7 @@ ThreadInstanceSettings::UpdateInstanceSettingsVariable (const ConstString &var_n const char *value, const ConstString &instance_name, const SettingEntry &entry, - lldb::VarSetOperationType op, + VarSetOperationType op, Error &err, bool pending) { diff --git a/lldb/source/Target/ThreadList.cpp b/lldb/source/Target/ThreadList.cpp index 3a54c5747d5..408395a199d 100644 --- a/lldb/source/Target/ThreadList.cpp +++ b/lldb/source/Target/ThreadList.cpp @@ -263,7 +263,7 @@ ThreadList::ShouldReportStop (Event *event_ptr) ThreadSP thread_sp(*pos); if (thread_sp->ThreadStoppedForAReason() && (thread_sp->GetResumeState () != eStateSuspended)) { - const lldb::Vote vote = thread_sp->ShouldReportStop (event_ptr); + const Vote vote = thread_sp->ShouldReportStop (event_ptr); if (log) log->Printf ("%s thread 0x%4.4x: pc = 0x%16.16llx, vote = %s", __FUNCTION__, diff --git a/lldb/source/Target/ThreadPlanStepOverRange.cpp b/lldb/source/Target/ThreadPlanStepOverRange.cpp index c7bffb97e8d..adade557f7a 100644 --- a/lldb/source/Target/ThreadPlanStepOverRange.cpp +++ b/lldb/source/Target/ThreadPlanStepOverRange.cpp @@ -110,8 +110,8 @@ ThreadPlanStepOverRange::ShouldStop (Event *event_ptr) NULL, true, stop_others, - lldb::eVoteNo, - lldb::eVoteNoOpinion, + eVoteNo, + eVoteNoOpinion, 0); } else if (!InSymbol()) diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp index f6a30ed7052..b6473c610f9 100644 --- a/lldb/source/lldb.cpp +++ b/lldb/source/lldb.cpp @@ -193,7 +193,7 @@ lldb_private::GetVersion () } const char * -lldb_private::GetVoteAsCString (lldb::Vote vote) +lldb_private::GetVoteAsCString (Vote vote) { switch (vote) { @@ -208,7 +208,7 @@ lldb_private::GetVoteAsCString (lldb::Vote vote) const char * -lldb_private::GetSectionTypeAsCString (lldb::SectionType sect_type) +lldb_private::GetSectionTypeAsCString (SectionType sect_type) { switch (sect_type) { @@ -247,7 +247,7 @@ lldb_private::GetSectionTypeAsCString (lldb::SectionType sect_type) bool lldb_private::NameMatches (const char *name, - lldb::NameMatchType match_type, + NameMatchType match_type, const char *match) { if (match_type == eNameMatchIgnore) diff --git a/lldb/tools/driver/Driver.cpp b/lldb/tools/driver/Driver.cpp index bfd706562af..77c6fc2955c 100644 --- a/lldb/tools/driver/Driver.cpp +++ b/lldb/tools/driver/Driver.cpp @@ -51,39 +51,33 @@ reset_stdin_termios () ::tcsetattr (STDIN_FILENO, TCSANOW, &g_old_stdin_termios); } -static lldb::OptionDefinition g_options[] = +typedef struct { - { LLDB_OPT_SET_1, true, "help", 'h', no_argument, NULL, NULL, eArgTypeNone, - "Prints out the usage information for the LLDB debugger." }, - - { LLDB_OPT_SET_2, true, "version", 'v', no_argument, NULL, NULL, eArgTypeNone, - "Prints out the current version number of the LLDB debugger." }, - - { LLDB_OPT_SET_3, true, "arch", 'a', required_argument, NULL, NULL, eArgTypeArchitecture, - "Tells the debugger to use the specified architecture when starting and running the program. <architecture> must be one of the architectures for which the program was compiled." }, - - { LLDB_OPT_SET_3 | LLDB_OPT_SET_4, false, "script-language",'l', required_argument, NULL, NULL, eArgTypeScriptLang, - "Tells the debugger to use the specified scripting language for user-defined scripts, rather than the default. Valid scripting languages that can be specified include Python, Perl, Ruby and Tcl. Currently only the Python extensions have been implemented." }, - - { LLDB_OPT_SET_3 | LLDB_OPT_SET_4, false, "debug", 'd', no_argument, NULL, NULL, eArgTypeNone, - "Tells the debugger to print out extra information for debugging itself." }, - - { LLDB_OPT_SET_3 | LLDB_OPT_SET_4, false, "source", 's', required_argument, NULL, NULL, eArgTypeFilename, - "Tells the debugger to read in and execute the file <file>, which should contain lldb commands." }, - - { LLDB_OPT_SET_3, true, "file", 'f', required_argument, NULL, NULL, eArgTypeFilename, - "Tells the debugger to use the file <filename> as the program to be debugged." }, - - { LLDB_OPT_SET_ALL, false, "editor", 'e', no_argument, NULL, NULL, eArgTypeNone, - "Tells the debugger to open source files using the host's \"external editor\" mechanism." }, - - { LLDB_OPT_SET_ALL, false, "no-lldbinit", 'n', no_argument, NULL, NULL, eArgTypeNone, - "Do not automatically parse any '.lldbinit' files." }, - -// { LLDB_OPT_SET_4, true, "crash-log", 'c', required_argument, NULL, NULL, eArgTypeFilename, -// "Load executable images from a crash log for symbolication." }, - - { 0, false, NULL, 0, 0, NULL, NULL, eArgTypeNone, NULL } + uint32_t usage_mask; // Used to mark options that can be used together. If (1 << n & usage_mask) != 0 + // then this option belongs to option set n. + bool required; // This option is required (in the current usage level) + const char * long_option; // Full name for this option. + char short_option; // Single character for this option. + int option_has_arg; // no_argument, required_argument or optional_argument + uint32_t completionType; // Cookie the option class can use to do define the argument completion. + lldb::CommandArgumentType argument_type; // Type of argument this option takes + const char * usage_text; // Full text explaining what this options does and what (if any) argument to + // pass it. +} OptionDefinition; + + +static OptionDefinition g_options[] = +{ + { LLDB_OPT_SET_1, true , "help" , 'h', no_argument , NULL, eArgTypeNone, "Prints out the usage information for the LLDB debugger." }, + { LLDB_OPT_SET_2, true , "version" , 'v', no_argument , NULL, eArgTypeNone, "Prints out the current version number of the LLDB debugger." }, + { LLDB_OPT_SET_3, true , "arch" , 'a', required_argument, NULL, eArgTypeArchitecture,"Tells the debugger to use the specified architecture when starting and running the program. <architecture> must be one of the architectures for which the program was compiled." }, + { LLDB_OPT_SET_3 | LLDB_OPT_SET_4, false, "script-language", 'l', required_argument, NULL, eArgTypeScriptLang,"Tells the debugger to use the specified scripting language for user-defined scripts, rather than the default. Valid scripting languages that can be specified include Python, Perl, Ruby and Tcl. Currently only the Python extensions have been implemented." }, + { LLDB_OPT_SET_3 | LLDB_OPT_SET_4, false, "debug" , 'd', no_argument , NULL, eArgTypeNone,"Tells the debugger to print out extra information for debugging itself." }, + { LLDB_OPT_SET_3 | LLDB_OPT_SET_4, false, "source" , 's', required_argument, NULL, eArgTypeFilename, "Tells the debugger to read in and execute the file <file>, which should contain lldb commands." }, + { LLDB_OPT_SET_3, true , "file" , 'f', required_argument, NULL, eArgTypeFilename, "Tells the debugger to use the file <filename> as the program to be debugged." }, + { LLDB_OPT_SET_ALL, false, "editor" , 'e', no_argument , NULL, eArgTypeNone, "Tells the debugger to open source files using the host's \"external editor\" mechanism." }, + { LLDB_OPT_SET_ALL, false, "no-lldbinit" , 'n', no_argument , NULL, eArgTypeNone, "Do not automatically parse any '.lldbinit' files." }, + { 0, false, NULL , 0 , 0 , NULL, eArgTypeNone, NULL } }; @@ -182,7 +176,7 @@ OutputFormattedUsageText (FILE *out, int indent, const char *text, int output_ma } void -ShowUsage (FILE *out, lldb::OptionDefinition *option_table, Driver::OptionData data) +ShowUsage (FILE *out, OptionDefinition *option_table, Driver::OptionData data) { uint32_t screen_width = 80; uint32_t indent_level = 0; @@ -306,7 +300,7 @@ ShowUsage (FILE *out, lldb::OptionDefinition *option_table, Driver::OptionData d } void -BuildGetOptTable (lldb::OptionDefinition *expanded_option_table, std::vector<struct option> &getopt_table, +BuildGetOptTable (OptionDefinition *expanded_option_table, std::vector<struct option> &getopt_table, uint32_t num_options) { if (num_options == 0) diff --git a/lldb/tools/driver/Driver.h b/lldb/tools/driver/Driver.h index 37d5eed7ce3..ffeef8951c9 100644 --- a/lldb/tools/driver/Driver.h +++ b/lldb/tools/driver/Driver.h @@ -94,7 +94,7 @@ public: void Clear(); - //static lldb::OptionDefinition m_cmd_option_table[]; + //static OptionDefinition m_cmd_option_table[]; std::vector<std::string> m_args; lldb::ScriptLanguage m_script_lang; |
