Index: kernel/arch/abs32le/include/asm.h =================================================================== --- kernel/arch/abs32le/include/asm.h (revision e837f307dba60fa604eac536dfa534653ae37c72) +++ kernel/arch/abs32le/include/asm.h (revision 649efcd10c85afaeb282dd04ea32710ea1e24a4e) @@ -38,10 +38,11 @@ #include #include - -static inline void asm_delay_loop(uint32_t usec) -{ -} - -static inline __attribute__((noreturn)) void cpu_halt(void) +#include + +NO_TRACE static inline void asm_delay_loop(uint32_t usec) +{ +} + +NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void) { /* On real hardware this should stop processing further @@ -53,5 +54,5 @@ } -static inline void cpu_sleep(void) +NO_TRACE static inline void cpu_sleep(void) { /* On real hardware this should put the CPU into low-power @@ -61,5 +62,5 @@ } -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) { } @@ -73,5 +74,5 @@ * */ -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) { } @@ -85,5 +86,5 @@ * */ -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) { } @@ -97,5 +98,5 @@ * */ -static inline uint8_t pio_read_8(ioport8_t *port) +NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port) { return 0; @@ -110,5 +111,5 @@ * */ -static inline uint16_t pio_read_16(ioport16_t *port) +NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port) { return 0; @@ -123,59 +124,72 @@ * */ -static inline uint32_t pio_read_32(ioport32_t *port) -{ - return 0; -} - -static inline ipl_t interrupts_enable(void) -{ - /* On real hardware this unconditionally enables preemption - by internal and external interrupts. - - The return value stores the previous interrupt level. */ - - return 0; -} - -static inline ipl_t interrupts_disable(void) -{ - /* On real hardware this disables preemption by the usual - set of internal and external interrupts. This does not - apply to special non-maskable interrupts and sychronous - CPU exceptions. - - The return value stores the previous interrupt level. */ - - return 0; -} - -static inline void interrupts_restore(ipl_t ipl) -{ - /* On real hardware this either enables or disables preemption - according to the interrupt level value from the argument. */ -} - -static inline ipl_t interrupts_read(void) -{ - /* On real hardware the return value stores the current interrupt - level. */ - - return 0; -} - -static inline bool interrupts_disabled(void) -{ - /* On real hardware the return value is true iff interrupts are - disabled. */ +NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port) +{ + return 0; +} + +NO_TRACE static inline ipl_t interrupts_enable(void) +{ + /* + * On real hardware this unconditionally enables preemption + * by internal and external interrupts. + * + * The return value stores the previous interrupt level. + */ + + return 0; +} + +NO_TRACE static inline ipl_t interrupts_disable(void) +{ + /* + * On real hardware this disables preemption by the usual + * set of internal and external interrupts. This does not + * apply to special non-maskable interrupts and sychronous + * CPU exceptions. + * + * The return value stores the previous interrupt level. + */ + + return 0; +} + +NO_TRACE static inline void interrupts_restore(ipl_t ipl) +{ + /* + * On real hardware this either enables or disables preemption + * according to the interrupt level value from the argument. + */ +} + +NO_TRACE static inline ipl_t interrupts_read(void) +{ + /* + * On real hardware the return value stores the current interrupt + * level. + */ + + return 0; +} + +NO_TRACE static inline bool interrupts_disabled(void) +{ + /* + * On real hardware the return value is true iff interrupts are + * disabled. + */ + return false; } -static inline uintptr_t get_stack_base(void) -{ - /* On real hardware this returns the address of the bottom - of the current CPU stack. The the_t structure is stored - on the bottom of stack and this is used to identify the - current CPU, current task, current thread and current - address space. */ +NO_TRACE static inline uintptr_t get_stack_base(void) +{ + /* + * On real hardware this returns the address of the bottom + * of the current CPU stack. The the_t structure is stored + * on the bottom of stack and this is used to identify the + * current CPU, current task, current thread and current + * address space. + */ return 0; Index: kernel/arch/abs32le/include/atomic.h =================================================================== --- kernel/arch/abs32le/include/atomic.h (revision e837f307dba60fa604eac536dfa534653ae37c72) +++ kernel/arch/abs32le/include/atomic.h (revision 649efcd10c85afaeb282dd04ea32710ea1e24a4e) @@ -40,6 +40,7 @@ #include #include +#include -ATOMIC static inline void atomic_inc(atomic_t *val) +NO_TRACE ATOMIC static inline void atomic_inc(atomic_t *val) WRITES(&val->count) REQUIRES_EXTENT_MUTABLE(val) @@ -52,5 +53,5 @@ } -ATOMIC static inline void atomic_dec(atomic_t *val) +NO_TRACE ATOMIC static inline void atomic_dec(atomic_t *val) WRITES(&val->count) REQUIRES_EXTENT_MUTABLE(val) @@ -63,5 +64,5 @@ } -ATOMIC static inline atomic_count_t atomic_postinc(atomic_t *val) +NO_TRACE ATOMIC static inline atomic_count_t atomic_postinc(atomic_t *val) WRITES(&val->count) REQUIRES_EXTENT_MUTABLE(val) @@ -78,5 +79,5 @@ } -ATOMIC static inline atomic_count_t atomic_postdec(atomic_t *val) +NO_TRACE ATOMIC static inline atomic_count_t atomic_postdec(atomic_t *val) WRITES(&val->count) REQUIRES_EXTENT_MUTABLE(val) @@ -96,5 +97,5 @@ #define atomic_predec(val) (atomic_postdec(val) - 1) -ATOMIC static inline atomic_count_t test_and_set(atomic_t *val) +NO_TRACE ATOMIC static inline atomic_count_t test_and_set(atomic_t *val) WRITES(&val->count) REQUIRES_EXTENT_MUTABLE(val) @@ -109,5 +110,5 @@ } -static inline void atomic_lock_arch(atomic_t *val) +NO_TRACE static inline void atomic_lock_arch(atomic_t *val) WRITES(&val->count) REQUIRES_EXTENT_MUTABLE(val) Index: kernel/arch/abs32le/include/cycle.h =================================================================== --- kernel/arch/abs32le/include/cycle.h (revision e837f307dba60fa604eac536dfa534653ae37c72) +++ kernel/arch/abs32le/include/cycle.h (revision 649efcd10c85afaeb282dd04ea32710ea1e24a4e) @@ -36,5 +36,7 @@ #define KERN_abs32le_CYCLE_H_ -static inline uint64_t get_cycle(void) +#include + +NO_TRACE static inline uint64_t get_cycle(void) { return 0; Index: kernel/arch/abs32le/include/interrupt.h =================================================================== --- kernel/arch/abs32le/include/interrupt.h (revision e837f307dba60fa604eac536dfa534653ae37c72) +++ kernel/arch/abs32le/include/interrupt.h (revision 649efcd10c85afaeb282dd04ea32710ea1e24a4e) @@ -38,4 +38,5 @@ #include #include +#include #define IVT_ITEMS 0 @@ -54,5 +55,5 @@ } istate_t; -static inline int istate_from_uspace(istate_t *istate) +NO_TRACE static inline int istate_from_uspace(istate_t *istate) REQUIRES_EXTENT_MUTABLE(istate) { @@ -63,5 +64,6 @@ } -static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr) +NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) WRITES(&istate->ip) { @@ -71,5 +73,5 @@ } -static inline unative_t istate_get_pc(istate_t *istate) +NO_TRACE static inline unative_t istate_get_pc(istate_t *istate) REQUIRES_EXTENT_MUTABLE(istate) { @@ -79,5 +81,5 @@ } -static inline unative_t istate_get_fp(istate_t *istate) +NO_TRACE static inline unative_t istate_get_fp(istate_t *istate) REQUIRES_EXTENT_MUTABLE(istate) { Index: kernel/arch/abs32le/include/mm/page.h =================================================================== --- kernel/arch/abs32le/include/mm/page.h (revision e837f307dba60fa604eac536dfa534653ae37c72) +++ kernel/arch/abs32le/include/mm/page.h (revision 649efcd10c85afaeb282dd04ea32710ea1e24a4e) @@ -37,4 +37,5 @@ #include +#include #define PAGE_WIDTH FRAME_WIDTH @@ -139,5 +140,5 @@ } __attribute__((packed)) pte_t; -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) REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH) { @@ -155,5 +156,5 @@ } -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) WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH)) REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)