From ce619231417379e6757caa059ecf184ad0245afe Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Sat, 22 Dec 2018 20:43:23 -0500
Subject: [PATCH] renamed api calls
---
include/dollop.h | 4 ++--
include/dollop_man.h | 2 +-
include/memory_space.h | 1 +
include/zipr.h | 2 +-
include/zipr_plugin.h | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/dollop.h b/include/dollop.h
index 352bdec..df3cdf3 100644
--- a/include/dollop.h
+++ b/include/dollop.h
@@ -140,9 +140,9 @@ class Dollop_t : public Placeable_t, public std::list<DollopEntry_t*> {
void WasCoalesced(bool coalesced);
bool WasCoalesced(void) const { return m_coalesced; }
- void ReCalculateWorstCaseSize();
+ void ReCalculateSize();
private:
- size_t CalculateWorstCaseSize();
+ size_t CalculateSize();
size_t m_size;
Dollop_t *m_fallthrough_dollop, *m_fallback_dollop;
bool m_fallthrough_patched;
diff --git a/include/dollop_man.h b/include/dollop_man.h
index 370c95c..e7a0ae1 100644
--- a/include/dollop_man.h
+++ b/include/dollop_man.h
@@ -50,7 +50,7 @@ class DollopManager_t {
public:
DollopManager_t() {};
- virtual size_t DetermineWorstCaseDollopEntrySize(DollopEntry_t *entry)=0;
+ virtual size_t DetermineDollopEntrySize(DollopEntry_t *entry)=0;
/*
* Add a dollop and all its fallthrough dollops
diff --git a/include/memory_space.h b/include/memory_space.h
index fa4439a..97b5833 100644
--- a/include/memory_space.h
+++ b/include/memory_space.h
@@ -49,6 +49,7 @@ class MemorySpace_t : public std::map<RangeAddress_t,char>
virtual void MergeFreeRange(Range_t range)=0;
virtual RangeSet_t::iterator FindFreeRange(RangeAddress_t addr)=0;
virtual Range_t GetFreeRange(int size)=0;
+ virtual Range_t GetInfiniteFreeRange()=0;
virtual std::list<Range_t> GetFreeRanges(size_t size = 0) = 0;
virtual std::pair<RangeSet_t::const_iterator,RangeSet_t::const_iterator>
GetNearbyFreeRanges(const RangeAddress_t hint, size_t count = 0) = 0;
diff --git a/include/zipr.h b/include/zipr.h
index 18caa4e..d4199db 100644
--- a/include/zipr.h
+++ b/include/zipr.h
@@ -48,7 +48,7 @@ class Zipr_t
/*
* These are public functions that the SDK user way want to use.
*/
- virtual size_t DetermineWorstCaseDollopEntrySize(DollopEntry_t*, bool account_for_fallthrough) = 0;
+ virtual size_t DetermineDollopEntrySize(DollopEntry_t*, bool account_for_fallthrough) = 0;
virtual Zipr_SDK::RangeAddress_t PlopDollopEntry(
DollopEntry_t *,
diff --git a/include/zipr_plugin.h b/include/zipr_plugin.h
index c5d5903..7ed59a5 100644
--- a/include/zipr_plugin.h
+++ b/include/zipr_plugin.h
@@ -40,7 +40,7 @@ class ZiprPluginInterface_t
return false;
}
- virtual size_t WorstCaseInsnSize(libIRDB::Instruction_t*, bool)
+ virtual size_t InsnSize(libIRDB::Instruction_t*, bool)
{
return 0;
}
--
GitLab