Changeset 53ad43c in mainline for kernel/arch/riscv64

Timestamp:

2018-03-08T18:54:30Z (8 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/riscv64/include/arch

Files:

• boot/boot.h (modified) (1 diff)
• cpu.h (modified) (2 diffs)
• mm/frame.h (modified) (2 diffs)
• mm/page.h (modified) (3 diffs)

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

@@ -45 +45 @@
 #define TEMP_STACK_SIZE  0x1000
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stddef.h>

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

@@ -45 +45 @@
 #define SATP_MODE_SV48  UINT64_C(0x9000000000000000)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 typedef struct {
@@ -52 +52 @@
 extern void cpu_setup_fpu(void);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif

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

@@ -41 +41 @@
 #define FRAME_LOWPRIO  0
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/boot/boot.h>
@@ -54 +54 @@
 extern void physmem_print(void);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif

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

@@ -41 +41 @@
 #define PAGE_SIZE   FRAME_SIZE
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
         #define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
         #define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
@@ -159 +159 @@
 #define PTE_EXECUTABLE_ARCH(pte)  ((pte)->executable != 0)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <mm/mm.h>
@@ -216 +216 @@
 extern void write_satp(uintptr_t);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif