[HPPAQEMU-CVS] hppaqemu/target-hppa cpu.h, 1.7, 1.8 translate.c, 1.39, 1.40

[Stuart B. <zu...@us...>]

Update of /cvsroot/hppaqemu/hppaqemu/target-hppa
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27557/target-hppa

Modified Files:
	cpu.h translate.c 
Log Message:
Update to QEMU 0.9.1.


Index: translate.c
===================================================================
RCS file: /cvsroot/hppaqemu/hppaqemu/target-hppa/translate.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- translate.c	22 Mar 2007 15:48:50 -0000	1.39
+++ translate.c	18 Feb 2008 05:24:54 -0000	1.40
@@ -2066,7 +2066,7 @@
     dc->iaoq[1] = dc->iaoq[1] + 4;
 }
 
-CPUHPPAState *cpu_hppa_init(void)
+CPUHPPAState *cpu_hppa_init(const char *cpu_model)
 {
     CPUHPPAState *env;
 

Index: cpu.h
===================================================================
RCS file: /cvsroot/hppaqemu/hppaqemu/target-hppa/cpu.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cpu.h	18 Feb 2008 03:04:59 -0000	1.7
+++ cpu.h	18 Feb 2008 05:24:54 -0000	1.8
@@ -102,6 +102,8 @@
 
 #define PSW_CB_SHIFT    8
 
+#define NB_MMU_MODES 2
+
 typedef struct CPUHPPAState {
     target_ulong gr[32];  /* General Registers */
     target_ulong shr[7];  /* SHadow Registers */
@@ -144,9 +146,22 @@
 #define cpu_gen_code cpu_hppa_gen_code
 #define cpu_signal_handler cpu_hppa_signal_handler
 
+/* MMU modes definitions */
+#define MMU_MODE0_SUFFIX _kernel
+#define MMU_MODE1_SUFFIX _user
+#define MMU_USER_IDX 0
+static inline int cpu_mmu_index (CPUState *env)
+{
+#if defined(CONFIG_USER_ONLY)
+    return 0;
+#else
+    return (env->iaoq[0] & 3) != 0 ? 1 : 0;
+#endif
+}
+
 #include "cpu-all.h"
 
-CPUHPPAState *cpu_hppa_init(void);
+CPUHPPAState *cpu_hppa_init(const char *model);
 int cpu_hppa_exec(CPUHPPAState *s);
 
 #endif