Changeset 53ad43c in mainline


Ignore:
Timestamp:
2018-03-08T18:54:30Z (6 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.

Files:
75 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.build

    re0a4686 r53ad43c  
    8585
    8686$(LINK): | depend
    87         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK)
     87        $(CC) $(DEFS) $(CFLAGS) -D__ASSEMBLER__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK)
    8888
    8989%.o: %.s | depend
    90         $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
     90        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS)
    9191
    9292%.o: %.S | depend
    93         $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
     93        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS)
    9494
    9595%.o: %.c | depend

  • boot/arch/arm32/include/arch/arch.h

    re0a4686 r53ad43c  
    6262#endif
    6363
    64 #ifndef __ASM__
     64#ifndef __ASSEMBLER__
    6565#define PA2KA(addr)  (((uintptr_t) (addr)) + PA_OFFSET)
    6666#else

  • boot/arch/mips32/include/arch/arch.h

    re0a4686 r53ad43c  
    5555#endif
    5656
    57 #ifndef __ASM__
     57#ifndef __ASSEMBLER__
    5858#define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
    5959#define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)

  • boot/arch/mips32/src/Makefile.build

    re0a4686 r53ad43c  
    6565
    6666%.o: %.S $(DEPEND)
    67         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
     67        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
    6868ifeq ($(PRECHECK),y)
    69         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     69        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS)
    7070endif
    7171

  • boot/arch/ppc32/include/arch/arch.h

    re0a4686 r53ad43c  
    3737#define LOADER_ADDRESS  0x08000000
    3838
    39 #ifndef __ASM__
     39#ifndef __ASSEMBLER__
    4040#define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
    4141#else

  • boot/arch/riscv64/include/arch/mm.h

    re0a4686 r53ad43c  
    3333#define BOOT_riscv64_MM_H_
    3434
    35 #ifndef __ASM__
     35#ifndef __ASSEMBLER__
    3636#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
    3737#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))

  • kernel/Makefile

    re0a4686 r53ad43c  
    400400
    401401$(LINK): $(LINK).in | depend
    402         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
     402        $(CC) $(DEFS) $(CFLAGS) -D__ASSEMBLER__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
    403403
    404404%.h: %.ag
    … …  
    408408
    409409%.o: %.S | depend
    410         $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
     410        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS)
    411411
    412412%.o: %.s | depend
    413         $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
     413        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS)
    414414
    415415%.o: %.c | depend

  • 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

  • kernel/arch/arm32/include/arch/context.h

    re0a4686 r53ad43c  
    5151        } while (0)
    5252
    53 #ifndef __ASM__
     53#ifndef __ASSEMBLER__
    5454
    55 #endif /* __ASM__ */
     55#endif /* __ASSEMBLER__ */
    5656
    5757#endif

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

    re0a4686 r53ad43c  
    4242#define FRAME_LOWPRIO  0
    4343
    44 #ifndef __ASM__
     44#ifndef __ASSEMBLER__
    4545
    4646#define BOOT_PAGE_TABLE_SIZE     0x4000
    … …  
    8181#define physmem_print()
    8282
    83 #endif /* __ASM__ */
     83#endif /* __ASSEMBLER__ */
    8484
    8585#endif

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

    re0a4686 r53ad43c  
    4848
    4949#if (defined MACHINE_beagleboardxm) || (defined MACHINE_beaglebone)
    50 #ifndef __ASM__
     50#ifndef __ASSEMBLER__
    5151#       define KA2PA(x) ((uintptr_t) (x))
    5252#       define PA2KA(x) ((uintptr_t) (x))
    … …  
    5656#endif
    5757#else
    58 #ifndef __ASM__
     58#ifndef __ASSEMBLER__
    5959#       define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
    6060#       define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)

  • kernel/arch/arm32/include/arch/mm/page_armv4.h

    re0a4686 r53ad43c  
    5454        1
    5555
    56 #ifndef __ASM__
     56#ifndef __ASSEMBLER__
    5757
    5858/** Level 0 page table entry. */
    … …  
    254254
    255255
    256 #endif /* __ASM__ */
     256#endif /* __ASSEMBLER__ */
    257257
    258258#endif

  • kernel/arch/arm32/include/arch/mm/page_armv6.h

    re0a4686 r53ad43c  
    5454        (((pte_t *) (pte))->l1.descriptor_type != PTE_DESCRIPTOR_SMALL_PAGE_NX)
    5555
    56 #ifndef __ASM__
     56#ifndef __ASSEMBLER__
    5757
    5858/** Level 0 page table entry. */
    … …  
    319319extern void page_arch_init(void);
    320320
    321 #endif /* __ASM__ */
     321#endif /* __ASSEMBLER__ */
    322322
    323323#endif

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

    re0a4686 r53ad43c  
    4040#define BOOT_STACK_SIZE  0x0400
    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/ia32/include/arch/boot/memmap.h

    re0a4686 r53ad43c  
    6161#define MEMMAP_E820_MAX_RECORDS  32
    6262
    63 #ifndef __ASM__
     63#ifndef __ASSEMBLER__
    6464
    6565#include <stdint.h>

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

    re0a4686 r53ad43c  
    6464#define IA32_MSR_SYSENTER_EIP   0x176
    6565
    66 #ifndef __ASM__
     66#ifndef __ASSEMBLER__
    6767
    6868#include <arch/pm.h>

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

    re0a4686 r53ad43c  
    4141#define INTEL_SEP             11
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545#include <arch/cpu.h>
    … …  
    116116}
    117117
    118 #endif /* !def __ASM__ */
     118#endif /* !def __ASSEMBLER__ */
    119119#endif
    120120

  • kernel/arch/ia32/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/ia32/include/arch/mm/page.h

    re0a4686 r53ad43c  
    5050#define PDE_4M          (1 << 7)
    5151
    52 #ifndef __ASM__
     52#ifndef __ASSEMBLER__
    5353
    5454#define KA2PA(x)  (((uintptr_t) (x)) - UINT32_C(0x80000000))
    5555#define PA2KA(x)  (((uintptr_t) (x)) + UINT32_C(0x80000000))
    5656
    57 #else /* __ASM__ */
     57#else /* __ASSEMBLER__ */
    5858
    5959#define KA2PA(x)  ((x) - 0x80000000)
    6060#define PA2KA(x)  ((x) + 0x80000000)
    6161
    62 #endif /* __ASM__ */
     62#endif /* __ASSEMBLER__ */
    6363
    6464/*
    … …  
    142142#define PTE_EXECUTABLE_ARCH(p)  1
    143143
    144 #ifndef __ASM__
     144#ifndef __ASSEMBLER__
    145145
    146146#include <mm/mm.h>
    … …  
    220220extern void page_fault(unsigned int, istate_t *);
    221221
    222 #endif /* __ASM__ */
     222#endif /* __ASSEMBLER__ */
    223223
    224224#endif

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

    re0a4686 r53ad43c  
    8181#define IO_PORTS  (64 * 1024)
    8282
    83 #ifndef __ASM__
     83#ifndef __ASSEMBLER__
    8484
    8585#include <typedefs.h>
    … …  
    170170extern void tss_initialize(tss_t *t);
    171171
    172 #endif /* __ASM__ */
     172#endif /* __ASSEMBLER__ */
    173173
    174174#endif

  • kernel/arch/ia32/include/arch/smp/apic.h

    re0a4686 r53ad43c  
    3939#define IO_APIC_BASE    0xfec00000
    4040
    41 #ifndef __ASM__
     41#ifndef __ASSEMBLER__
    4242
    4343#include <cpu.h>
    … …  
    369369extern void io_apic_enable_irqs(uint16_t);
    370370
    371 #endif  /* __ASM__ */
     371#endif  /* __ASSEMBLER__ */
    372372
    373373#endif

  • kernel/arch/ia32/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

  • kernel/arch/ia64/include/arch/interrupt.h

    re0a4686 r53ad43c  
    3636#define KERN_ia64_INTERRUPT_H_
    3737
    38 #ifndef __ASM__
     38#ifndef __ASSEMBLER__
    3939#include <arch/istate.h>
    4040#include <stdint.h>
    … …  
    8383#define EOI  0  /**< The actual value doesn't matter. */
    8484
    85 #ifndef __ASM__
     85#ifndef __ASSEMBLER__
    8686extern void *ivt;
    8787

  • kernel/arch/ia64/include/arch/mm/asid.h

    re0a4686 r53ad43c  
    3636#define KERN_ia64_ASID_H_
    3737
    38 #ifndef __ASM__
     38#ifndef __ASSEMBLER__
    3939
    4040#include <stdint.h>
    … …  
    4343typedef uint32_t rid_t;
    4444
    45 #endif  /* __ASM__ */
     45#endif  /* __ASSEMBLER__ */
    4646
    4747/**

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

    re0a4686 r53ad43c  
    4141#define FRAME_LOWPRIO  0
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545#include <typedefs.h>
    … …  
    5151#define physmem_print()
    5252
    53 #endif /* __ASM__ */
     53#endif /* __ASSEMBLER__ */
    5454
    5555#endif

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

    re0a4686 r53ad43c  
    3939#include <arch/mm/frame.h>
    4040
    41 #ifndef __ASM__
     41#ifndef __ASSEMBLER__
    4242#include <assert.h>
    4343#endif
    … …  
    5555#define VA2VRN(va)  ((va) >> VRN_SHIFT)
    5656
    57 #ifdef __ASM__
     57#ifdef __ASSEMBLER__
    5858        #define VRN_KERNEL  7
    5959#else
    … …  
    8484#define AR_WRITE    0x02
    8585
    86 #ifndef __ASM__
     86#ifndef __ASSEMBLER__
    8787
    8888#include <arch/mm/as.h>
    … …  
    297297extern void vhpt_set_record(vhpt_entry_t *v, uintptr_t page, asid_t asid, uintptr_t frame, int flags);
    298298
    299 #endif /* __ASM__ */
     299#endif /* __ASSEMBLER__ */
    300300
    301301#endif

  • kernel/arch/ia64/include/arch/register.h

    re0a4686 r53ad43c  
    143143/* CR82-CR127 are reserved */
    144144
    145 #ifndef __ASM__
     145#ifndef __ASSEMBLER__
    146146
    147147/** Processor Status Register. */
    … …  
    269269} cpuid3_t;
    270270
    271 #endif /* !__ASM__ */
     271#endif /* !__ASSEMBLER__ */
    272272
    273273#endif

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

    re0a4686 r53ad43c  
    4141#define FRAME_LOWPRIO  0
    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/mips32/include/arch/mm/page.h

    re0a4686 r53ad43c  
    4242#define PAGE_SIZE       FRAME_SIZE
    4343
    44 #ifndef __ASM__
     44#ifndef __ASSEMBLER__
    4545#       define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
    4646#       define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)
    … …  
    143143#define PTE_EXECUTABLE_ARCH(pte)        1
    144144
    145 #ifndef __ASM__
     145#ifndef __ASSEMBLER__
    146146
    147147#include <mm/mm.h>
    … …  
    199199extern void page_arch_init(void);
    200200
    201 #endif /* __ASM__ */
     201#endif /* __ASSEMBLER__ */
    202202
    203203#endif

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

    re0a4686 r53ad43c  
    4242#define BOOTINFO_TASK_NAME_BUFLEN  32
    4343
    44 #ifndef __ASM__
     44#ifndef __ASSEMBLER__
    4545
    4646#include <config.h>

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

    re0a4686 r53ad43c  
    4141#define FRAME_LOWPRIO  0
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545#include <stdint.h>
    … …  
    6262extern void physmem_print(void);
    6363
    64 #endif /* __ASM__ */
     64#endif /* __ASSEMBLER__ */
    6565
    6666#endif

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

    re0a4686 r53ad43c  
    4242#define PAGE_SIZE   FRAME_SIZE
    4343
    44 #ifndef __ASM__
     44#ifndef __ASSEMBLER__
    4545        #define KA2PA(x)  (((uintptr_t) (x)) - 0x80000000)
    4646        #define PA2KA(x)  (((uintptr_t) (x)) + 0x80000000)
    … …  
    146146#define PTE_EXECUTABLE_ARCH(pte)  1
    147147
    148 #ifndef __ASM__
     148#ifndef __ASSEMBLER__
    149149
    150150#include <mm/mm.h>
    … …  
    194194extern void page_arch_init(void);
    195195
    196 #endif /* __ASM__ */
     196#endif /* __ASSEMBLER__ */
    197197
    198198#endif

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

    re0a4686 r53ad43c  
    4545#define TEMP_STACK_SIZE  0x1000
    4646
    47 #ifndef __ASM__
     47#ifndef __ASSEMBLER__
    4848
    4949#include <stddef.h>

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

    re0a4686 r53ad43c  
    4545#define SATP_MODE_SV48  UINT64_C(0x9000000000000000)
    4646
    47 #ifndef __ASM__
     47#ifndef __ASSEMBLER__
    4848
    4949typedef struct {
    … …  
    5252extern void cpu_setup_fpu(void);
    5353
    54 #endif /* __ASM__ */
     54#endif /* __ASSEMBLER__ */
    5555
    5656#endif

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

    re0a4686 r53ad43c  
    4141#define FRAME_LOWPRIO  0
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545#include <arch/boot/boot.h>
    … …  
    5454extern void physmem_print(void);
    5555
    56 #endif /* __ASM__ */
     56#endif /* __ASSEMBLER__ */
    5757
    5858#endif

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

    re0a4686 r53ad43c  
    4141#define PAGE_SIZE   FRAME_SIZE
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444        #define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
    4545        #define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
    … …  
    159159#define PTE_EXECUTABLE_ARCH(pte)  ((pte)->executable != 0)
    160160
    161 #ifndef __ASM__
     161#ifndef __ASSEMBLER__
    162162
    163163#include <mm/mm.h>
    … …  
    216216extern void write_satp(uintptr_t);
    217217
    218 #endif /* __ASM__ */
     218#endif /* __ASSEMBLER__ */
    219219
    220220#endif

  • kernel/arch/sparc64/include/arch/arch.h

    re0a4686 r53ad43c  
    3838#define KERN_sparc64_ARCH_H_
    3939
    40 #ifndef __ASM__
     40#ifndef __ASSEMBLER__
    4141#include <arch.h>
    4242#endif
    … …  
    5555#define NWINDOWS  8  /** Number of register window sets. */
    5656
    57 #ifndef __ASM__
     57#ifndef __ASSEMBLER__
    5858
    5959extern arch_ops_t *sparc64_ops;
    … …  
    6161extern void sparc64_pre_main(bootinfo_t *);
    6262
    63 #endif /* __ASM__ */
     63#endif /* __ASSEMBLER__ */
    6464
    6565#endif

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

    re0a4686 r53ad43c  
    3939#define LMA  VMA
    4040
    41 #ifndef __ASM__
     41#ifndef __ASSEMBLER__
    4242#ifndef __LINKER__
    4343

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

    re0a4686 r53ad43c  
    5252#define IMPL_SPARC64V           0x5
    5353
    54 #ifndef __ASM__
     54#ifndef __ASSEMBLER__
    5555
    5656#include <arch/register.h>

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

    re0a4686 r53ad43c  
    4646#endif
    4747
    48 #ifndef __ASM__
     48#ifndef __ASSEMBLER__
    4949
    5050#include <typedefs.h>

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

    re0a4686 r53ad43c  
    5454#define MMU_PAGES_PER_PAGE      (1 << (PAGE_WIDTH - MMU_PAGE_WIDTH))
    5555
    56 #ifndef __ASM__
     56#ifndef __ASSEMBLER__
    5757
    5858#include <arch/interrupt.h>
    … …  
    7373extern void page_arch_init(void);
    7474
    75 #endif /* !def __ASM__ */
     75#endif /* !def __ASSEMBLER__ */
    7676
    7777#endif

  • kernel/arch/sparc64/include/arch/mm/sun4u/frame.h

    re0a4686 r53ad43c  
    5454#define FRAME_LOWPRIO  0
    5555
    56 #ifndef __ASM__
     56#ifndef __ASSEMBLER__
    5757
    5858#include <typedefs.h>

  • kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h

    re0a4686 r53ad43c  
    8787#endif
    8888
    89 #ifndef __ASM__
     89#ifndef __ASSEMBLER__
    9090
    9191#include <arch/asm.h>
    … …  
    116116#endif /* US */
    117117
    118 #endif /* !def __ASM__ */
     118#endif /* !def __ASSEMBLER__ */
    119119
    120120#endif

  • kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h

    re0a4686 r53ad43c  
    9292#define TLB_TAG_ACCESS_VPN_SHIFT        13
    9393
    94 #ifndef __ASM__
     94#ifndef __ASSEMBLER__
    9595
    9696#include <arch/mm/tte.h>
    … …  
    687687extern void describe_dmmu_fault(void);
    688688
    689 #endif /* !def __ASM__ */
     689#endif /* !def __ASSEMBLER__ */
    690690
    691691#endif

  • kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h

    re0a4686 r53ad43c  
    5656#define TSB_TAG_TARGET_CONTEXT_SHIFT    48
    5757
    58 #ifndef __ASM__
     58#ifndef __ASSEMBLER__
    5959
    6060#include <arch/mm/tte.h>
    … …  
    171171extern void dtsb_pte_copy(struct pte *t, size_t index, bool ro);
    172172
    173 #endif /* !def __ASM__ */
     173#endif /* !def __ASSEMBLER__ */
    174174
    175175#endif

  • kernel/arch/sparc64/include/arch/mm/sun4u/tte.h

    re0a4686 r53ad43c  
    4747#define TTE_SIZE_SHIFT  61
    4848
    49 #ifndef __ASM__
     49#ifndef __ASSEMBLER__
    5050
    5151#include <stdint.h>
    … …  
    9797typedef union tte_data tte_data_t;
    9898
    99 #endif /* !def __ASM__ */
     99#endif /* !def __ASSEMBLER__ */
    100100
    101101#endif

  • kernel/arch/sparc64/include/arch/mm/sun4v/page.h

    re0a4686 r53ad43c  
    4646#define MMU_PAGES_PER_PAGE      (1 << (PAGE_WIDTH - MMU_PAGE_WIDTH))
    4747
    48 #ifndef __ASM__
     48#ifndef __ASSEMBLER__
    4949
    5050#include <arch/interrupt.h>
    … …  
    6565extern void page_arch_init(void);
    6666
    67 #endif /* !def __ASM__ */
     67#endif /* !def __ASSEMBLER__ */
    6868
    6969#endif

  • kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h

    re0a4686 r53ad43c  
    4040#define MMU_FSA_SIZE            128
    4141
    42 #ifndef __ASM__
     42#ifndef __ASSEMBLER__
    4343
    4444#include <arch/mm/tte.h>
    … …  
    149149extern void describe_dmmu_fault(void);
    150150
    151 #endif /* !def __ASM__ */
     151#endif /* !def __ASSEMBLER__ */
    152152
    153153#endif

  • kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h

    re0a4686 r53ad43c  
    4949#define TSB_FRAMES                      SIZE2FRAMES(TSB_SIZE)
    5050
    51 #ifndef __ASM__
     51#ifndef __ASSEMBLER__
    5252
    5353#include <stdbool.h>
    … …  
    7676extern void dtsb_pte_copy(struct pte *t, bool ro);
    7777
    78 #endif /* !def __ASM__ */
     78#endif /* !def __ASSEMBLER__ */
    7979
    8080#endif

  • kernel/arch/sparc64/include/arch/mm/sun4v/tte.h

    re0a4686 r53ad43c  
    4848#define MMU_FLAG_DTLB   1       /**< operation applies to DTLB */
    4949
    50 #ifndef __ASM__
     50#ifndef __ASSEMBLER__
    5151
    5252#include <stdint.h>
    … …  
    7676#define VA_TAG_PAGE_SHIFT       22
    7777
    78 #endif /* !def __ASM__ */
     78#endif /* !def __ASSEMBLER__ */
    7979
    8080#endif

  • kernel/arch/sparc64/include/arch/sun4u/cpu.h

    re0a4686 r53ad43c  
    5252#define IMPL_SPARC64V  0x5
    5353
    54 #ifndef __ASM__
     54#ifndef __ASSEMBLER__
    5555
    5656#include <arch/register.h>

  • kernel/arch/sparc64/include/arch/sun4v/cpu.h

    re0a4686 r53ad43c  
    4242#define MAX_CORE_STRANDS  8
    4343
    44 #ifndef __ASM__
     44#ifndef __ASSEMBLER__
    4545
    4646#include <atomic.h>

  • kernel/arch/sparc64/include/arch/sun4v/hypercall.h

    re0a4686 r53ad43c  
    117117
    118118
    119 #ifndef __ASM__
     119#ifndef __ASSEMBLER__
    120120
    121121#include <stdint.h>

  • kernel/arch/sparc64/include/arch/trap/exception.h

    re0a4686 r53ad43c  
    6565#define TT_STQF_MEM_ADDRESS_NOT_ALIGNED         0x39
    6666
    67 #ifndef __ASM__
     67#ifndef __ASSEMBLER__
    6868
    6969#include <arch/interrupt.h>
    … …  
    9191extern void STQF_mem_address_not_aligned(unsigned int, istate_t *);
    9292
    93 #endif /* !__ASM__ */
     93#endif /* !__ASSEMBLER__ */
    9494
    9595#endif

  • kernel/arch/sparc64/include/arch/trap/interrupt.h

    re0a4686 r53ad43c  
    6363#define IGN_SHIFT       6
    6464
    65 #ifndef __ASM__
     65#ifndef __ASSEMBLER__
    6666
    6767#include <arch/interrupt.h>
    … …  
    6969extern void interrupt(unsigned int n, istate_t *istate);
    7070
    71 #endif /* !def __ASM__ */
     71#endif /* !def __ASSEMBLER__ */
    7272
    7373

  • kernel/arch/sparc64/include/arch/trap/regwin.h

    re0a4686 r53ad43c  
    7878#define UWB_ALIGNMENT   1024
    7979
    80 #ifdef __ASM__
     80#ifdef __ASSEMBLER__
    8181
    8282/*
    … …  
    202202        retry
    203203.endm
    204 #endif /* __ASM__ */
     204#endif /* __ASSEMBLER__ */
    205205
    206206#if defined(SUN4U)

  • kernel/arch/sparc64/include/arch/trap/sun4u/mmu.h

    re0a4686 r53ad43c  
    5555#define FAST_MMU_HANDLER_SIZE                   128
    5656
    57 #ifdef __ASM__
     57#ifdef __ASSEMBLER__
    5858
    5959.macro FAST_INSTRUCTION_ACCESS_MMU_MISS_HANDLER
    … …  
    166166.endm
    167167
    168 #endif /* __ASM__ */
     168#endif /* __ASSEMBLER__ */
    169169
    170170#endif

  • kernel/arch/sparc64/include/arch/trap/sun4u/regwin.h

    re0a4686 r53ad43c  
    3333#define KERN_sparc64_sun4u_REGWIN_H_
    3434
    35 #ifdef __ASM__
     35#ifdef __ASSEMBLER__
    3636
    3737/*

  • kernel/arch/sparc64/include/arch/trap/sun4v/interrupt.h

    re0a4686 r53ad43c  
    3838#define KERN_sparc64_TRAP_SUN4V_INTERRUPT_H_
    3939
    40 #ifndef __ASM__
     40#ifndef __ASSEMBLER__
    4141
    4242#include <arch/istate_struct.h>

  • kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h

    re0a4686 r53ad43c  
    6161#define FAST_MMU_HANDLER_SIZE                   128
    6262
    63 #ifdef __ASM__
     63#ifdef __ASSEMBLER__
    6464
    6565/* MMU fault status area data fault offset */
    … …  
    181181        PREEMPTIBLE_HANDLER exc_dispatch
    182182.endm
    183 #endif /* __ASM__ */
     183#endif /* __ASSEMBLER__ */
    184184
    185185#endif

  • kernel/arch/sparc64/include/arch/trap/sun4v/regwin.h

    re0a4686 r53ad43c  
    3434#define KERN_sparc64_sun4v_REGWIN_H_
    3535
    36 #ifdef __ASM__
     36#ifdef __ASSEMBLER__
    3737
    3838/*

  • kernel/arch/sparc64/include/arch/trap/trap_table.h

    re0a4686 r53ad43c  
    4343#define TRAP_TABLE_SIZE         (TRAP_TABLE_ENTRY_COUNT * TRAP_TABLE_ENTRY_SIZE)
    4444
    45 #ifndef __ASM__
     45#ifndef __ASSEMBLER__
    4646
    4747#include <stdint.h>
    … …  
    5656extern trap_table_entry_t trap_table_save[TRAP_TABLE_ENTRY_COUNT];
    5757
    58 #endif /* !__ASM__ */
     58#endif /* !__ASSEMBLER__ */
    5959
    60 #ifdef __ASM__
     60#ifdef __ASSEMBLER__
    6161.macro SAVE_GLOBALS
    6262        mov %g1, %l1
    … …  
    8585.endm
    8686
    87 #endif /* __ASM__ */
     87#endif /* __ASSEMBLER__ */
    8888
    8989#endif

  • kernel/genarch/include/genarch/multiboot/multiboot.h

    re0a4686 r53ad43c  
    5252#define MULTIBOOT_INFO_FLAGS_MMAP       0x40
    5353
    54 #ifndef __ASM__
     54#ifndef __ASSEMBLER__
    5555
    5656#include <typedefs.h>
    … …  
    7777extern void multiboot_info_parse(uint32_t, const multiboot_info_t *);
    7878
    79 #endif /* __ASM__ */
     79#endif /* __ASSEMBLER__ */
    8080
    8181#endif

  • kernel/genarch/include/genarch/multiboot/multiboot2.h

    re0a4686 r53ad43c  
    6161#define MULTIBOOT2_VISUAL_EGA      2
    6262
    63 #ifndef __ASM__
     63#ifndef __ASSEMBLER__
    6464
    6565#include <typedefs.h>
    … …  
    153153extern void multiboot2_info_parse(uint32_t, const multiboot2_info_t *);
    154154
    155 #endif /* __ASM__ */
     155#endif /* __ASSEMBLER__ */
    156156
    157157#endif

  • kernel/generic/include/config.h

    re0a4686 r53ad43c  
    5050#define CONFIG_TASK_ARGUMENTS_BUFLEN 64
    5151
    52 #ifndef __ASM__
     52#ifndef __ASSEMBLER__
    5353
    5454#include <stdbool.h>
    … …  
    109109extern ballocs_t ballocs;
    110110
    111 #endif /* __ASM__ */
     111#endif /* __ASSEMBLER__ */
    112112
    113113#endif

  • kernel/generic/include/macros.h

    re0a4686 r53ad43c  
    3636#define KERN_MACROS_H_
    3737
    38 #ifndef __ASM__
     38#ifndef __ASSEMBLER__
    3939
    4040#include <stdint.h>
    … …  
    9898}
    9999
    100 #endif /* __ASM__ */
     100#endif /* __ASSEMBLER__ */
    101101
    102102#define ispwr2(x)  (((x) & ((x) - 1)) == 0)

  • kernel/generic/include/mm/asid.h

    re0a4686 r53ad43c  
    4141#define KERN_ASID_H_
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545#include <arch/mm/asid.h>
    … …  
    5555#define ASID_MAX        ASID_MAX_ARCH
    5656
    57 #ifndef __ASM__
     57#ifndef __ASSEMBLER__
    5858
    5959#define ASIDS_ALLOCABLE ((ASID_MAX + 1) - ASID_START)

  • tools/autogen.py

    re0a4686 r53ad43c  
    133133#define AUTOGEN_%s_H
    134134
    135 #ifndef __ASM__
     135#ifndef __ASSEMBLER__
    136136%s
    137137#endif
    … …  
    139139%s
    140140
    141 #ifndef __ASM__
     141#ifndef __ASSEMBLER__
    142142%s
    143143#endif

  • uspace/Makefile.common

    re0a4686 r53ad43c  
    332332
    333333%.o: %.S | depend
    334         $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
     334        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS)
    335335
    336336%.o: %.s | depend
    337         $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
     337        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS)
    338338
    339339%.o: %.c | depend
    … …  
    344344
    345345%.lo: %.S | depend
    346         $(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
     346        $(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS)
    347347
    348348%.lo: %.s | depend
    349         $(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
     349        $(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS)
    350350
    351351%.lo: %.c | depend
Note: See TracChangeset for help on using the changeset viewer.