From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4p3e-0008G3-4N for qemu-devel@nongnu.org; Tue, 16 Jun 2015 07:29:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4p3b-0007mE-8H for qemu-devel@nongnu.org; Tue, 16 Jun 2015 07:29:34 -0400 Received: from mail-yk0-f177.google.com ([209.85.160.177]:34636) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4p3b-0007m8-4E for qemu-devel@nongnu.org; Tue, 16 Jun 2015 07:29:31 -0400 Received: by ykfl8 with SMTP id l8so10607159ykf.1 for ; Tue, 16 Jun 2015 04:29:30 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: From: Peter Maydell Date: Tue, 16 Jun 2015 12:29:10 +0100 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PATCH v2 1/4] qom: cpu: Add wrapper to the set-pc hook List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite Cc: "Edgar E. Iglesias" , Peter Crosthwaite , QEMU Developers , =?UTF-8?Q?Andreas_F=C3=A4rber?= On 16 June 2015 at 06:46, Peter Crosthwaite wrote: > Add a wrapper around the CPUClass::set_pc hook. Accepts an error > pointer to report the case where the hook is not set. > > Signed-off-by: Peter Crosthwaite > --- > include/qom/cpu.h | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/include/qom/cpu.h b/include/qom/cpu.h > index 7db310e..97d4edf 100644 > --- a/include/qom/cpu.h > +++ b/include/qom/cpu.h > @@ -600,6 +600,27 @@ static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr, > #endif > > /** > + * cpu_set_pc: > + * @cpu: The CPU to set the program counter for. > + * @addr: Program counter value. > + * @errp: Error pointer to populate in case of error. > + * > + * Set the program counter for a CPU. If there is no available implementation > + * an error is raised. > + */ > + > +static inline void cpu_set_pc(CPUState *cpu, vaddr addr, Error **errp) > +{ > + CPUClass *cc = CPU_GET_CLASS(cpu); > + > + if (cc->set_pc) { > + cc->set_pc(cpu, addr); > + } else { > + error_setg(errp, "CPU does not implement set PC"); > + } > +} I don't think there are any CPUClass implementations which don't implement set_pc. The code in cpu-exec.c which does this: if (cc->synchronize_from_tb) { cc->synchronize_from_tb(cpu, tb); } else { assert(cc->set_pc); cc->set_pc(cpu, tb->pc); } demonstrates that we only need to check the CPUs which implement synchronize_from_tb (i386, mips, sh4, sparc, tricore) to check they have a set_pc method too, and they all do. (You can also just grep for 'cc->set_pc' in target-*/ and confirm they all have one, as a crosscheck.) So I think this can simplify down to just calling the class method unconditionally. thanks -- PMM