aboutsummaryrefslogtreecommitdiff
path: root/target-sparc/cpu.h
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-10 10:12:00 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-10 10:12:00 +0000
commit22548760ca36e3c9c716bf725194a846d1073855 (patch)
tree57643945499692088cb5d186a1fd5579ef4b8bbc /target-sparc/cpu.h
parent9800ee2677ab1f6d506a03086a2fbfe66fe09f5c (diff)
Fix compiler warnings
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4404 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-sparc/cpu.h')
-rw-r--r--target-sparc/cpu.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index 6ad98edf5f..42e8991351 100644
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -376,30 +376,30 @@ void cpu_check_irqs(CPUSPARCState *env);
#define MMU_KERNEL_IDX 1
#define MMU_HYPV_IDX 2
-static inline int cpu_mmu_index (CPUState *env)
+static inline int cpu_mmu_index(CPUState *env1)
{
#if defined(CONFIG_USER_ONLY)
return MMU_USER_IDX;
#elif !defined(TARGET_SPARC64)
- return env->psrs;
+ return env1->psrs;
#else
- if (!env->psrs)
+ if (!env1->psrs)
return MMU_USER_IDX;
- else if ((env->hpstate & HS_PRIV) == 0)
+ else if ((env1->hpstate & HS_PRIV) == 0)
return MMU_KERNEL_IDX;
else
return MMU_HYPV_IDX;
#endif
}
-static inline int cpu_fpu_enabled(CPUState *env)
+static inline int cpu_fpu_enabled(CPUState *env1)
{
#if defined(CONFIG_USER_ONLY)
return 1;
#elif !defined(TARGET_SPARC64)
- return env->psref;
+ return env1->psref;
#else
- return ((env->pstate & PS_PEF) != 0) && ((env->fprs & FPRS_FEF) != 0);
+ return ((env1->pstate & PS_PEF) != 0) && ((env1->fprs & FPRS_FEF) != 0);
#endif
}