Make DollopManager_t public to the API and implement internally.

include/zipr_dollop_man.h

@@ -33,7 +33,7 @@
 
 #include <dollop.h>
 
-class ZiprDollopManager_t {
+class ZiprDollopManager_t : public DollopManager_t {
 	public:
 		ZiprDollopManager_t() : m_refresh_stats(true) {}
 		void AddDollops(Dollop_t *dollop_head);
@@ -64,7 +64,7 @@ class ZiprDollopManager_t {
 		}
 		friend std::ostream &operator<<(std::ostream &out, const ZiprDollopManager_t &dollop_man);
 		void PrintStats(std::ostream &out);
-		void PrintPlacementMap(const ZiprMemorySpace_t &memory_space,
+		void PrintPlacementMap(const MemorySpace_t &memory_space,
 		                       const std::string &map_filename);
 	private:
 		void AddDollop(Dollop_t *dollop);

include/zipr_impl.h

@@ -338,6 +338,7 @@ class ZiprImpl_t : public Zipr_t
 		void dump_map();
 
                 virtual Zipr_SDK::MemorySpace_t *GetMemorySpace() { return &memory_space; }
+		virtual Zipr_SDK::DollopManager_t *GetDollopManager() { return &m_dollop_mgr; }
                 virtual ELFIO::elfio *GetELFIO() { return elfiop; }
                 virtual libIRDB::FileIR_t *GetFileIR() { return m_firp; }
                 virtual Zipr_SDK::InstructionLocationMap_t *GetLocationMap() { return &final_insn_locations; }

src/zipr_dollop_man.cpp

@@ -289,9 +289,10 @@ namespace zipr {
 	map_output << endl << std::hex << (x) << ": ";
 
 	void ZiprDollopManager_t::PrintPlacementMap(
-		const ZiprMemorySpace_t &memory_space,
+		const MemorySpace_t &_memory_space,
 		const std::string &map_filename)
 	{
+		const ZiprMemorySpace_t &memory_space = static_cast<const ZiprMemorySpace_t &>(_memory_space);
 		RangeSet_t original_ranges = memory_space.GetOriginalFreeRanges();
 		RangeSet_t::const_iterator range_it, range_it_end;
 		ofstream map_output(map_filename.c_str(), std::ofstream::out);