> From: Paolo Bonzini [mailto:pbonz...@redhat.com] > On 17/06/2015 14:42, Pavel Dovgalyuk wrote: > > This patch introduces several helpers to pass return address > > which points to the TB. Correct return address allows correct > > restoring of the guest PC and icount. These functions should be used when > > helpers embedded into TB invoke memory operations. > > > > Signed-off-by: Pavel Dovgalyuk <pavel.dovga...@ispras.ru> > > --- > > include/exec/cpu_ldst_template.h | 42 > > +++++++++++++++++++++++++++++++------- > > include/exec/exec-all.h | 27 ++++++++++++++++++++++++ > > softmmu_template.h | 18 ++++++++++++++++ > > 3 files changed, 79 insertions(+), 8 deletions(-) > > > > diff --git a/include/exec/cpu_ldst_template.h > > b/include/exec/cpu_ldst_template.h > > index 95ab750..1847816 100644 > > --- a/include/exec/cpu_ldst_template.h > > +++ b/include/exec/cpu_ldst_template.h > > @@ -62,7 +62,9 @@ > > /* generic load/store macros */ > > > > static inline RES_TYPE > > -glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr) > > +glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, > > + target_ulong ptr, > > + uintptr_t retaddr) > > Would it make sense to call these helper_cpu_ld##USUFFIX##MEMSUFFIX?
I don't want to use 'helper' prefix, because helper functions are usually called directly from TB. Pavel Dovgalyuk