Patchwork target-ppc: fix SPE evcmp* instructions

login
register
mail settings
Submitter Nathan Froyd
Date Feb. 23, 2010, 7:55 p.m.
Message ID <1266954914-29595-1-git-send-email-froydnj@codesourcery.com>
Download mbox | patch
Permalink /patch/46096/
State New
Headers show

Comments

Nathan Froyd - Feb. 23, 2010, 7:55 p.m.
The CRF_{CH,CL,CH_OR_CL,CH_AND_CL} constants were all off by one bit
position.  Because of this, the SPE evcmp* family of instructions would
store values in the result condition register that were also off by one
bit position.

Fixed by using the CRF_{LT,GT,EQ,SO} constants for the shift amounts.

Signed-off-by: Nathan Froyd <froydnj@codesourcery.com>
---
 target-ppc/cpu.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Aurelien Jarno - Feb. 27, 2010, 3:26 p.m.
On Tue, Feb 23, 2010 at 11:55:14AM -0800, Nathan Froyd wrote:
> The CRF_{CH,CL,CH_OR_CL,CH_AND_CL} constants were all off by one bit
> position.  Because of this, the SPE evcmp* family of instructions would
> store values in the result condition register that were also off by one
> bit position.
> 
> Fixed by using the CRF_{LT,GT,EQ,SO} constants for the shift amounts.
> 
> Signed-off-by: Nathan Froyd <froydnj@codesourcery.com>

Thanks, applied.

> ---
>  target-ppc/cpu.h |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
> index d15bba1..63aeb86 100644
> --- a/target-ppc/cpu.h
> +++ b/target-ppc/cpu.h
> @@ -834,10 +834,10 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
>  #define CRF_GT        2
>  #define CRF_EQ        1
>  #define CRF_SO        0
> -#define CRF_CH        (1 << 4)
> -#define CRF_CL        (1 << 3)
> -#define CRF_CH_OR_CL  (1 << 2)
> -#define CRF_CH_AND_CL (1 << 1)
> +#define CRF_CH        (1 << CRF_LT)
> +#define CRF_CL        (1 << CRF_GT)
> +#define CRF_CH_OR_CL  (1 << CRF_EQ)
> +#define CRF_CH_AND_CL (1 << CRF_SO)
>  
>  /* XER definitions */
>  #define XER_SO  31
> -- 
> 1.6.3.2
> 
> 
> 
>

Patch

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index d15bba1..63aeb86 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -834,10 +834,10 @@  static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
 #define CRF_GT        2
 #define CRF_EQ        1
 #define CRF_SO        0
-#define CRF_CH        (1 << 4)
-#define CRF_CL        (1 << 3)
-#define CRF_CH_OR_CL  (1 << 2)
-#define CRF_CH_AND_CL (1 << 1)
+#define CRF_CH        (1 << CRF_LT)
+#define CRF_CL        (1 << CRF_GT)
+#define CRF_CH_OR_CL  (1 << CRF_EQ)
+#define CRF_CH_AND_CL (1 << CRF_SO)
 
 /* XER definitions */
 #define XER_SO  31