Changes in kernel/arch/ia32/include/asm.h [b808660:3d6beaa] in mainline

File:

• kernel/arch/ia32/include/asm.h (modified) (24 diffs)

kernel/arch/ia32/include/asm.h

@@ -41 +41 @@
 #include <typedefs.h>
 #include <config.h>
-#include <trace.h>
 
 extern uint32_t interrupt_handler_size;
 
+extern void paging_on(void);
+
+extern void interrupt_handlers(void);
+
+extern void enable_l_apic_in_msr(void);
+
+
+extern void asm_delay_loop(uint32_t t);
+extern void asm_fake_loop(uint32_t t);
+
+
 /** Halt CPU
  *
@@ -50 +60 @@
  *
  */
-NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void)
+static inline __attribute__((noreturn)) void cpu_halt(void)
 {
         while (true) {
@@ -59 +69 @@
 }
 
-NO_TRACE static inline void cpu_sleep(void)
-{
-        asm volatile (
-                "hlt\n"
-        );
-}
-
-#define GEN_READ_REG(reg) NO_TRACE static inline unative_t read_ ##reg (void) \
+static inline void cpu_sleep(void)
+{
+        asm volatile ("hlt\n");
+}
+
+#define GEN_READ_REG(reg) static inline unative_t read_ ##reg (void) \
         { \
                 unative_t res; \
@@ -76 +84 @@
         }
 
-#define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (unative_t regn) \
+#define GEN_WRITE_REG(reg) static inline void write_ ##reg (unative_t regn) \
         { \
                 asm volatile ( \
@@ -111 +119 @@
  *
  */
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
+static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
         asm volatile (
                 "outb %b[val], %w[port]\n"
-                :: [val] "a" (val),
-                   [port] "d" (port)
+                :: [val] "a" (val), [port] "d" (port)
         );
 }
@@ -128 +135 @@
  *
  */
-NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
+static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
         asm volatile (
                 "outw %w[val], %w[port]\n"
-                :: [val] "a" (val),
-                   [port] "d" (port)
+                :: [val] "a" (val), [port] "d" (port)
         );
 }
@@ -145 +151 @@
  *
  */
-NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
+static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
         asm volatile (
                 "outl %[val], %w[port]\n"
-                :: [val] "a" (val),
-                   [port] "d" (port)
+                :: [val] "a" (val), [port] "d" (port)
         );
 }
@@ -162 +167 @@
  *
  */
-NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
+static inline uint8_t pio_read_8(ioport8_t *port)
 {
         uint8_t val;
@@ -183 +188 @@
  *
  */
-NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+static inline uint16_t pio_read_16(ioport16_t *port)
 {
         uint16_t val;
@@ -204 +209 @@
  *
  */
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+static inline uint32_t pio_read_32(ioport32_t *port)
 {
         uint32_t val;
@@ -225 +230 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_enable(void)
+static inline ipl_t interrupts_enable(void)
 {
         ipl_t v;
@@ -247 +252 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_disable(void)
+static inline ipl_t interrupts_disable(void)
 {
         ipl_t v;
@@ -268 +273 @@
  *
  */
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+static inline void interrupts_restore(ipl_t ipl)
 {
         asm volatile (
@@ -282 +287 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_read(void)
+static inline ipl_t interrupts_read(void)
 {
         ipl_t v;
@@ -300 +305 @@
  *
  */
-NO_TRACE static inline bool interrupts_disabled(void)
+static inline bool interrupts_disabled(void)
 {
         ipl_t v;
@@ -314 +319 @@
 
 /** Write to MSR */
-NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
+static inline void write_msr(uint32_t msr, uint64_t value)
 {
         asm volatile (
                 "wrmsr"
-                :: "c" (msr),
-                   "a" ((uint32_t) (value)),
+                :: "c" (msr), "a" ((uint32_t) (value)),
                    "d" ((uint32_t) (value >> 32))
         );
 }
 
-NO_TRACE static inline uint64_t read_msr(uint32_t msr)
+static inline uint64_t read_msr(uint32_t msr)
 {
         uint32_t ax, dx;
@@ -330 +334 @@
         asm volatile (
                 "rdmsr"
-                : "=a" (ax),
-                  "=d" (dx)
+                : "=a" (ax), "=d" (dx)
                 : "c" (msr)
         );
@@ -346 +349 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+static inline uintptr_t get_stack_base(void)
 {
         uintptr_t v;
@@ -364 +367 @@
  *
  */
-NO_TRACE static inline void invlpg(uintptr_t addr)
+static inline void invlpg(uintptr_t addr)
 {
         asm volatile (
@@ -377 +380 @@
  *
  */
-NO_TRACE static inline void gdtr_load(ptr_16_32_t *gdtr_reg)
+static inline void gdtr_load(ptr_16_32_t *gdtr_reg)
 {
         asm volatile (
@@ -390 +393 @@
  *
  */
-NO_TRACE static inline void gdtr_store(ptr_16_32_t *gdtr_reg)
+static inline void gdtr_store(ptr_16_32_t *gdtr_reg)
 {
         asm volatile (
@@ -403 +406 @@
  *
  */
-NO_TRACE static inline void idtr_load(ptr_16_32_t *idtr_reg)
+static inline void idtr_load(ptr_16_32_t *idtr_reg)
 {
         asm volatile (
@@ -416 +419 @@
  *
  */
-NO_TRACE static inline void tr_load(uint16_t sel)
+static inline void tr_load(uint16_t sel)
 {
         asm volatile (
@@ -424 +427 @@
 }
 
-extern void paging_on(void);
-extern void enable_l_apic_in_msr(void);
-
-extern void asm_delay_loop(uint32_t);
-extern void asm_fake_loop(uint32_t);
-
-extern uintptr_t int_0;
-extern uintptr_t int_1;
-extern uintptr_t int_2;
-extern uintptr_t int_3;
-extern uintptr_t int_4;
-extern uintptr_t int_5;
-extern uintptr_t int_6;
-extern uintptr_t int_7;
-extern uintptr_t int_8;
-extern uintptr_t int_9;
-extern uintptr_t int_10;
-extern uintptr_t int_11;
-extern uintptr_t int_12;
-extern uintptr_t int_13;
-extern uintptr_t int_14;
-extern uintptr_t int_15;
-extern uintptr_t int_16;
-extern uintptr_t int_17;
-extern uintptr_t int_18;
-extern uintptr_t int_19;
-extern uintptr_t int_20;
-extern uintptr_t int_21;
-extern uintptr_t int_22;
-extern uintptr_t int_23;
-extern uintptr_t int_24;
-extern uintptr_t int_25;
-extern uintptr_t int_26;
-extern uintptr_t int_27;
-extern uintptr_t int_28;
-extern uintptr_t int_29;
-extern uintptr_t int_30;
-extern uintptr_t int_31;
-extern uintptr_t int_32;
-extern uintptr_t int_33;
-extern uintptr_t int_34;
-extern uintptr_t int_35;
-extern uintptr_t int_36;
-extern uintptr_t int_37;
-extern uintptr_t int_38;
-extern uintptr_t int_39;
-extern uintptr_t int_40;
-extern uintptr_t int_41;
-extern uintptr_t int_42;
-extern uintptr_t int_43;
-extern uintptr_t int_44;
-extern uintptr_t int_45;
-extern uintptr_t int_46;
-extern uintptr_t int_47;
-extern uintptr_t int_48;
-extern uintptr_t int_49;
-extern uintptr_t int_50;
-extern uintptr_t int_51;
-extern uintptr_t int_52;
-extern uintptr_t int_53;
-extern uintptr_t int_54;
-extern uintptr_t int_55;
-extern uintptr_t int_56;
-extern uintptr_t int_57;
-extern uintptr_t int_58;
-extern uintptr_t int_59;
-extern uintptr_t int_60;
-extern uintptr_t int_61;
-extern uintptr_t int_62;
-extern uintptr_t int_63;
-
 #endif