Changeset 8df5f20 in mainline for kernel/arch/amd64

Timestamp:

2019-02-11T14:56:26Z (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:

4805495

Parents:

391996b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 23:26:21)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-11 14:56:26)

Message:

Rename NO_TRACE to _NO_TRACE

<trace.h> may end up transitively included from standard headers,
so it needs to be a reserved identifier.

Location:

kernel/arch/amd64/include/arch

Files:

• asm.h (modified) (25 diffs)
• cycle.h (modified) (1 diff)
• istate.h (modified) (2 diffs)
• mm/page.h (modified) (4 diffs)

kernel/arch/amd64/include/arch/asm.h

@@ -50 +50 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
         uintptr_t v;
@@ -63 +63 @@
 }
 
-NO_TRACE static inline void cpu_sleep(void)
+_NO_TRACE static inline void cpu_sleep(void)
 {
         asm volatile (
@@ -70 +70 @@
 }
 
-NO_TRACE static inline void __attribute__((noreturn)) cpu_halt(void)
+_NO_TRACE static inline void __attribute__((noreturn)) cpu_halt(void)
 {
         while (true) {
@@ -87 +87 @@
  *
  */
-NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
+_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
         if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
@@ -111 +111 @@
  *
  */
-NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
         if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
@@ -135 +135 @@
  *
  */
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
         if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
@@ -159 +159 @@
  *
  */
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
+_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
         if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
@@ -178 +178 @@
  *
  */
-NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
+_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
         if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
@@ -197 +197 @@
  *
  */
-NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
+_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
         if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
@@ -208 +208 @@
 }
 
-NO_TRACE static inline uint64_t read_rflags(void)
+_NO_TRACE static inline uint64_t read_rflags(void)
 {
         uint64_t rflags;
@@ -221 +221 @@
 }
 
-NO_TRACE static inline void write_rflags(uint64_t rflags)
+_NO_TRACE static inline void write_rflags(uint64_t rflags)
 {
         asm volatile (
@@ -237 +237 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_read(void)
+_NO_TRACE static inline ipl_t interrupts_read(void)
 {
         return (ipl_t) read_rflags();
@@ -249 +249 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_enable(void)
+_NO_TRACE static inline ipl_t interrupts_enable(void)
 {
         ipl_t ipl = interrupts_read();
@@ -265 +265 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_disable(void)
+_NO_TRACE static inline ipl_t interrupts_disable(void)
 {
         ipl_t ipl = interrupts_read();
@@ -281 +281 @@
  *
  */
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
         write_rflags((uint64_t) ipl);
@@ -291 +291 @@
  *
  */
-NO_TRACE static inline bool interrupts_disabled(void)
+_NO_TRACE static inline bool interrupts_disabled(void)
 {
         return ((read_rflags() & RFLAGS_IF) == 0);
@@ -297 +297 @@
 
 /** Write to MSR */
-NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
+_NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
 {
         asm volatile (
@@ -307 +307 @@
 }
 
-NO_TRACE static inline sysarg_t read_msr(uint32_t msr)
+_NO_TRACE static inline sysarg_t read_msr(uint32_t msr)
 {
         uint32_t ax, dx;
@@ -325 +325 @@
  *
  */
-NO_TRACE static inline void invlpg(uintptr_t addr)
+_NO_TRACE static inline void invlpg(uintptr_t addr)
 {
         asm volatile (
@@ -338 +338 @@
  *
  */
-NO_TRACE static inline void gdtr_load(ptr_16_64_t *gdtr_reg)
+_NO_TRACE static inline void gdtr_load(ptr_16_64_t *gdtr_reg)
 {
         asm volatile (
@@ -351 +351 @@
  *
  */
-NO_TRACE static inline void gdtr_store(ptr_16_64_t *gdtr_reg)
+_NO_TRACE static inline void gdtr_store(ptr_16_64_t *gdtr_reg)
 {
         asm volatile (
@@ -364 +364 @@
  *
  */
-NO_TRACE static inline void idtr_load(ptr_16_64_t *idtr_reg)
+_NO_TRACE static inline void idtr_load(ptr_16_64_t *idtr_reg)
 {
         asm volatile (
@@ -376 +376 @@
  *
  */
-NO_TRACE static inline void tr_load(uint16_t sel)
+_NO_TRACE static inline void tr_load(uint16_t sel)
 {
         asm volatile (
@@ -384 +384 @@
 }
 
-#define GEN_READ_REG(reg) NO_TRACE static inline sysarg_t read_ ##reg (void) \
+#define GEN_READ_REG(reg) _NO_TRACE static inline sysarg_t read_ ##reg (void) \
         { \
                 sysarg_t res; \
@@ -394 +394 @@
         }
 
-#define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (sysarg_t regn) \
+#define GEN_WRITE_REG(reg) _NO_TRACE static inline void write_ ##reg (sysarg_t regn) \
         { \
                 asm volatile ( \

kernel/arch/amd64/include/arch/cycle.h

@@ -38 +38 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
         uint32_t lower;

kernel/arch/amd64/include/arch/istate.h

@@ -47 +47 @@
 
 /** Return true if exception happened while in userspace */
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
         return (istate->cs & RPL_USER) == RPL_USER;
 }
 
-NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
+_NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
     uintptr_t retaddr)
 {
@@ -58 +58 @@
 }
 
-NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
 {
         return istate->rip;
 }
 
-NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
 {
         return istate->rbp;

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

@@ -207 +207 @@
 } __attribute__((packed)) pte_t;
 
-NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
         pte_t *p = &pt[i];
@@ -220 +220 @@
 }
 
-NO_TRACE static inline void set_pt_addr(pte_t *pt, size_t i, uintptr_t a)
+_NO_TRACE static inline void set_pt_addr(pte_t *pt, size_t i, uintptr_t a)
 {
         pte_t *p = &pt[i];
@@ -228 +228 @@
 }
 
-NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
         pte_t *p = &pt[i];
@@ -245 +245 @@
 }
 
-NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
 {
         pte_t *p = &pt[i];