From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Cq8-0002kQ-K9 for qemu-devel@nongnu.org; Wed, 17 Jun 2015 08:53:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5Cq4-0004yG-Ig for qemu-devel@nongnu.org; Wed, 17 Jun 2015 08:53:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58008) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Cq4-0004yA-Dr for qemu-devel@nongnu.org; Wed, 17 Jun 2015 08:53:08 -0400 Message-ID: <55816DAE.8090701@redhat.com> Date: Wed, 17 Jun 2015 14:53:02 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <20150617124158.3316.54954.stgit@PASHA-ISP> <20150617124205.3316.81361.stgit@PASHA-ISP> In-Reply-To: <20150617124205.3316.81361.stgit@PASHA-ISP> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/3] softmmu: add helper function to pass through retaddr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Dovgalyuk , qemu-devel@nongnu.org Cc: rth7680@gmail.com, leon.alrae@imgtec.com, aurelien@aurel32.net 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 > --- > 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? > diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h > index 856e698..b3aefde 100644 > --- a/include/exec/exec-all.h > +++ b/include/exec/exec-all.h > @@ -350,6 +350,33 @@ struct MemoryRegion *iotlb_to_region(CPUState *cpu, > void tlb_fill(CPUState *cpu, target_ulong addr, int is_write, int mmu_idx, > uintptr_t retaddr); > > +uint8_t helper_call_ldb_cmmu(CPUArchState *env, target_ulong addr, > + int mmu_idx, uintptr_t retaddr); Here we already have helper_ret_ldb_cmmu, so the new function is only needed if DATA_SIZE != 1. > +uint16_t helper_call_ldw_cmmu(CPUArchState *env, target_ulong addr, > + int mmu_idx, uintptr_t retaddr); What about helper_ret_ldw_cmmu for consistency with the DATA_SIZE == 1 case? Paolo