From a43084f0fdc476bc914f62b6a80d0dd81ea18cca Mon Sep 17 00:00:00 2001 From: whh8b <whh8b@git.zephyr-software.com> Date: Thu, 17 Dec 2015 19:08:46 +0000 Subject: [PATCH] Update Plop* functions to take dollop entries. --- include/zipr.h | 19 ++++++++++++++++--- include/zipr_plugin.h | 5 ++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/zipr.h b/include/zipr.h index 6cca4e6..ecd5676 100644 --- a/include/zipr.h +++ b/include/zipr.h @@ -66,9 +66,22 @@ class Zipr_t * way want to use. */ virtual int DetermineWorstCaseInsnSize(libIRDB::Instruction_t*, bool account_for_jump = true) = 0; - virtual Zipr_SDK::RangeAddress_t PlopDollopEntry(Zipr_SDK::DollopEntry_t *) = 0; - virtual Zipr_SDK::RangeAddress_t PlopWithTarget(Zipr_SDK::DollopEntry_t*) = 0; - virtual Zipr_SDK::RangeAddress_t PlopWithCallback(DollopEntry_t *) = 0; + + virtual Zipr_SDK::RangeAddress_t PlopDollopEntry( + DollopEntry_t *, + RangeAddress_t = 0) + = 0; + + virtual Zipr_SDK::RangeAddress_t PlopDollopEntryWithTarget( + DollopEntry_t *, + RangeAddress_t = 0) + = 0; + + virtual Zipr_SDK::RangeAddress_t PlopDollopEntryWithCallback( + DollopEntry_t *, + RangeAddress_t = 0) + = 0; + virtual Zipr_SDK::MemorySpace_t *GetMemorySpace()=0; virtual ELFIO::elfio *GetELFIO()=0; virtual libIRDB::FileIR_t *GetFileIR()=0; diff --git a/include/zipr_plugin.h b/include/zipr_plugin.h index 804a62c..e64f764 100644 --- a/include/zipr_plugin.h +++ b/include/zipr_plugin.h @@ -40,12 +40,11 @@ class ZiprPluginInterface_t { return false; } - virtual size_t WorstCaseInsnSize(libIRDB::Instruction_t*, Zipr_t *) + virtual size_t WorstCaseInsnSize(libIRDB::Instruction_t*, bool, Zipr_t *) { return 0; } - virtual RangeAddress_t PlopInstruction(libIRDB::Instruction_t*, - RangeAddress_t, + virtual RangeAddress_t PlopDollopEntry(Zipr_SDK::DollopEntry_t *, RangeAddress_t &, Zipr_t *) { -- GitLab