Merge branch 'dev' into fpu

1 files changed, 20 insertions, 1 deletions

diff --git a/binaryview.cpp b/binaryview.cpp
index 213be79a..50011a0f 100644
--- a/binaryview.cpp
+++ b/binaryview.cpp
@@ -288,6 +288,7 @@ BinaryView::BinaryView(const std::string& typeName, FileMetadata* file, BinaryVi
 	view.getEntryPoint = GetEntryPointCallback;
 	view.isExecutable = IsExecutableCallback;
 	view.getDefaultEndianness = GetDefaultEndiannessCallback;
+	view.isRelocatable = IsRelocatableCallback;
 	view.getAddressSize = GetAddressSizeCallback;
 	view.save = SaveCallback;
 
@@ -431,6 +432,13 @@ BNEndianness BinaryView::GetDefaultEndiannessCallback(void* ctxt)
 }
 
 
+bool BinaryView::IsRelocatableCallback(void* ctxt)
+{
+	BinaryView* view = (BinaryView*)ctxt;
+	return view->PerformIsRelocatable();
+}
+
+
 size_t BinaryView::GetAddressSizeCallback(void* ctxt)
 {
 	BinaryView* view = (BinaryView*)ctxt;
@@ -494,6 +502,11 @@ BNEndianness BinaryView::PerformGetDefaultEndianness() const
 }
 
 
+bool BinaryView::PerformIsRelocatable() const
+{
+	return false;
+}
+
 size_t BinaryView::PerformGetAddressSize() const
 {
 	Ref<Architecture> arch = GetDefaultArchitecture();
@@ -836,6 +849,12 @@ BNEndianness BinaryView::GetDefaultEndianness() const
 }
 
 
+bool BinaryView::IsRelocatable() const
+{
+	return BNIsRelocatable(m_object);
+}
+
+
 size_t BinaryView::GetAddressSize() const
 {
 	return BNGetViewAddressSize(m_object);
@@ -1705,6 +1724,7 @@ vector<Segment> BinaryView::GetSegments()
 		segment.dataOffset = segments[i].dataOffset;
 		segment.dataLength = segments[i].dataLength;
 		segment.flags = segments[i].flags;
+		segment.autoDefined = segments[i].autoDefined;
 		result.push_back(segment);
 	}
 
@@ -1712,7 +1732,6 @@ vector<Segment> BinaryView::GetSegments()
 	return result;
 }
 
-
 bool BinaryView::GetSegmentAt(uint64_t addr, Segment& result)
 {
 	BNSegment segment;