Re: [Xen-devel] [RFC 07/16] xen/arm: arm64: Move the define BRK_BUG_FRAME into a separate header

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Thu, 5 May 2016, Julien Grall wrote:
> New immediates will be defined in the future. To keep track of the
> immediates allocated, gather all of them in a separate header.
> 
> Also rename BRK_BUG_FRAME to BKR_BUG_FRAME_IMM.
> 
> Signed-off-by: Julien Grall <julien.grall@xxxxxxx>

Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>


>  xen/arch/arm/traps.c            |  2 +-
>  xen/include/asm-arm/arm64/brk.h | 26 ++++++++++++++++++++++++++
>  xen/include/asm-arm/arm64/bug.h |  5 ++---
>  3 files changed, 29 insertions(+), 4 deletions(-)
>  create mode 100644 xen/include/asm-arm/arm64/brk.h
> 
> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> index 1828ea1..c0325d5 100644
> --- a/xen/arch/arm/traps.c
> +++ b/xen/arch/arm/traps.c
> @@ -1205,7 +1205,7 @@ static void do_trap_brk(struct cpu_user_regs *regs, 
> const union hsr hsr)
>  
>      switch (hsr.brk.comment)
>      {
> -    case BRK_BUG_FRAME:
> +    case BRK_BUG_FRAME_IMM:
>          if ( do_bug_frame(regs, regs->pc) )
>              goto die;
>  
> diff --git a/xen/include/asm-arm/arm64/brk.h b/xen/include/asm-arm/arm64/brk.h
> new file mode 100644
> index 0000000..7867b07
> --- /dev/null
> +++ b/xen/include/asm-arm/arm64/brk.h
> @@ -0,0 +1,26 @@
> +/*
> + * Copyright (C) 2016 ARM Ltd.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#ifndef __ASM_ARM_ARM64_BRK
> +#define __ASM_ARM_ARM64_BRK
> +
> +/*
> + * #imm16 values used for BRK instruction generation
> + * 0x001: xen-mode BUG() and WARN() traps
> + */
> +#define BRK_BUG_FRAME_IMM   1
> +
> +#endif /* !__ASM_ARM_ARM64_BRK */
> +/*
> + * Local variables:
> + * mode: C
> + * c-file-style: "BSD"
> + * c-basic-offset: 4
> + * indent-tabs-mode: nil
> + * End:
> + */
> diff --git a/xen/include/asm-arm/arm64/bug.h b/xen/include/asm-arm/arm64/bug.h
> index 42b0e4f..59f664d 100644
> --- a/xen/include/asm-arm/arm64/bug.h
> +++ b/xen/include/asm-arm/arm64/bug.h
> @@ -2,9 +2,8 @@
>  #define __ARM_ARM64_BUG_H__
>  
>  #include <xen/stringify.h>
> +#include <asm/arm64/brk.h>
>  
> -#define BRK_BUG_FRAME 1
> -
> -#define BUG_INSTR "brk " __stringify(BRK_BUG_FRAME)
> +#define BUG_INSTR "brk " __stringify(BRK_BUG_FRAME_IMM)
>  
>  #endif /* __ARM_ARM64_BUG_H__ */
> -- 
> 1.9.1
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel