Changeset 53ad43c in mainline for kernel/arch/amd64


Ignore:
Timestamp:
2018-03-08T18:54:30Z (7 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5ef16903
Parents:
e0a4686
Message:

Replace ASM macro with the standard ASSEMBLER.

At least, GCC claims it to be a standard predefined macro. I was unable
to find the relevant standard, but it's defined in both gcc and clang.

Location:
kernel/arch/amd64/include/arch
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/amd64/include/arch/boot/boot.h

    re0a4686 r53ad43c  
    4040#define BOOT_STACK_SIZE  0x000400
    4141
    42 #ifndef __ASM__
     42#ifndef __ASSEMBLER__
    4343
    4444#ifdef CONFIG_SMP
    … …  
    4949#endif /* CONFIG_SMP */
    5050
    51 #endif /* __ASM__ */
     51#endif /* __ASSEMBLER__ */
    5252
    5353#endif

  • kernel/arch/amd64/include/arch/cpu.h

    re0a4686 r53ad43c  
    7979#define AMD_MSR_GS_KERNEL       0xc0000102
    8080
    81 #ifndef __ASM__
     81#ifndef __ASSEMBLER__
    8282
    8383#include <arch/pm.h>
    … …  
    103103void cpu_setup_fpu(void);
    104104
    105 #endif /* __ASM__ */
     105#endif /* __ASSEMBLER__ */
    106106
    107107#endif

  • kernel/arch/amd64/include/arch/cpuid.h

    re0a4686 r53ad43c  
    4646#define INTEL_FXSAVE          24
    4747
    48 #ifndef __ASM__
     48#ifndef __ASSEMBLER__
    4949
    5050#include <stdint.h>
    … …  
    6161extern void cpuid(uint32_t cmd, cpu_info_t *info);
    6262
    63 #endif /* !def __ASM__ */
     63#endif /* !def __ASSEMBLER__ */
    6464#endif
    6565

  • kernel/arch/amd64/include/arch/mm/frame.h

    re0a4686 r53ad43c  
    4141#define FRAME_LOWPRIO  0x1000
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545extern void frame_low_arch_init(void);
    … …  
    4747extern void physmem_print(void);
    4848
    49 #endif /* __ASM__ */
     49#endif /* __ASSEMBLER__ */
    5050
    5151#endif

  • kernel/arch/amd64/include/arch/mm/page.h

    re0a4686 r53ad43c  
    4444#ifdef MEMORY_MODEL_kernel
    4545
    46 #ifndef __ASM__
     46#ifndef __ASSEMBLER__
    4747
    4848#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffffffff80000000))
    4949#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffffffff80000000))
    5050
    51 #else /* __ASM__ */
     51#else /* __ASSEMBLER__ */
    5252
    5353#define KA2PA(x)  ((x) - 0xffffffff80000000)
    5454#define PA2KA(x)  ((x) + 0xffffffff80000000)
    5555
    56 #endif /* __ASM__ */
     56#endif /* __ASSEMBLER__ */
    5757
    5858#endif /* MEMORY_MODEL_kernel */
    … …  
    6060#ifdef MEMORY_MODEL_large
    6161
    62 #ifndef __ASM__
     62#ifndef __ASSEMBLER__
    6363
    6464#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
    6565#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
    6666
    67 #else /* __ASM__ */
     67#else /* __ASSEMBLER__ */
    6868
    6969#define KA2PA(x)  ((x) - 0xffff800000000000)
    7070#define PA2KA(x)  ((x) + 0xffff800000000000)
    7171
    72 #endif /* __ASM__ */
     72#endif /* __ASSEMBLER__ */
    7373
    7474#endif /* MEMORY_MODEL_large */
    … …  
    162162        ((p)->no_execute == 0)
    163163
    164 #ifndef __ASM__
     164#ifndef __ASSEMBLER__
    165165
    166166#include <mm/mm.h>
    … …  
    255255extern void page_fault(unsigned int, istate_t *);
    256256
    257 #endif /* __ASM__ */
     257#endif /* __ASSEMBLER__ */
    258258
    259259#endif

  • kernel/arch/amd64/include/arch/pm.h

    re0a4686 r53ad43c  
    3636#define KERN_amd64_PM_H_
    3737
    38 #ifndef __ASM__
     38#ifndef __ASSEMBLER__
    3939        #include <typedefs.h>
    4040        #include <arch/context.h>
    … …  
    8888#define IO_PORTS  (64 * 1024)
    8989
    90 #ifndef __ASM__
     90#ifndef __ASSEMBLER__
    9191
    9292typedef struct {
    … …  
    180180extern void tss_initialize(tss_t *t);
    181181
    182 #endif /* __ASM__ */
     182#endif /* __ASSEMBLER__ */
    183183
    184184#endif

  • kernel/arch/amd64/include/arch/vreg.h

    re0a4686 r53ad43c  
    3838#define VREG_TP 0
    3939
    40 #ifndef __ASM__
     40#ifndef __ASSEMBLER__
    4141
    4242#include <stdint.h>
    … …  
    4646extern void vreg_init(void);
    4747
    48 #endif /* __ASM__ */
     48#endif /* __ASSEMBLER__ */
    4949
    5050#endif
Note: See TracChangeset for help on using the changeset viewer.