Changeset da1bafb in mainline for kernel/arch/mips32/include

Timestamp:

2010-05-24T18:57:31Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0095368

Parents:

666f492

Message:

major code revision

• replace spinlocks taken with interrupts disabled with irq_spinlocks
• change spacing (not indendation) to be tab-size independent
• use unsigned integer types where appropriate (especially bit flags)
• visual separation
• remove argument names in function prototypes
• string changes
• correct some formating directives
• replace various cryptic single-character variables (t, a, m, c, b, etc.) with proper identifiers (thread, task, timeout, as, itm, itc, etc.)
• unify some assembler constructs
• unused page table levels are now optimized out in compile time
• replace several ints (with boolean semantics) with bools
• use specifically sized types instead of generic types where appropriate (size_t, uint32_t, btree_key_t)
• improve comments
• split asserts with conjuction into multiple independent asserts

Location:

kernel/arch/mips32/include

Files:

• asm.h (modified) (3 diffs)
• debugger.h (modified) (1 diff)
• mm/as.h (modified) (2 diffs)

kernel/arch/mips32/include/asm.h

@@ -39 +39 @@
 #include <config.h>
 
-
 static inline void cpu_sleep(void)
 {
@@ -47 +46 @@
 
 /** Return base address of current stack
- * 
+ *
  * Return the base address of the current stack.
  * The stack is assumed to be STACK_SIZE bytes long.
  * The stack must start on page boundary.
+ *
  */
 static inline uintptr_t get_stack_base(void)
 {
-        uintptr_t v;
+        uintptr_t base;
         
         asm volatile (
-                "and %0, $29, %1\n"
-                : "=r" (v)
-                : "r" (~(STACK_SIZE-1))
+                "and %[base], $29, %[mask]\n"
+                : [base] "=r" (base)
+                : [mask] "r" (~(STACK_SIZE - 1))
         );
         
-        return v;
+        return base;
 }
 
@@ -78 +78 @@
 static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {
-        *port = v;      
+        *port = v;
 }
 
 static inline void pio_write_16(ioport16_t *port, uint16_t v)
 {
-        *port = v;      
+        *port = v;
 }
 
 static inline void pio_write_32(ioport32_t *port, uint32_t v)
 {
-        *port = v;      
+        *port = v;
 }
 

kernel/arch/mips32/include/debugger.h

@@ -41 +41 @@
 #define BKPOINTS_MAX 10
 
-#define BKPOINT_INPROG   (1 << 0)   /**< Breakpoint was shot */
-#define BKPOINT_ONESHOT  (1 << 1)   /**< One-time breakpoint,mandatory for j/b
-                                         instructions */
-#define BKPOINT_REINST   (1 << 2)   /**< Breakpoint is set on the next 
-                                         instruction, so that it could be
-                                         reinstalled on the previous one */
-#define BKPOINT_FUNCCALL (1 << 3)   /**< Call a predefined function */
+/** Breakpoint was shot */
+#define BKPOINT_INPROG  (1 << 0)
+
+/** One-time breakpoint, mandatory for j/b instructions */
+#define BKPOINT_ONESHOT  (1 << 1)
+
+/**
+ * Breakpoint is set on the next instruction, so that it
+ * could be reinstalled on the previous one
+ */
+#define BKPOINT_REINST  (1 << 2)
+
+/** Call a predefined function */
+#define BKPOINT_FUNCCALL  (1 << 3)
+
 
 typedef struct  {
-        uintptr_t address;      /**< Breakpoint address */
-        unative_t instruction; /**< Original instruction */
+        uintptr_t address;          /**< Breakpoint address */
+        unative_t instruction;      /**< Original instruction */
         unative_t nextinstruction;  /**< Original instruction following break */
-        int flags;        /**< Flags regarding breakpoint */
+        unsigned int flags;         /**< Flags regarding breakpoint */
         size_t counter;
-        void (*bkfunc)(void *b, istate_t *istate);
+        void (*bkfunc)(void *, istate_t *);
 } bpinfo_t;
 
+extern bpinfo_t breakpoints[BKPOINTS_MAX];
+
 extern void debugger_init(void);
-void debugger_bpoint(istate_t *istate);
-
-extern bpinfo_t breakpoints[BKPOINTS_MAX];
+extern void debugger_bpoint(istate_t *);
 
 #endif

kernel/arch/mips32/include/mm/as.h

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32mm        
+/** @addtogroup mips32mm
  * @{
  */
@@ -36 +36 @@
 #define KERN_mips32_AS_H_
 
-#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      0
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH         (unsigned long) 0x80000000