[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] ppc: replace code inside ifdef with generic f
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 04/10] ppc: replace code inside ifdef with generic function |
Date: |
Fri, 25 Apr 2008 00:23:04 -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-ppc/translate.c | 42 ++++++++++++++++++++++++++++++++++++++++++
translate-all.c | 40 +---------------------------------------
2 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index c9530eb..6f7d16c 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -6344,3 +6344,45 @@ int gen_intermediate_code_pc (CPUState *env, struct
TranslationBlock *tb)
{
return gen_intermediate_code_internal(env, tb, 1);
}
+
+void gen_pc_load(CPUState *env, TranslationBlock *tb,
+ unsigned long searched_pc, int pc_pos, void *puc)
+{
+ int type, c;
+ /* for PPC, we need to look at the micro operation to get the
+ * access type */
+ env->nip = gen_opc_pc[pc_pos];
+ c = gen_opc_buf[pc_pos];
+ switch(c) {
+#if defined(CONFIG_USER_ONLY)
+#define CASE3(op)\
+ case INDEX_op_ ## op ## _raw
+#else
+#define CASE3(op)\
+ case INDEX_op_ ## op ## _user:\
+ case INDEX_op_ ## op ## _kernel:\
+ case INDEX_op_ ## op ## _hypv
+#endif
+
+ CASE3(stfd):
+ CASE3(stfs):
+ CASE3(lfd):
+ CASE3(lfs):
+ type = ACCESS_FLOAT;
+ break;
+ CASE3(lwarx):
+ type = ACCESS_RES;
+ break;
+ CASE3(stwcx):
+ type = ACCESS_RES;
+ break;
+ CASE3(eciwx):
+ CASE3(ecowx):
+ type = ACCESS_EXT;
+ break;
+ default:
+ type = ACCESS_INT;
+ break;
+ }
+ env->access_type = type;
+}
diff --git a/translate-all.c b/translate-all.c
index 92c8f1c..66f03e1 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -200,45 +200,7 @@ int cpu_restore_state(TranslationBlock *tb,
#elif defined(TARGET_SPARC)
gen_pc_load(env, tb, searched_pc, j, puc);
#elif defined(TARGET_PPC)
- {
- int type, c;
- /* for PPC, we need to look at the micro operation to get the
- access type */
- env->nip = gen_opc_pc[j];
- c = gen_opc_buf[j];
- switch(c) {
-#if defined(CONFIG_USER_ONLY)
-#define CASE3(op)\
- case INDEX_op_ ## op ## _raw
-#else
-#define CASE3(op)\
- case INDEX_op_ ## op ## _user:\
- case INDEX_op_ ## op ## _kernel:\
- case INDEX_op_ ## op ## _hypv
-#endif
-
- CASE3(stfd):
- CASE3(stfs):
- CASE3(lfd):
- CASE3(lfs):
- type = ACCESS_FLOAT;
- break;
- CASE3(lwarx):
- type = ACCESS_RES;
- break;
- CASE3(stwcx):
- type = ACCESS_RES;
- break;
- CASE3(eciwx):
- CASE3(ecowx):
- type = ACCESS_EXT;
- break;
- default:
- type = ACCESS_INT;
- break;
- }
- env->access_type = type;
- }
+ gen_pc_load(env, tb, searched_pc, j, puc);
#elif defined(TARGET_M68K)
env->pc = gen_opc_pc[j];
#elif defined(TARGET_MIPS)
--
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, 2008/04/24
- [Qemu-devel] [PATCH 04/10] ppc: replace code inside ifdef with generic function,
Glauber Costa <=
- [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