commit 7f7d9a9741a5bf946a51bba2de1eb8fc3374149e
author David 'Digit' Turner <digit@google.com> Tue Mar 18 14:48:18 2014 +0100
committer David 'Digit' Turner <digit@google.com> Wed Apr 09 19:43:19 2014 +0200
tree b7ba8496ad13870f79ca02529def298a9333370a
parent bf2340f1eae08ddada9ed09490aa83e0a1bd7586

exec.h: fix coding style and change cpu_has_work to return bool

+ Remove obsolete env_to_regs + regs_to_env functions.

Upstream f3e270377acd074f62e08960ef9444adf67d3590

Change-Id: Idd7561fce7b9a92f2194d2a9a1b710d32dc61183

cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index ee2ea87..17bc910 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -45,7 +45,7 @@
 //#define CONFIG_DEBUG_EXEC
 //#define DEBUG_SIGNAL
 
-int qemu_cpu_has_work(CPUOldState *env)
+bool qemu_cpu_has_work(CPUOldState *env)
 {
     return cpu_has_work(env);
 }

include/exec/cpu-all.h

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index b6d3724..91822d9 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -429,7 +429,7 @@
 
 void cpu_exit(CPUOldState *s);
 
-int qemu_cpu_has_work(CPUOldState *env);
+bool qemu_cpu_has_work(CPUOldState *env);
 
 /* Breakpoint/watchpoint flags */
 #define BP_MEM_READ           0x01

target-arm/exec.h

diff --git a/target-arm/exec.h b/target-arm/exec.h
index 664ae86..6373a23 100644
--- a/target-arm/exec.h
+++ b/target-arm/exec.h
@@ -24,15 +24,7 @@
 #include "cpu.h"
 #include "exec/exec-all.h"
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
-static inline int cpu_has_work(CPUARMState *env)
+static inline bool cpu_has_work(CPUARMState *env)
 {
     return (env->interrupt_request &
             (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB));

target-i386/exec.h

diff --git a/target-i386/exec.h b/target-i386/exec.h
index e239e2f..1b670db 100644
--- a/target-i386/exec.h
+++ b/target-i386/exec.h
@@ -148,63 +148,7 @@
         (eflags & update_mask) | 0x2;
 }
 
-static inline void env_to_regs(void)
-{
-#ifdef reg_EAX
-    EAX = env->regs[R_EAX];
-#endif
-#ifdef reg_ECX
-    ECX = env->regs[R_ECX];
-#endif
-#ifdef reg_EDX
-    EDX = env->regs[R_EDX];
-#endif
-#ifdef reg_EBX
-    EBX = env->regs[R_EBX];
-#endif
-#ifdef reg_ESP
-    ESP = env->regs[R_ESP];
-#endif
-#ifdef reg_EBP
-    EBP = env->regs[R_EBP];
-#endif
-#ifdef reg_ESI
-    ESI = env->regs[R_ESI];
-#endif
-#ifdef reg_EDI
-    EDI = env->regs[R_EDI];
-#endif
-}
-
-static inline void regs_to_env(void)
-{
-#ifdef reg_EAX
-    env->regs[R_EAX] = EAX;
-#endif
-#ifdef reg_ECX
-    env->regs[R_ECX] = ECX;
-#endif
-#ifdef reg_EDX
-    env->regs[R_EDX] = EDX;
-#endif
-#ifdef reg_EBX
-    env->regs[R_EBX] = EBX;
-#endif
-#ifdef reg_ESP
-    env->regs[R_ESP] = ESP;
-#endif
-#ifdef reg_EBP
-    env->regs[R_EBP] = EBP;
-#endif
-#ifdef reg_ESI
-    env->regs[R_ESI] = ESI;
-#endif
-#ifdef reg_EDI
-    env->regs[R_EDI] = EDI;
-#endif
-}
-
-static inline int cpu_has_work(CPUX86State *env)
+static inline bool cpu_has_work(CPUX86State *env)
 {
     int work;
 

target-mips/exec.h

diff --git a/target-mips/exec.h b/target-mips/exec.h
index a64fe65..d7fdc87 100644
--- a/target-mips/exec.h
+++ b/target-mips/exec.h
@@ -25,15 +25,7 @@
 void cpu_mips_clock_init (CPUMIPSState *env);
 void cpu_mips_tlb_flush (CPUMIPSState *env, int flush_global);
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
-static inline int cpu_has_work(CPUMIPSState *env)
+static inline bool cpu_has_work(CPUMIPSState *env)
 {
     int has_work = 0;