Re: [Qemu-devel] [PATCH 07/10] target-s390x: enable fully implemented facilities

[Alexander Graf]

On 25.05.15 01:47, Aurelien Jarno wrote:
> Cc: Alexander Graf <address@hidden>
> Cc: Richard Henderson <address@hidden>
> Signed-off-by: Aurelien Jarno <address@hidden>

Shouldn't this get populated based on the selected -cpu type?


Alex

> ---
>  target-s390x/cpu.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
> index 8bda2e0..35bfdec 100644
> --- a/target-s390x/cpu.h
> +++ b/target-s390x/cpu.h
> @@ -169,7 +169,7 @@ typedef struct CPUS390XState {
>  static const uint64_t facilities_dw[] = {
>      (1ULL << 63) | /* b 0: z/Architecture new instructions added to ESA/390 
> */
>      (1ULL << 62) | /* b 1: z/Architecture architectural */
> -    (0ULL << 61) | /* b 2: z/Architecture architectural active */
> +    (1ULL << 61) | /* b 2: z/Architecture architectural active */
>      (0ULL << 60) | /* b 3: IDTE */
>      (0ULL << 59) | /* b 4: IDTE selective clearing when segtab invalidated */
>      (0ULL << 58) | /* b 5: IDTE selective clearing when regtab invalidated */
> @@ -188,7 +188,7 @@ static const uint64_t facilities_dw[] = {
>      (0ULL << 45) | /* b18: Long-displacement facility */
>      (0ULL << 44) | /* b19: High performance long-displacement facility */
>      (0ULL << 43) | /* b20: HFP-multiply-and-add/subtract facility */
> -    (0ULL << 42) | /* b21: Extended-immediate facility */
> +    (1ULL << 42) | /* b21: Extended-immediate facility */
>      (0ULL << 41) | /* b22: Extended-translation facility 3 */
>      (0ULL << 40) | /* b23: HFP-unnormalized-extension facility */
>      (0ULL << 39) | /* b24: ETF2-enhancement facility */
> @@ -201,7 +201,7 @@ static const uint64_t facilities_dw[] = {
>      (0ULL << 31) | /* b32: Compare-and-swap-and-store facility */
>      (0ULL << 30) | /* b33: Compare-and-swap-and-store facility 2 */
>      (0ULL << 29) | /* b34: General-instructions-extension facility */
> -    (0ULL << 28) | /* b35: Execute-extensions facility  */
> +    (1ULL << 28) | /* b35: Execute-extensions facility  */
>      (0ULL << 27) | /* b36: Enhanced-monitor facility */
>      (0ULL << 26) | /* b37: Floating-point extension facility */
>      (0ULL << 24) | /* b39: IBM internal use */
>