Changeset d78d603 in mainline


Ignore:
Timestamp:
2007-01-10T13:11:28Z (18 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c738d65
Parents:
4e33b6b
Message:

Formatting and indentation fixes.

Location:
kernel
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/include/asm.h

    r4e33b6b rd78d603  
    266266}
    267267
     268/** Read Trap Program Counter register.
     269 *
     270 * @return Current value in TPC.
     271 */
     272static inline uint64_t tpc_read(void)
     273{
     274        uint64_t v;
     275       
     276        __asm__ volatile ("rdpr %%tpc, %0\n" : "=r" (v));
     277       
     278        return v;
     279}
     280
     281/** Read Trap Level register.
     282 *
     283 * @return Current value in TL.
     284 */
     285static inline uint64_t tl_read(void)
     286{
     287        uint64_t v;
     288       
     289        __asm__ volatile ("rdpr %%tl, %0\n" : "=r" (v));
     290       
     291        return v;
     292}
     293
    268294/** Read Trap Base Address register.
    269295 *
    … …  
    275301       
    276302        __asm__ volatile ("rdpr %%tba, %0\n" : "=r" (v));
    277        
    278         return v;
    279 }
    280 
    281 /** Read Trap Program Counter register.
    282  *
    283  * @return Current value in TPC.
    284  */
    285 static inline uint64_t tpc_read(void)
    286 {
    287         uint64_t v;
    288        
    289         __asm__ volatile ("rdpr %%tpc, %0\n" : "=r" (v));
    290        
    291         return v;
    292 }
    293 
    294 /** Read Trap Level register.
    295  *
    296  * @return Current value in TL.
    297  */
    298 static inline uint64_t tl_read(void)
    299 {
    300         uint64_t v;
    301        
    302         __asm__ volatile ("rdpr %%tl, %0\n" : "=r" (v));
    303303       
    304304        return v;

  • kernel/arch/sparc64/include/debug.h

    r4e33b6b rd78d603  
    11/*
    2  * Copyright (C) 2005
     2 * Copyright (C) 2005 Jakub Jermar
    33 * All rights reserved.
    44 *

  • kernel/arch/sparc64/include/mm/frame.h

    r4e33b6b rd78d603  
    3737
    3838#define FRAME_WIDTH             13      /* 8K */
    39 #define FRAME_SIZE              (1<<FRAME_WIDTH)
     39#define FRAME_SIZE              (1 << FRAME_WIDTH)
    4040
    4141#ifdef KERNEL

  • kernel/arch/sparc64/include/regdef.h

    r4e33b6b rd78d603  
    3636#define KERN_sparc64_REGDEF_H_
    3737
    38 #define PSTATE_IE_BIT   (1<<1)
    39 #define PSTATE_AM_BIT   (1<<3)
     38#define PSTATE_IE_BIT   (1 << 1)
     39#define PSTATE_AM_BIT   (1 << 3)
    4040
    41 #define PSTATE_AG_BIT   (1<<0)
    42 #define PSTATE_IG_BIT   (1<<11)
    43 #define PSTATE_MG_BIT   (1<<10)
     41#define PSTATE_AG_BIT   (1 << 0)
     42#define PSTATE_IG_BIT   (1 << 11)
     43#define PSTATE_MG_BIT   (1 << 10)
    4444
    45 #define PSTATE_PRIV_BIT (1<<2)
    46 #define PSTATE_PEF_BIT  (1<<4)
     45#define PSTATE_PRIV_BIT (1 << 2)
     46#define PSTATE_PEF_BIT  (1 << 4)
    4747
    4848#define TSTATE_PSTATE_SHIFT     8
    49 #define TSTATE_PRIV_BIT         (PSTATE_PRIV_BIT<<TSTATE_PSTATE_SHIFT)
    50 #define TSTATE_IE_BIT           (PSTATE_IE_BIT<<TSTATE_PSTATE_SHIFT)
    51 #define TSTATE_PEF_BIT          (PSTATE_PEF_BIT<<TSTATE_PSTATE_SHIFT)
     49#define TSTATE_PRIV_BIT         (PSTATE_PRIV_BIT << TSTATE_PSTATE_SHIFT)
     50#define TSTATE_IE_BIT           (PSTATE_IE_BIT << TSTATE_PSTATE_SHIFT)
     51#define TSTATE_PEF_BIT          (PSTATE_PEF_BIT << TSTATE_PSTATE_SHIFT)
    5252
    5353#define TSTATE_CWP_MASK         0x1f
    5454
    5555#define WSTATE_NORMAL(n)        (n)
    56 #define WSTATE_OTHER(n)         ((n)<<3)
     56#define WSTATE_OTHER(n)         ((n) << 3)
    5757
    5858#define UPA_CONFIG_MID_SHIFT    17

  • kernel/arch/sparc64/include/trap/interrupt.h

    r4e33b6b rd78d603  
    4444#define IGN_MASK        0x7c0
    4545#define INO_MASK        0x1f
    46 #define IMAP_V_MASK     (1ULL<<31)
     46#define IMAP_V_MASK     (1ULL << 31)
    4747
    4848#define IGN_SHIFT       6

  • kernel/arch/sparc64/include/trap/syscall.h

    r4e33b6b rd78d603  
    4040#define KERN_sparc64_SYSCALL_TRAP_H_
    4141
    42 #define TT_TRAP_INSTRUCTION(n)          (0x100+(n))
     42#define TT_TRAP_INSTRUCTION(n)          (0x100 + (n))
    4343#define TT_TRAP_INSTRUCTION_LAST        TT_TRAP_INSTRUCTION(127)
    4444

  • kernel/arch/sparc64/include/trap/trap_table.h

    r4e33b6b rd78d603  
    4040#define TRAP_TABLE_ENTRY_COUNT  1024
    4141#define TRAP_TABLE_ENTRY_SIZE   32
    42 #define TRAP_TABLE_SIZE         (TRAP_TABLE_ENTRY_COUNT*TRAP_TABLE_ENTRY_SIZE)
     42#define TRAP_TABLE_SIZE         (TRAP_TABLE_ENTRY_COUNT * TRAP_TABLE_ENTRY_SIZE)
    4343
    4444#ifndef __ASM__

  • kernel/generic/src/proc/scheduler.c

    r4e33b6b rd78d603  
    502502        printf("cpu%d: tid %d (priority=%d, ticks=%lld, nrdy=%ld)\n",
    503503                CPU->id, THREAD->tid, THREAD->priority, THREAD->ticks,
    504                         atomic_get(&CPU->nrdy));
     504                atomic_get(&CPU->nrdy));
    505505#endif 
    506506
Note: See TracChangeset for help on using the changeset viewer.