Changeset 53ad43c in mainline for kernel/arch/sparc64

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/sparc64/include/arch

Files:

• arch.h (modified) (3 diffs)
• boot/boot.h (modified) (1 diff)
• cpu.h (modified) (1 diff)
• mm/frame.h (modified) (1 diff)
• mm/page.h (modified) (2 diffs)
• mm/sun4u/frame.h (modified) (1 diff)
• mm/sun4u/mmu.h (modified) (2 diffs)
• mm/sun4u/tlb.h (modified) (2 diffs)
• mm/sun4u/tsb.h (modified) (2 diffs)
• mm/sun4u/tte.h (modified) (2 diffs)
• mm/sun4v/page.h (modified) (2 diffs)
• mm/sun4v/tlb.h (modified) (2 diffs)
• mm/sun4v/tsb.h (modified) (2 diffs)
• mm/sun4v/tte.h (modified) (2 diffs)
• sun4u/cpu.h (modified) (1 diff)
• sun4v/cpu.h (modified) (1 diff)
• sun4v/hypercall.h (modified) (1 diff)
• trap/exception.h (modified) (2 diffs)
• trap/interrupt.h (modified) (2 diffs)
• trap/regwin.h (modified) (2 diffs)
• trap/sun4u/mmu.h (modified) (2 diffs)
• trap/sun4u/regwin.h (modified) (1 diff)
• trap/sun4v/interrupt.h (modified) (1 diff)
• trap/sun4v/mmu.h (modified) (2 diffs)
• trap/sun4v/regwin.h (modified) (1 diff)
• trap/trap_table.h (modified) (3 diffs)

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

@@ -38 +38 @@
 #define KERN_sparc64_ARCH_H_
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #include <arch.h>
 #endif
@@ -55 +55 @@
 #define NWINDOWS  8  /** Number of register window sets. */
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 extern arch_ops_t *sparc64_ops;
@@ -61 +61 @@
 extern void sparc64_pre_main(bootinfo_t *);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif

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

@@ -39 +39 @@
 #define LMA  VMA
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #ifndef __LINKER__
 

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

@@ -52 +52 @@
 #define IMPL_SPARC64V           0x5
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/register.h>

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

@@ -46 +46 @@
 #endif
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <typedefs.h>

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

@@ -54 +54 @@
 #define MMU_PAGES_PER_PAGE      (1 << (PAGE_WIDTH - MMU_PAGE_WIDTH))
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/interrupt.h>
@@ -73 +73 @@
 extern void page_arch_init(void);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif

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

@@ -54 +54 @@
 #define FRAME_LOWPRIO  0
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <typedefs.h>

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

@@ -87 +87 @@
 #endif
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/asm.h>
@@ -116 +116 @@
 #endif /* US */
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif

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

@@ -92 +92 @@
 #define TLB_TAG_ACCESS_VPN_SHIFT        13
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/mm/tte.h>
@@ -687 +687 @@
 extern void describe_dmmu_fault(void);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif

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

@@ -56 +56 @@
 #define TSB_TAG_TARGET_CONTEXT_SHIFT    48
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/mm/tte.h>
@@ -171 +171 @@
 extern void dtsb_pte_copy(struct pte *t, size_t index, bool ro);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif

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

@@ -47 +47 @@
 #define TTE_SIZE_SHIFT  61
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
@@ -97 +97 @@
 typedef union tte_data tte_data_t;
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif

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

@@ -46 +46 @@
 #define MMU_PAGES_PER_PAGE      (1 << (PAGE_WIDTH - MMU_PAGE_WIDTH))
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/interrupt.h>
@@ -65 +65 @@
 extern void page_arch_init(void);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif

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

@@ -40 +40 @@
 #define MMU_FSA_SIZE            128
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/mm/tte.h>
@@ -149 +149 @@
 extern void describe_dmmu_fault(void);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif

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

@@ -49 +49 @@
 #define TSB_FRAMES                      SIZE2FRAMES(TSB_SIZE)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdbool.h>
@@ -76 +76 @@
 extern void dtsb_pte_copy(struct pte *t, bool ro);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif

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

@@ -48 +48 @@
 #define MMU_FLAG_DTLB   1       /**< operation applies to DTLB */
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
@@ -76 +76 @@
 #define VA_TAG_PAGE_SHIFT       22
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif

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

@@ -52 +52 @@
 #define IMPL_SPARC64V  0x5
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/register.h>

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

@@ -42 +42 @@
 #define MAX_CORE_STRANDS  8
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <atomic.h>

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

@@ -117 +117 @@
 
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>

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

@@ -65 +65 @@
 #define TT_STQF_MEM_ADDRESS_NOT_ALIGNED         0x39
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/interrupt.h>
@@ -91 +91 @@
 extern void STQF_mem_address_not_aligned(unsigned int, istate_t *);
 
-#endif /* !__ASM__ */
+#endif /* !__ASSEMBLER__ */
 
 #endif

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

@@ -63 +63 @@
 #define IGN_SHIFT       6
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/interrupt.h>
@@ -69 +69 @@
 extern void interrupt(unsigned int n, istate_t *istate);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 

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

@@ -78 +78 @@
 #define UWB_ALIGNMENT   1024
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 
 /*
@@ -202 +202 @@
         retry
 .endm
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #if defined(SUN4U)

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

@@ -55 +55 @@
 #define FAST_MMU_HANDLER_SIZE                   128
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 
 .macro FAST_INSTRUCTION_ACCESS_MMU_MISS_HANDLER
@@ -166 +166 @@
 .endm
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif

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

@@ -33 +33 @@
 #define KERN_sparc64_sun4u_REGWIN_H_
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 
 /*

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

@@ -38 +38 @@
 #define KERN_sparc64_TRAP_SUN4V_INTERRUPT_H_
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/istate_struct.h>

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

@@ -61 +61 @@
 #define FAST_MMU_HANDLER_SIZE                   128
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 
 /* MMU fault status area data fault offset */
@@ -181 +181 @@
         PREEMPTIBLE_HANDLER exc_dispatch
 .endm
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif

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

@@ -34 +34 @@
 #define KERN_sparc64_sun4v_REGWIN_H_
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 
 /*

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

@@ -43 +43 @@
 #define TRAP_TABLE_SIZE         (TRAP_TABLE_ENTRY_COUNT * TRAP_TABLE_ENTRY_SIZE)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
@@ -56 +56 @@
 extern trap_table_entry_t trap_table_save[TRAP_TABLE_ENTRY_COUNT];
 
-#endif /* !__ASM__ */
+#endif /* !__ASSEMBLER__ */
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 .macro SAVE_GLOBALS
         mov %g1, %l1
@@ -85 +85 @@
 .endm
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif