Patchwork [1/3] target-unicore32: remove cpu_halted()

login
register
mail settings
Submitter Aurelien Jarno
Date April 12, 2011, 10:31 p.m.
Message ID <1302647466-22448-1-git-send-email-aurelien@aurel32.net>
Download mbox | patch
Permalink /patch/90915/
State New
Headers show

Comments

Aurelien Jarno - April 12, 2011, 10:31 p.m.
cpu_halted() has been removed on all targets in commit
eda48c344f35e5bd511dea3e8be56fb08c19b399. Also remove it on unicore32.

Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 target-unicore32/exec.h |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)
Guan Xuetao - April 13, 2011, 5:42 a.m.
Applied.

Thanks.

Guan Xuetao

> -----Original Message-----
> From: Aurelien Jarno [mailto:aurelien@aurel32.net]
> Sent: Wednesday, April 13, 2011 6:31 AM
> To: qemu-devel@nongnu.org
> Cc: Aurelien Jarno; Guan Xuetao
> Subject: [PATCH 1/3] target-unicore32: remove cpu_halted()
> 
> cpu_halted() has been removed on all targets in commit
> eda48c344f35e5bd511dea3e8be56fb08c19b399. Also remove it on unicore32.
> 
> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
> ---
>  target-unicore32/exec.h |   15 ---------------
>  1 files changed, 0 insertions(+), 15 deletions(-)
> 
> diff --git a/target-unicore32/exec.h b/target-unicore32/exec.h
> index 4ab55f4..498df23 100644
> --- a/target-unicore32/exec.h
> +++ b/target-unicore32/exec.h
> @@ -32,19 +32,4 @@ static inline int cpu_has_work(CPUState *env)
>          (CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB);
>  }
> 
> -static inline int cpu_halted(CPUState *env)
> -{
> -    if (!env->halted) {
> -        return 0;
> -    }
> -    /* An interrupt wakes the CPU even if the I and R ASR bits are
> -       set.  We use EXITTB to silently wake CPU without causing an
> -       actual interrupt.  */
> -    if (cpu_has_work(env)) {
> -        env->halted = 0;
> -        return 0;
> -    }
> -    return EXCP_HALTED;
> -}
> -
>  #endif /* __UC32_EXEC_H__ */
> --
> 1.7.2.3

Patch

diff --git a/target-unicore32/exec.h b/target-unicore32/exec.h
index 4ab55f4..498df23 100644
--- a/target-unicore32/exec.h
+++ b/target-unicore32/exec.h
@@ -32,19 +32,4 @@  static inline int cpu_has_work(CPUState *env)
         (CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB);
 }
 
-static inline int cpu_halted(CPUState *env)
-{
-    if (!env->halted) {
-        return 0;
-    }
-    /* An interrupt wakes the CPU even if the I and R ASR bits are
-       set.  We use EXITTB to silently wake CPU without causing an
-       actual interrupt.  */
-    if (cpu_has_work(env)) {
-        env->halted = 0;
-        return 0;
-    }
-    return EXCP_HALTED;
-}
-
 #endif /* __UC32_EXEC_H__ */