Changeset b8230b9 in mainline for kernel/arch/ppc32


Ignore:
Timestamp:
2010-05-22T22:20:37Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d354d57
Parents:
3d6beaa
Message:

coding style changes, no change in functionality

Location:
kernel/arch/ppc32
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ppc32/include/elf.h

    r3d6beaa rb8230b9  
    2727 */
    2828
    29 /** @addtogroup ppc32   
     29/** @addtogroup ppc32
    3030 * @{
    3131 */
    … …  
    3636#define KERN_ppc32_ELF_H_
    3737
    38 #define ELF_MACHINE             EM_PPC
    39 #define ELF_DATA_ENCODING       ELFDATA2MSB
    40 #define ELF_CLASS               ELFCLASS32
     38#define ELF_MACHINE        EM_PPC
     39#define ELF_DATA_ENCODING  ELFDATA2MSB
     40#define ELF_CLASS          ELFCLASS32
    4141
    4242#endif

  • kernel/arch/ppc32/include/faddr.h

    r3d6beaa rb8230b9  
    2727 */
    2828
    29 /** @addtogroup ppc32   
     29/** @addtogroup ppc32
    3030 * @{
    3131 */
    … …  
    3838#include <typedefs.h>
    3939
    40 #define FADDR(fptr)             ((uintptr_t) (fptr))
     40#define FADDR(fptr)  ((uintptr_t) (fptr))
    4141
    4242#endif

  • kernel/arch/ppc32/include/fpu_context.h

    r3d6beaa rb8230b9  
    2727 */
    2828
    29 /** @addtogroup ppc32   
     29/** @addtogroup ppc32
    3030 * @{
    3131 */
    … …  
    3636#define KERN_ppc32_FPU_CONTEXT_H_
    3737
    38 #ifndef KERN_ppc32_TYPES_H_
    39         #include <typedefs.h>
    40 #endif
     38#include <typedefs.h>
    4139
    4240typedef struct {

  • kernel/arch/ppc32/include/interrupt.h

    r3d6beaa rb8230b9  
    3838#include <arch/exception.h>
    3939
    40 #define IVT_ITEMS 16
    41 #define IVT_FIRST 0
     40#define IVT_ITEMS  16
     41#define IVT_FIRST  0
    4242
    43 #define VECTOR_DATA_STORAGE 2
    44 #define VECTOR_INSTRUCTION_STORAGE 3
    45 #define VECTOR_EXTERNAL 4
    46 #define VECTOR_DECREMENTER 8
     43#define VECTOR_DATA_STORAGE         2
     44#define VECTOR_INSTRUCTION_STORAGE  3
     45#define VECTOR_EXTERNAL             4
     46#define VECTOR_DECREMENTER          8
    4747
    4848extern void start_decrementer(void);
    4949extern void interrupt_init(void);
    50 extern void extint_handler(int n, istate_t *istate);
     50extern void extint_handler(int, istate_t *);
    5151
    5252#endif

  • kernel/arch/ppc32/include/mm/as.h

    r3d6beaa rb8230b9  
    2727 */
    2828
    29 /** @addtogroup ppc32mm 
     29/** @addtogroup ppc32mm
    3030 * @{
    3131 */
    … …  
    3636#define KERN_ppc32_AS_H_
    3737
    38 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      0
     38#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
    3939
    40 #define KERNEL_ADDRESS_SPACE_START_ARCH         ((unsigned long) 0x80000000)
    41 #define KERNEL_ADDRESS_SPACE_END_ARCH           ((unsigned long) 0xffffffff)
    42 #define USER_ADDRESS_SPACE_START_ARCH           ((unsigned long) 0x00000000)
    43 #define USER_ADDRESS_SPACE_END_ARCH             ((unsigned long) 0x7fffffff)
     40#define KERNEL_ADDRESS_SPACE_START_ARCH  ((unsigned long) 0x80000000)
     41#define KERNEL_ADDRESS_SPACE_END_ARCH    ((unsigned long) 0xffffffff)
     42#define USER_ADDRESS_SPACE_START_ARCH    ((unsigned long) 0x00000000)
     43#define USER_ADDRESS_SPACE_END_ARCH      ((unsigned long) 0x7fffffff)
    4444
    45 #define USTACK_ADDRESS_ARCH     (0x7fffffff - (PAGE_SIZE - 1))
     45#define USTACK_ADDRESS_ARCH  (0x7fffffff - (PAGE_SIZE - 1))
    4646
    4747typedef struct {
    … …  
    5050#include <genarch/mm/as_pt.h>
    5151
    52 #define as_constructor_arch(as, flags)          (as != as)
    53 #define as_destructor_arch(as)                  (as != as)
    54 #define as_create_arch(as, flags)               (as != as)
     52#define as_constructor_arch(as, flags)  (as != as)
     53#define as_destructor_arch(as)          (as != as)
     54#define as_create_arch(as, flags)       (as != as)
    5555#define as_deinstall_arch(as)
    5656#define as_invalidate_translation_cache(as, page, cnt)

  • kernel/arch/ppc32/include/mm/asid.h

    r3d6beaa rb8230b9  
    2727 */
    2828
    29 /** @addtogroup ppc32mm 
     29/** @addtogroup ppc32mm
    3030 * @{
    3131 */
    … …  
    3838#include <typedefs.h>
    3939
    40 #define ASID_MAX_ARCH           4096
     40#define ASID_MAX_ARCH  4096
    4141
    4242typedef uint32_t asid_t;

  • kernel/arch/ppc32/include/mm/page.h

    r3d6beaa rb8230b9  
    2727 */
    2828
    29 /** @addtogroup ppc32mm 
     29/** @addtogroup ppc32mm
    3030 * @{
    3131 */
    … …  
    3838#include <arch/mm/frame.h>
    3939
    40 #define PAGE_WIDTH      FRAME_WIDTH
    41 #define PAGE_SIZE       FRAME_SIZE
     40#define PAGE_WIDTH  FRAME_WIDTH
     41#define PAGE_SIZE   FRAME_SIZE
    4242
    4343#ifdef KERNEL
    4444
    4545#ifndef __ASM__
    46 #       define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
    47 #       define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)
     46        #define KA2PA(x)  (((uintptr_t) (x)) - 0x80000000)
     47        #define PA2KA(x)  (((uintptr_t) (x)) + 0x80000000)
    4848#else
    49 #       define KA2PA(x) ((x) - 0x80000000)
    50 #       define PA2KA(x) ((x) + 0x80000000)
     49        #define KA2PA(x)  ((x) - 0x80000000)
     50        #define PA2KA(x)  ((x) + 0x80000000)
    5151#endif
    5252
    … …  
    6565
    6666/* Number of entries in each level. */
    67 #define PTL0_ENTRIES_ARCH       1024
    68 #define PTL1_ENTRIES_ARCH       0
    69 #define PTL2_ENTRIES_ARCH       0
    70 #define PTL3_ENTRIES_ARCH       1024
     67#define PTL0_ENTRIES_ARCH  1024
     68#define PTL1_ENTRIES_ARCH  0
     69#define PTL2_ENTRIES_ARCH  0
     70#define PTL3_ENTRIES_ARCH  1024
    7171
    7272/* Page table sizes for each level. */
    73 #define PTL0_SIZE_ARCH          ONE_FRAME
    74 #define PTL1_SIZE_ARCH          0
    75 #define PTL2_SIZE_ARCH          0
    76 #define PTL3_SIZE_ARCH          ONE_FRAME
     73#define PTL0_SIZE_ARCH  ONE_FRAME
     74#define PTL1_SIZE_ARCH  0
     75#define PTL2_SIZE_ARCH  0
     76#define PTL3_SIZE_ARCH  ONE_FRAME
    7777
    7878/* Macros calculating indices into page tables on each level. */
    79 #define PTL0_INDEX_ARCH(vaddr)  (((vaddr) >> 22) & 0x3ff)
    80 #define PTL1_INDEX_ARCH(vaddr)  0
    81 #define PTL2_INDEX_ARCH(vaddr)  0
    82 #define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x3ff)
     79#define PTL0_INDEX_ARCH(vaddr)  (((vaddr) >> 22) & 0x3ff)
     80#define PTL1_INDEX_ARCH(vaddr)  0
     81#define PTL2_INDEX_ARCH(vaddr)  0
     82#define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x3ff)
    8383
    8484/* Get PTE address accessors for each level. */
    8585#define GET_PTL1_ADDRESS_ARCH(ptl0, i) \
    8686        (((pte_t *) (ptl0))[(i)].pfn << 12)
     87
    8788#define GET_PTL2_ADDRESS_ARCH(ptl1, i) \
    8889        (ptl1)
     90
    8991#define GET_PTL3_ADDRESS_ARCH(ptl2, i) \
    9092        (ptl2)
    91 #define GET_FRAME_ADDRESS_ARCH(ptl3, i) \
     93
     94#define GET_FRAME_ADDRESS_ARCH(ptl3, i) \
    9295        (((pte_t *) (ptl3))[(i)].pfn << 12)
    9396
    9497/* Set PTE address accessors for each level. */
    9598#define SET_PTL0_ADDRESS_ARCH(ptl0)
     99
    96100#define SET_PTL1_ADDRESS_ARCH(ptl0, i, a) \
    97101        (((pte_t *) (ptl0))[(i)].pfn = (a) >> 12)
     102
    98103#define SET_PTL2_ADDRESS_ARCH(ptl1, i, a)
    99104#define SET_PTL3_ADDRESS_ARCH(ptl2, i, a)
     105
    100106#define SET_FRAME_ADDRESS_ARCH(ptl3, i, a) \
    101107        (((pte_t *) (ptl3))[(i)].pfn = (a) >> 12)
    … …  
    104110#define GET_PTL1_FLAGS_ARCH(ptl0, i) \
    105111        get_pt_flags((pte_t *) (ptl0), (size_t) (i))
     112
    106113#define GET_PTL2_FLAGS_ARCH(ptl1, i) \
    107114        PAGE_PRESENT
     115
    108116#define GET_PTL3_FLAGS_ARCH(ptl2, i) \
    109117        PAGE_PRESENT
     118
    110119#define GET_FRAME_FLAGS_ARCH(ptl3, i) \
    111120        get_pt_flags((pte_t *) (ptl3), (size_t) (i))
    112121
    113122/* Set PTE flags accessors for each level. */
    114 #define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \
     123#define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \
    115124        set_pt_flags((pte_t *) (ptl0), (size_t) (i), (x))
     125
    116126#define SET_PTL2_FLAGS_ARCH(ptl1, i, x)
    117127#define SET_PTL3_FLAGS_ARCH(ptl2, i, x)
     128
    118129#define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \
    119130        set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
    120131
    121132/* Macros for querying the last-level PTEs. */
    122 #define PTE_VALID_ARCH(pte)                     (*((uint32_t *) (pte)) != 0)
    123 #define PTE_PRESENT_ARCH(pte)                   ((pte)->present != 0)
    124 #define PTE_GET_FRAME_ARCH(pte)                 ((pte)->pfn << 12)
    125 #define PTE_WRITABLE_ARCH(pte)                  1
    126 #define PTE_EXECUTABLE_ARCH(pte)                1
     133#define PTE_VALID_ARCH(pte)       (*((uint32_t *) (pte)) != 0)
     134#define PTE_PRESENT_ARCH(pte)     ((pte)->present != 0)
     135#define PTE_GET_FRAME_ARCH(pte)   ((pte)->pfn << 12)
     136#define PTE_WRITABLE_ARCH(pte)    1
     137#define PTE_EXECUTABLE_ARCH(pte)  1
    127138
    128139#ifndef __ASM__
    … …  
    133144/** Page Table Entry. */
    134145typedef struct {
    135         unsigned present : 1;             /**< Present bit. */
    136         unsigned page_write_through : 1;  /**< Write thought caching. */
    137         unsigned page_cache_disable : 1;  /**< No caching. */
    138         unsigned accessed : 1;            /**< Accessed bit. */
    139         unsigned global : 1;              /**< Global bit. */
    140         unsigned valid : 1;               /**< Valid content even if not present. */
    141         unsigned pfn : 20;                /**< Physical frame number. */
     146        unsigned int present : 1;             /**< Present bit. */
     147        unsigned int page_write_through : 1;  /**< Write thought caching. */
     148        unsigned int page_cache_disable : 1;  /**< No caching. */
     149        unsigned int accessed : 1;            /**< Accessed bit. */
     150        unsigned int global : 1;              /**< Global bit. */
     151        unsigned int valid : 1;               /**< Valid content even if not present. */
     152        unsigned int pfn : 20;                /**< Physical frame number. */
    142153} pte_t;
    143154
    144155static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
    145156{
    146         pte_t *p = &pt[i];
     157        pte_t *entry = &pt[i];
    147158       
    148         return (((!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
    149             ((!p->present) << PAGE_PRESENT_SHIFT) |
     159        return (((!entry->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
     160            ((!entry->present) << PAGE_PRESENT_SHIFT) |
    150161            (1 << PAGE_USER_SHIFT) |
    151162            (1 << PAGE_READ_SHIFT) |
    152163            (1 << PAGE_WRITE_SHIFT) |
    153164            (1 << PAGE_EXEC_SHIFT) |
    154             (p->global << PAGE_GLOBAL_SHIFT));
     165            (entry->global << PAGE_GLOBAL_SHIFT));
    155166}
    156167
    157168static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
    158169{
    159         pte_t *p = &pt[i];
     170        pte_t *entry = &pt[i];
    160171       
    161         p->page_cache_disable = !(flags & PAGE_CACHEABLE);
    162         p->present = !(flags & PAGE_NOT_PRESENT);
    163         p->global = (flags & PAGE_GLOBAL) != 0;
    164         p->valid = 1;
     172        entry->page_cache_disable = !(flags & PAGE_CACHEABLE);
     173        entry->present = !(flags & PAGE_NOT_PRESENT);
     174        entry->global = (flags & PAGE_GLOBAL) != 0;
     175        entry->valid = 1;
    165176}
    166177

  • kernel/arch/ppc32/include/mm/tlb.h

    r3d6beaa rb8230b9  
    2727 */
    2828
    29 /** @addtogroup ppc32mm 
     29/** @addtogroup ppc32mm
    3030 * @{
    3131 */
    … …  
    4545
    4646typedef struct {
    47         unsigned v : 1;          /**< Valid */
    48         unsigned vsid : 24;      /**< Virtual Segment ID */
    49         unsigned h : 1;          /**< Primary/secondary hash */
    50         unsigned api : 6;        /**< Abbreviated Page Index */
    51         unsigned rpn : 20;       /**< Real Page Number */
    52         unsigned reserved0 : 3;
    53         unsigned r : 1;          /**< Reference */
    54         unsigned c : 1;          /**< Change */
    55         unsigned wimg : 4;       /**< Access control */
    56         unsigned reserved1 : 1;
    57         unsigned pp : 2;         /**< Page protection */
     47        unsigned int v : 1;          /**< Valid */
     48        unsigned int vsid : 24;      /**< Virtual Segment ID */
     49        unsigned int h : 1;          /**< Primary/secondary hash */
     50        unsigned int api : 6;        /**< Abbreviated Page Index */
     51        unsigned int rpn : 20;       /**< Real Page Number */
     52        unsigned int reserved0 : 3;
     53        unsigned int r : 1;          /**< Reference */
     54        unsigned int c : 1;          /**< Change */
     55        unsigned int wimg : 4;       /**< Access control */
     56        unsigned int reserved1 : 1;
     57        unsigned int pp : 2;         /**< Page protection */
    5858} phte_t;
    5959
    6060typedef struct {
    61         unsigned v : 1;
    62         unsigned vsid : 24;
    63         unsigned reserved0 : 1;
    64         unsigned api : 6;
     61        unsigned int v : 1;
     62        unsigned int vsid : 24;
     63        unsigned int reserved0 : 1;
     64        unsigned int api : 6;
    6565} ptehi_t;
    6666
    6767typedef struct {
    68         unsigned rpn : 20;
    69         unsigned xpn : 3;
    70         unsigned reserved0 : 1;
    71         unsigned c : 1;
    72         unsigned wimg : 4;
    73         unsigned x : 1;
    74         unsigned pp : 2;
     68        unsigned int rpn : 20;
     69        unsigned int xpn : 3;
     70        unsigned int reserved0 : 1;
     71        unsigned int c : 1;
     72        unsigned int wimg : 4;
     73        unsigned int x : 1;
     74        unsigned int pp : 2;
    7575} ptelo_t;
    7676
    7777extern void pht_init(void);
    78 extern void pht_refill(int n, istate_t *istate);
    79 extern bool pht_refill_real(int n, istate_t *istate) __attribute__ ((section("K_UNMAPPED_TEXT_START")));
    80 extern void tlb_refill_real(int n, uint32_t tlbmiss, ptehi_t ptehi, ptelo_t ptelo, istate_t *istate) __attribute__ ((section("K_UNMAPPED_TEXT_START")));
     78extern void pht_refill(int, istate_t *);
     79
     80extern bool pht_refill_real(int, istate_t *)
     81    __attribute__ ((section("K_UNMAPPED_TEXT_START")));
     82extern void tlb_refill_real(int, uint32_t, ptehi_t, ptelo_t, istate_t *)
     83    __attribute__ ((section("K_UNMAPPED_TEXT_START")));
    8184
    8285#endif

  • kernel/arch/ppc32/src/context.S

    r3d6beaa rb8230b9  
    2929#include <arch/context_offset.h>
    3030
    31 .text   
     31.text
    3232
    3333.global context_save_arch
    … …  
    4646        li r3, 1
    4747        blr
    48        
     48
    4949context_restore_arch:
    5050        CONTEXT_RESTORE_ARCH_CORE r3

  • kernel/arch/ppc32/src/ddi/ddi.c

    r3d6beaa rb8230b9  
    4646 *
    4747 * @return 0 on success or an error code from errno.h.
     48 *
    4849 */
    4950int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)

  • kernel/arch/ppc32/src/debug/panic.s

    r3d6beaa rb8230b9  
    3535        lis %r14, halt@ha
    3636        addi %r14, %r14, halt@l
    37         mtlr %r14       # fake stack to make printf return to halt
     37        mtlr %r14  # fake stack to make printf return to halt
    3838        b printf

  • kernel/arch/ppc32/src/fpu_context.S

    r3d6beaa rb8230b9  
    3030#include <arch/context_offset.h>
    3131
    32 .text   
     32.text
    3333
    3434.global fpu_context_save
    … …  
    8787       
    8888        blr
    89        
     89
    9090fpu_context_restore:
    9191//      FPU_CONTEXT_LOAD r3
Note: See TracChangeset for help on using the changeset viewer.