diff options
| -rw-r--r-- | basicblock.cpp | 12 | ||||
| -rw-r--r-- | binaryninjaapi.h | 2 | ||||
| -rw-r--r-- | binaryninjacore.h | 11 | ||||
| -rw-r--r-- | ui/disassemblyview.h | 2 | ||||
| -rw-r--r-- | ui/linearview.h | 1 | ||||
| -rw-r--r-- | ui/uitypes.h | 4 |
6 files changed, 29 insertions, 3 deletions
diff --git a/basicblock.cpp b/basicblock.cpp index e178bd6e..f8ccf6d6 100644 --- a/basicblock.cpp +++ b/basicblock.cpp @@ -144,6 +144,18 @@ void DisassemblySettings::SetCallParameterHints(BNDisassemblyCallParameterHints } +BNDisassemblyBlockLabels DisassemblySettings::GetBlockLabels() const +{ + return BNGetDisassemblyBlockLabels(m_object); +} + + +void DisassemblySettings::SetBlockLabels(BNDisassemblyBlockLabels labels) +{ + BNSetDisassemblyBlockLabels(m_object, labels); +} + + BNDisassemblyTextLineTypeInfo DisassemblyTextLineTypeInfo::GetAPIObject() const { BNDisassemblyTextLineTypeInfo result; diff --git a/binaryninjaapi.h b/binaryninjaapi.h index de8d7094..56009438 100644 --- a/binaryninjaapi.h +++ b/binaryninjaapi.h @@ -11548,6 +11548,8 @@ namespace BinaryNinja { void SetAddressBaseOffset(uint64_t addressBaseOffset); BNDisassemblyCallParameterHints GetCallParameterHints() const; void SetCallParameterHints(BNDisassemblyCallParameterHints hints); + BNDisassemblyBlockLabels GetBlockLabels() const; + void SetBlockLabels(BNDisassemblyBlockLabels labels); }; /*! diff --git a/binaryninjacore.h b/binaryninjacore.h index 57d26de2..010fc06a 100644 --- a/binaryninjacore.h +++ b/binaryninjacore.h @@ -37,7 +37,7 @@ // Current ABI version for linking to the core. This is incremented any time // there are changes to the API that affect linking, including new functions, // new types, or modifications to existing functions or types. -#define BN_CURRENT_CORE_ABI_VERSION 131 +#define BN_CURRENT_CORE_ABI_VERSION 132 // Minimum ABI version that is supported for loading of plugins. Plugins that // are linked to an ABI version less than this will not be able to load and @@ -774,6 +774,13 @@ extern "C" NeverShowParameterHints, } BNDisassemblyCallParameterHints; + typedef enum BNDisassemblyBlockLabels + { + NeverShowDefaultBlockLabels, + AlwaysShowBlockLabels, + NeverShowBlockLabels, + } BNDisassemblyBlockLabels; + typedef enum BNTypeClass { VoidTypeClass = 0, @@ -5833,6 +5840,8 @@ extern "C" BINARYNINJACOREAPI void BNSetDisassemblyAddressBaseOffset(BNDisassemblySettings* settings, uint64_t addressBaseOffset); BINARYNINJACOREAPI BNDisassemblyCallParameterHints BNGetDisassemblyCallParameterHints(BNDisassemblySettings* settings); BINARYNINJACOREAPI void BNSetDisassemblyCallParameterHints(BNDisassemblySettings* settings, BNDisassemblyCallParameterHints hints); + BINARYNINJACOREAPI BNDisassemblyBlockLabels BNGetDisassemblyBlockLabels(BNDisassemblySettings* settings); + BINARYNINJACOREAPI void BNSetDisassemblyBlockLabels(BNDisassemblySettings* settings, BNDisassemblyBlockLabels labels); // Flow graphs BINARYNINJACOREAPI BNFlowGraph* BNCreateFlowGraph(void); diff --git a/ui/disassemblyview.h b/ui/disassemblyview.h index 024ef33e..94d938a6 100644 --- a/ui/disassemblyview.h +++ b/ui/disassemblyview.h @@ -78,6 +78,7 @@ class BINARYNINJAUIAPI DisassemblyView : public FlowGraphWidget void toggleOption(BNDisassemblyOption option); void setAddressMode(std::optional<BNDisassemblyAddressMode> mode, std::optional<bool> hex, std::optional<bool> withName); void setCallParamHints(BNDisassemblyCallParameterHints hints); + void setBlockLabels(BNDisassemblyBlockLabels labels); void setDisplayedFileName(); void setAddressBaseOffset(bool toHere); @@ -142,6 +143,7 @@ class BINARYNINJAUIAPI DisassemblyView : public FlowGraphWidget std::set<BNDisassemblyOption> m_options; BNDisassemblyAddressMode m_addressMode; BNDisassemblyCallParameterHints m_callParamHints; + BNDisassemblyBlockLabels m_blockLabels; DisassemblyContainer* m_container; SettingsRef m_settings; std::set<std::string> m_layers; diff --git a/ui/linearview.h b/ui/linearview.h index 9ba28407..17ab6764 100644 --- a/ui/linearview.h +++ b/ui/linearview.h @@ -511,6 +511,7 @@ public: void toggleOption(BNDisassemblyOption option); void setAddressMode(std::optional<BNDisassemblyAddressMode> mode, std::optional<bool> hex, std::optional<bool> withName); void setCallParamHints(BNDisassemblyCallParameterHints hints); + void setBlockLabels(BNDisassemblyBlockLabels labels); void setDisplayedFileName(); void setAddressBaseOffset(bool toHere); diff --git a/ui/uitypes.h b/ui/uitypes.h index b0197adc..476c0d79 100644 --- a/ui/uitypes.h +++ b/ui/uitypes.h @@ -6,14 +6,14 @@ // there are changes to the API that affect linking, including new functions, // new types, modifications to existing functions or types, or new versions // of the Qt libraries. -#define BN_CURRENT_UI_ABI_VERSION 10 +#define BN_CURRENT_UI_ABI_VERSION 11 // Minimum ABI version that is supported for loading of plugins. Plugins that // are linked to an ABI version less than this will not be able to load and // will require rebuilding. The minimum version is increased when there are // incompatible changes that break binary compatibility, such as changes to // existing types or functions, or a new version of Qt. -#define BN_MINIMUM_UI_ABI_VERSION 9 +#define BN_MINIMUM_UI_ABI_VERSION 11 #ifdef __GNUC__ #ifdef BINARYNINJAUI_LIBRARY |