diff options
| author | Glenn Smith <glenn@vector35.com> | 2024-05-06 01:35:28 -0400 |
|---|---|---|
| committer | Glenn Smith <glenn@vector35.com> | 2024-05-06 01:35:28 -0400 |
| commit | 8545938549657567771421066113647027189369 (patch) | |
| tree | f2205a5f47aca5369f42ea189735e8c527d860a1 | |
| parent | fe5045fec38f06d1bb16b9f052dda79dfab6b4ef (diff) | |
Use a flags enum for address offset display
| -rw-r--r-- | binaryninjacore.h | 17 | ||||
| -rw-r--r-- | ui/disassemblyview.h | 3 | ||||
| -rw-r--r-- | ui/linearview.h | 2 |
3 files changed, 8 insertions, 14 deletions
diff --git a/binaryninjacore.h b/binaryninjacore.h index 86b57ebd..ab638f3b 100644 --- a/binaryninjacore.h +++ b/binaryninjacore.h @@ -705,21 +705,14 @@ extern "C" { AbsoluteDisassemblyAddressMode, RelativeToBinaryStartDisassemblyAddressMode, - NameAndRelativeToBinaryStartDisassemblyAddressMode, RelativeToSegmentStartDisassemblyAddressMode, - NameAndRelativeToSegmentStartDisassemblyAddressMode, RelativeToSectionStartDisassemblyAddressMode, - NameAndRelativeToSectionStartDisassemblyAddressMode, RelativeToFunctionStartDisassemblyAddressMode, - NameAndRelativeToFunctionStartDisassemblyAddressMode, - DecimalRelativeToBinaryStartDisassemblyAddressMode, - DecimalNameAndRelativeToBinaryStartDisassemblyAddressMode, - DecimalRelativeToSegmentStartDisassemblyAddressMode, - DecimalNameAndRelativeToSegmentStartDisassemblyAddressMode, - DecimalRelativeToSectionStartDisassemblyAddressMode, - DecimalNameAndRelativeToSectionStartDisassemblyAddressMode, - DecimalRelativeToFunctionStartDisassemblyAddressMode, - DecimalNameAndRelativeToFunctionStartDisassemblyAddressMode, + DisassemblyAddressModeMask = 0xFFFF, + + IncludeNameDisassemblyAddressModeFlag = 0x10000, + DecimalDisassemblyAddressModeFlag = 0x20000, + DisassemblyAddressModeFlagsMask = 0xFFFF0000, } BNDisassemblyAddressMode; typedef enum BNTypeClass diff --git a/ui/disassemblyview.h b/ui/disassemblyview.h index 09f297bc..74dcb2fe 100644 --- a/ui/disassemblyview.h +++ b/ui/disassemblyview.h @@ -5,6 +5,7 @@ #include <QtWidgets/QSplitter> #include <QtWidgets/QLabel> #include <mutex> +#include <optional> #include "binaryninjaapi.h" #include "viewframe.h" #include "instructionedit.h" @@ -75,7 +76,7 @@ class BINARYNINJAUIAPI DisassemblyView : public FlowGraphWidget void setOption(BNDisassemblyOption option, bool state = true); void toggleOption(BNDisassemblyOption option); - void setAddressMode(BNDisassemblyAddressMode mode); + void setAddressMode(std::optional<BNDisassemblyAddressMode> mode, std::optional<bool> hex, std::optional<bool> withName); void setDisplayedFileName(); virtual DisassemblySettingsRef getDisassemblySettings() override; diff --git a/ui/linearview.h b/ui/linearview.h index b15f124e..aee26547 100644 --- a/ui/linearview.h +++ b/ui/linearview.h @@ -478,7 +478,7 @@ public: void setContrast(HexEditorHighlightContrast mode); void toggleOption(BNDisassemblyOption option); - void setAddressMode(BNDisassemblyAddressMode mode); + void setAddressMode(std::optional<BNDisassemblyAddressMode> mode, std::optional<bool> hex, std::optional<bool> withName); void setDisplayedFileName(); virtual bool goToReference(FunctionRef func, uint64_t source, uint64_t target) override; |