Changeset 2ddcc7b in mainline for kernel/arch/amd64/include

Timestamp:

2010-06-27T23:02:55Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

33dac7d

Parents:

74c5a1ca

Message:

cstyle cleanup (no change in functionality)

Location:

kernel/arch/amd64/include

Files:

• arch.h (modified) (1 diff)
• boot/boot.h (modified) (2 diffs)
• context.h (modified) (1 diff)
• elf.h (modified) (2 diffs)
• faddr.h (modified) (2 diffs)
• mm/ptl.h (modified) (2 diffs)
• mm/tlb.h (modified) (1 diff)
• pm.h (modified) (1 diff)
• proc/thread.h (modified) (1 diff)

kernel/arch/amd64/include/arch.h

@@ -27 +27 @@
  */
 
-/** @addtogroup amd64   
+/** @addtogroup amd64
  * @{
  */

kernel/arch/amd64/include/boot/boot.h

@@ -27 +27 @@
  */
 
-/** @addtogroup amd64   
+/** @addtogroup amd64
  * @{
  */
@@ -36 +36 @@
 #define KERN_amd64_BOOT_H_
 
-#define BOOT_OFFSET             0x108000
-#define AP_BOOT_OFFSET          0x8000
-#define BOOT_STACK_SIZE         0x400
+#define BOOT_OFFSET      0x108000
+#define AP_BOOT_OFFSET   0x008000
+#define BOOT_STACK_SIZE  0x000400
 
-#define MULTIBOOT_HEADER_MAGIC  0x1BADB002
-#define MULTIBOOT_HEADER_FLAGS  0x00010003
+#define MULTIBOOT_HEADER_MAGIC  0x1BADB002
+#define MULTIBOOT_HEADER_FLAGS  0x00010003
 
 #ifndef __ASM__

kernel/arch/amd64/include/context.h

@@ -59 +59 @@
  */
 typedef struct {
-    uintptr_t sp;
-    uintptr_t pc;
-    
-    uint64_t rbx;
-    uint64_t rbp;
-
-    uint64_t r12;
-    uint64_t r13;
-    uint64_t r14;
-    uint64_t r15;
-
-    ipl_t ipl;
+        uintptr_t sp;
+        uintptr_t pc;
+        
+        uint64_t rbx;
+        uint64_t rbp;
+        
+        uint64_t r12;
+        uint64_t r13;
+        uint64_t r14;
+        uint64_t r15;
+        
+        ipl_t ipl;
 } __attribute__ ((packed)) context_t;
 

kernel/arch/amd64/include/elf.h

@@ -27 +27 @@
  */
 
-/** @addtogroup amd64   
+/** @addtogroup amd64
  * @{
  */
@@ -36 +36 @@
 #define KERN_amd64_ELF_H_
 
-#define ELF_MACHINE             EM_X86_64
-#define ELF_DATA_ENCODING       ELFDATA2LSB
-#define ELF_CLASS               ELFCLASS64
+#define ELF_MACHINE        EM_X86_64
+#define ELF_DATA_ENCODING  ELFDATA2LSB
+#define ELF_CLASS          ELFCLASS64
 
 #endif

kernel/arch/amd64/include/faddr.h

@@ -27 +27 @@
  */
 
-/** @addtogroup amd64   
+/** @addtogroup amd64
  * @{
  */
@@ -38 +38 @@
 #include <typedefs.h>
 
-#define FADDR(fptr)             ((uintptr_t) (fptr))
+#define FADDR(fptr)  ((uintptr_t) (fptr))
 
 #endif

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

@@ -27 +27 @@
  */
 
-/** @addtogroup amd64mm 
+/** @addtogroup amd64mm
  * @{
  */
@@ -36 +36 @@
 #define KERN_amd64_PTL_H_
 
-#define PTL_NO_EXEC       (1<<63)
-#define PTL_ACCESSED      (1<<5)
-#define PTL_CACHE_DISABLE (1<<4)
-#define PTL_CACHE_THROUGH (1<<3)
-#define PTL_USER          (1<<2)
-#define PTL_WRITABLE      (1<<1)
-#define PTL_PRESENT       1
-#define PTL_2MB_PAGE      (1<<7)
+#define PTL_NO_EXEC        (1 << 63)
+#define PTL_ACCESSED       (1 << 5)
+#define PTL_CACHE_DISABLE  (1 << 4)
+#define PTL_CACHE_THROUGH  (1 << 3)
+#define PTL_USER           (1 << 2)
+#define PTL_WRITABLE       (1 << 1)
+#define PTL_PRESENT        1
+#define PTL_2MB_PAGE       (1 << 7)
 
 

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

@@ -27 +27 @@
  */
 
-/** @addtogroup amd64mm 
+/** @addtogroup amd64mm
  * @{
  */

kernel/arch/amd64/include/pm.h

@@ -71 +71 @@
 #define PL_USER    3
 
-#define AR_PRESENT   ( 1 << 7)
+#define AR_PRESENT    (1 << 7)
 #define AR_DATA       (2 << 3)
 #define AR_CODE       (3 << 3)

kernel/arch/amd64/include/proc/thread.h

@@ -37 +37 @@
 
 /* CAUTION: keep these in sync with low level assembly code in syscall_entry */
-#define SYSCALL_USTACK_RSP      0
-#define SYSCALL_KSTACK_RSP      1
+#define SYSCALL_USTACK_RSP  0
+#define SYSCALL_KSTACK_RSP  1
 
 typedef struct {
         unative_t tls;
         /** User and kernel RSP for syscalls. */
-        uint64_t syscall_rsp[2];        
+        uint64_t syscall_rsp[2];
 } thread_arch_t;