From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JpEc6-0006FZ-0B for qemu-devel@nongnu.org; Thu, 24 Apr 2008 23:28:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JpEc5-0006EZ-Jq for qemu-devel@nongnu.org; Thu, 24 Apr 2008 23:28:41 -0400 Received: from [199.232.76.173] (port=42080 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JpEc5-0006EJ-7x for qemu-devel@nongnu.org; Thu, 24 Apr 2008 23:28:41 -0400 Received: from mx1.redhat.com ([66.187.233.31]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JpEc4-0000oo-N1 for qemu-devel@nongnu.org; Thu, 24 Apr 2008 23:28:41 -0400 From: Glauber Costa Date: Fri, 25 Apr 2008 00:23:02 -0300 Message-Id: <12090937991633-git-send-email-gcosta@redhat.com> In-Reply-To: <12090937962588-git-send-email-gcosta@redhat.com> References: <12090937903925-git-send-email-gcosta@redhat.com> <12090937962588-git-send-email-gcosta@redhat.com> Subject: [Qemu-devel] [PATCH 02/10] arm: replace code inside ifdef with generic function Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvm-devel@lists.sourceforge.net this patch replaced code inside specific ifdef in translate-all.c with a generic architecture-implemented function. This leads to a cleaner and more modular code in the generic part. --- target-arm/translate.c | 5 +++++ translate-all.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 6de78f8..8966996 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7706,3 +7706,8 @@ void cpu_dump_state(CPUState *env, FILE *f, cpu_fprintf(f, "FPSCR: %08x\n", (int)env->vfp.xregs[ARM_VFP_FPSCR]); } +void gen_pc_load(CPUState *env, TranslationBlock *tb, + unsigned long searched_pc, int pc_pos, void *puc) +{ + env->regs[15] = gen_opc_pc[pc_pos]; +} diff --git a/translate-all.c b/translate-all.c index 73e1d67..e688318 100644 --- a/translate-all.c +++ b/translate-all.c @@ -196,7 +196,7 @@ int cpu_restore_state(TranslationBlock *tb, #if defined(TARGET_I386) gen_pc_load(env, tb, searched_pc, j, puc); #elif defined(TARGET_ARM) - env->regs[15] = gen_opc_pc[j]; + gen_pc_load(env, tb, searched_pc, j, puc); #elif defined(TARGET_SPARC) { target_ulong npc; -- 1.5.0.6