removed warning

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1194 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index a66d2e36d7b553dfd59443da4905b66636d5d321..6a077c58e3101e031e35f8935dd26d5ff3a2c0fc 100644 (file)
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -29,23 +29,6 @@
 #define PSR_PS    (1<<6)
 #define PSR_ET    (1<<5)
 #define PSR_CWP   0x1f
-/* Fake impl 0, version 4 */
-#define GET_PSR(env) ((0 << 28) | (4 << 24) | env->psr |               \
-                     (env->psref? PSR_EF : 0) |                        \
-                     (env->psrpil << 8) |                              \
-                     (env->psrs? PSR_S : 0) |                          \
-                     (env->psrs? PSR_PS : 0) |                         \
-                     (env->psret? PSR_ET : 0) | env->cwp)
-
-#define PUT_PSR(env, val) do { int _tmp = val;                         \
-       env->psr = _tmp & ~PSR_ICC;                                     \
-       env->psref = (_tmp & PSR_EF)? 1 : 0;                            \
-       env->psrpil = (_tmp & PSR_PIL) >> 8;                            \
-       env->psrs = (_tmp & PSR_S)? 1 : 0;                              \
-       env->psrps = (_tmp & PSR_PS)? 1 : 0;                            \
-       env->psret = (_tmp & PSR_ET)? 1 : 0;                            \
-       set_cwp(_tmp & PSR_CWP & (NWINDOWS - 1));                       \
-    } while (0)
 
 /* Trap base register */
 #define TBR_BASE_MASK 0xfffff000
@@ -171,6 +154,28 @@ int cpu_sparc_close(CPUSPARCState *s);
 void cpu_get_fp64(uint64_t *pmant, uint16_t *pexp, double f);
 double cpu_put_fp64(uint64_t mant, uint16_t exp);
 
+/* Fake impl 0, version 4 */
+#define GET_PSR(env) ((0 << 28) | (4 << 24) | env->psr |               \
+                     (env->psref? PSR_EF : 0) |                        \
+                     (env->psrpil << 8) |                              \
+                     (env->psrs? PSR_S : 0) |                          \
+                     (env->psrs? PSR_PS : 0) |                         \
+                     (env->psret? PSR_ET : 0) | env->cwp)
+
+#ifndef NO_CPU_IO_DEFS
+void cpu_set_cwp(CPUSPARCState *env1, int new_cwp);
+#endif
+
+#define PUT_PSR(env, val) do { int _tmp = val;                         \
+       env->psr = _tmp & ~PSR_ICC;                                     \
+       env->psref = (_tmp & PSR_EF)? 1 : 0;                            \
+       env->psrpil = (_tmp & PSR_PIL) >> 8;                            \
+       env->psrs = (_tmp & PSR_S)? 1 : 0;                              \
+       env->psrps = (_tmp & PSR_PS)? 1 : 0;                            \
+       env->psret = (_tmp & PSR_ET)? 1 : 0;                            \
+       cpu_set_cwp(env, _tmp & PSR_CWP & (NWINDOWS - 1));              \
+    } while (0)
+
 struct siginfo;
 int cpu_sparc_signal_handler(int hostsignum, struct siginfo *info, void *puc);