[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/10] sparc: replace code inside ifdef with generic
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 03/10] sparc: replace code inside ifdef with generic function |
Date: |
Fri, 25 Apr 2008 00:23:03 -0300 |
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-sparc/translate.c | 20 ++++++++++++++++++++
translate-all.c | 18 +-----------------
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 90d9278..6edf64d 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -4659,3 +4659,23 @@ void gen_intermediate_code_init(CPUSPARCState *env)
gregnames[i]);
}
}
+
+void gen_pc_load(CPUState *env, TranslationBlock *tb,
+ unsigned long searched_pc, int pc_pos, void *puc)
+{
+ target_ulong npc;
+ env->pc = gen_opc_pc[pc_pos];
+ npc = gen_opc_npc[pc_pos];
+ if (npc == 1) {
+ /* dynamic NPC: already stored */
+ } else if (npc == 2) {
+ target_ulong t2 = (target_ulong)(unsigned long)puc;
+ /* jump PC: use T2 and the jump targets of the translation */
+ if (t2)
+ env->npc = gen_opc_jump_pc[0];
+ else
+ env->npc = gen_opc_jump_pc[1];
+ } else {
+ env->npc = npc;
+ }
+}
diff --git a/translate-all.c b/translate-all.c
index e688318..92c8f1c 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -198,23 +198,7 @@ int cpu_restore_state(TranslationBlock *tb,
#elif defined(TARGET_ARM)
gen_pc_load(env, tb, searched_pc, j, puc);
#elif defined(TARGET_SPARC)
- {
- target_ulong npc;
- env->pc = gen_opc_pc[j];
- npc = gen_opc_npc[j];
- if (npc == 1) {
- /* dynamic NPC: already stored */
- } else if (npc == 2) {
- target_ulong t2 = (target_ulong)(unsigned long)puc;
- /* jump PC: use T2 and the jump targets of the translation */
- if (t2)
- env->npc = gen_opc_jump_pc[0];
- else
- env->npc = gen_opc_jump_pc[1];
- } else {
- env->npc = npc;
- }
- }
+ gen_pc_load(env, tb, searched_pc, j, puc);
#elif defined(TARGET_PPC)
{
int type, c;
--
1.5.0.6
- [Qemu-devel] [PATCH 0/10] Factorize code in translate.c, Glauber Costa, 2008/04/24
- [Qemu-devel] [PATCH 01/10] i386: replace code inside ifdef with generic function, Glauber Costa, 2008/04/24
- [Qemu-devel] [PATCH 02/10] arm: replace code inside ifdef with generic function, Glauber Costa, 2008/04/24
- [Qemu-devel] [PATCH 03/10] sparc: replace code inside ifdef with generic function,
Glauber Costa <=
- [Qemu-devel] [PATCH 04/10] ppc: replace code inside ifdef with generic function, Glauber Costa, 2008/04/24
- [Qemu-devel] [PATCH 05/10] m68k: replace code inside ifdef with generic function, Glauber Costa, 2008/04/24
- [Qemu-devel] [PATCH 06/10] mips: replace code inside ifdef with generic function, Glauber Costa, 2008/04/24
- [Qemu-devel] [PATCH 07/10] alpha: replace code inside ifdef with generic function, Glauber Costa, 2008/04/24
- [Qemu-devel] [PATCH 08/10] sh4: replace code inside ifdef with generic function, Glauber Costa, 2008/04/24
- [Qemu-devel] [PATCH 09/10] cris: replace code inside ifdef with generic function, Glauber Costa, 2008/04/24
- [Qemu-devel] [PATCH 10/10] remove arch-specific ifdefs from translate-all.c, Glauber Costa, 2008/04/24