Changeset 7a0359b in mainline for kernel/arch/ppc32/include/asm.h

Timestamp:

2010-07-02T15:42:19Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bbfdf62

Parents:

e3ee9b9

Message:

improve kernel function tracing

• add support for more generic kernel sources
• replace attribute((no_instrument_function)) with NO_TRACE macro (shorter and for future compatibility with different compilers)
• to be on the safe side, do not instrument most of the inline and static functions (plus some specific non-static functions)

collateral code cleanup (no change in functionality)

File:

• kernel/arch/ppc32/include/asm.h (modified) (13 diffs)

kernel/arch/ppc32/include/asm.h

@@ -40 +40 @@
 #include <arch/cpu.h>
 #include <arch/mm/asid.h>
-
-static inline uint32_t msr_read(void)
+#include <trace.h>
+
+NO_TRACE static inline uint32_t msr_read(void)
 {
         uint32_t msr;
@@ -53 +54 @@
 }
 
-static inline void msr_write(uint32_t msr)
+NO_TRACE static inline void msr_write(uint32_t msr)
 {
         asm volatile (
@@ -61 +62 @@
 }
 
-static inline void sr_set(uint32_t flags, asid_t asid, uint32_t sr)
+NO_TRACE static inline void sr_set(uint32_t flags, asid_t asid, uint32_t sr)
 {
         asm volatile (
@@ -70 +71 @@
 }
 
-static inline uint32_t sr_get(uint32_t vaddr)
+NO_TRACE static inline uint32_t sr_get(uint32_t vaddr)
 {
         uint32_t vsid;
@@ -83 +84 @@
 }
 
-static inline uint32_t sdr1_get(void)
+NO_TRACE static inline uint32_t sdr1_get(void)
 {
         uint32_t sdr1;
@@ -103 +104 @@
  *
  */
-static inline ipl_t interrupts_enable(void)
+NO_TRACE static inline ipl_t interrupts_enable(void)
 {
         ipl_t ipl = msr_read();
@@ -118 +119 @@
  *
  */
-static inline ipl_t interrupts_disable(void)
+NO_TRACE static inline ipl_t interrupts_disable(void)
 {
         ipl_t ipl = msr_read();
@@ -132 +133 @@
  *
  */
-static inline void interrupts_restore(ipl_t ipl)
+NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
         msr_write((msr_read() & (~MSR_EE)) | (ipl & MSR_EE));
@@ -144 +145 @@
  *
  */
-static inline ipl_t interrupts_read(void)
+NO_TRACE static inline ipl_t interrupts_read(void)
 {
         return msr_read();
@@ -154 +155 @@
  *
  */
-static inline bool interrupts_disabled(void)
+NO_TRACE static inline bool interrupts_disabled(void)
 {
         return ((msr_read() & MSR_EE) == 0);
@@ -166 +167 @@
  *
  */
-static inline uintptr_t get_stack_base(void)
+NO_TRACE static inline uintptr_t get_stack_base(void)
 {
         uintptr_t base;
@@ -179 +180 @@
 }
 
-static inline void cpu_sleep(void)
-{
+NO_TRACE static inline void cpu_sleep(void)
+{
+}
+
+NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+        *port = v;
+}
+
+NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+        *port = v;
+}
+
+NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+        *port = v;
+}
+
+NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
+{
+        return *port;
+}
+
+NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+{
+        return *port;
+}
+
+NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+{
+        return *port;
 }
 
@@ -187 +218 @@
 extern void userspace_asm(uintptr_t uspace_uarg, uintptr_t stack, uintptr_t entry);
 
-static inline void pio_write_8(ioport8_t *port, uint8_t v)
-{
-        *port = v;
-}
-
-static inline void pio_write_16(ioport16_t *port, uint16_t v)
-{
-        *port = v;
-}
-
-static inline void pio_write_32(ioport32_t *port, uint32_t v)
-{
-        *port = v;
-}
-
-static inline uint8_t pio_read_8(ioport8_t *port)
-{
-        return *port;
-}
-
-static inline uint16_t pio_read_16(ioport16_t *port)
-{
-        return *port;
-}
-
-static inline uint32_t pio_read_32(ioport32_t *port)
-{
-        return *port;
-}
-
 #endif