| /kernel/trunk/arch/ppc32/include/exception.h |
|---|
| 42,47 → 42,47 |
| #include <typedefs.h> |
| struct istate { |
| __u32 r0; |
| __u32 r2; |
| __u32 r3; |
| __u32 r4; |
| __u32 r5; |
| __u32 r6; |
| __u32 r7; |
| __u32 r8; |
| __u32 r9; |
| __u32 r10; |
| __u32 r11; |
| __u32 r13; |
| __u32 r14; |
| __u32 r15; |
| __u32 r16; |
| __u32 r17; |
| __u32 r18; |
| __u32 r19; |
| __u32 r20; |
| __u32 r21; |
| __u32 r22; |
| __u32 r23; |
| __u32 r24; |
| __u32 r25; |
| __u32 r26; |
| __u32 r27; |
| __u32 r28; |
| __u32 r29; |
| __u32 r30; |
| __u32 r31; |
| __u32 cr; |
| __u32 pc; |
| __u32 srr1; |
| __u32 lr; |
| __u32 ctr; |
| __u32 xer; |
| __u32 r12; |
| __u32 sp; |
| uint32_t r0; |
| uint32_t r2; |
| uint32_t r3; |
| uint32_t r4; |
| uint32_t r5; |
| uint32_t r6; |
| uint32_t r7; |
| uint32_t r8; |
| uint32_t r9; |
| uint32_t r10; |
| uint32_t r11; |
| uint32_t r13; |
| uint32_t r14; |
| uint32_t r15; |
| uint32_t r16; |
| uint32_t r17; |
| uint32_t r18; |
| uint32_t r19; |
| uint32_t r20; |
| uint32_t r21; |
| uint32_t r22; |
| uint32_t r23; |
| uint32_t r24; |
| uint32_t r25; |
| uint32_t r26; |
| uint32_t r27; |
| uint32_t r28; |
| uint32_t r29; |
| uint32_t r30; |
| uint32_t r31; |
| uint32_t cr; |
| uint32_t pc; |
| uint32_t srr1; |
| uint32_t lr; |
| uint32_t ctr; |
| uint32_t xer; |
| uint32_t r12; |
| uint32_t sp; |
| }; |
| static inline void istate_set_retaddr(istate_t *istate, __address retaddr) |
| static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr) |
| { |
| istate->pc = retaddr; |
| } |
| 93,7 → 93,7 |
| panic("istate_from_uspace not yet implemented"); |
| return 0; |
| } |
| static inline __native istate_get_pc(istate_t *istate) |
| static inline unative_t istate_get_pc(istate_t *istate) |
| { |
| return istate->pc; |
| } |
| /kernel/trunk/arch/ppc32/include/fpu_context.h |
|---|
| 40,25 → 40,25 |
| #endif |
| struct fpu_context { |
| __u64 fr14; |
| __u64 fr15; |
| __u64 fr16; |
| __u64 fr17; |
| __u64 fr18; |
| __u64 fr19; |
| __u64 fr20; |
| __u64 fr21; |
| __u64 fr22; |
| __u64 fr23; |
| __u64 fr24; |
| __u64 fr25; |
| __u64 fr26; |
| __u64 fr27; |
| __u64 fr28; |
| __u64 fr29; |
| __u64 fr30; |
| __u64 fr31; |
| __u32 fpscr; |
| uint64_t fr14; |
| uint64_t fr15; |
| uint64_t fr16; |
| uint64_t fr17; |
| uint64_t fr18; |
| uint64_t fr19; |
| uint64_t fr20; |
| uint64_t fr21; |
| uint64_t fr22; |
| uint64_t fr23; |
| uint64_t fr24; |
| uint64_t fr25; |
| uint64_t fr26; |
| uint64_t fr27; |
| uint64_t fr28; |
| uint64_t fr29; |
| uint64_t fr30; |
| uint64_t fr31; |
| uint32_t fpscr; |
| } __attribute__ ((packed)); |
| #endif |
| /kernel/trunk/arch/ppc32/include/byteorder.h |
|---|
| 40,24 → 40,24 |
| #define BIG_ENDIAN |
| static inline __u64 __u64_le2host(__u64 n) |
| static inline uint64_t uint64_t_le2host(uint64_t n) |
| { |
| return __u64_byteorder_swap(n); |
| return uint64_t_byteorder_swap(n); |
| } |
| /** Convert little-endian __native to host __native |
| /** Convert little-endian unative_t to host unative_t |
| * |
| * Convert little-endian __native parameter to host endianess. |
| * Convert little-endian unative_t parameter to host endianess. |
| * |
| * @param n Little-endian __native argument. |
| * @param n Little-endian unative_t argument. |
| * |
| * @return Result in host endianess. |
| * |
| */ |
| static inline __native __native_le2host(__native n) |
| static inline unative_t unative_t_le2host(unative_t n) |
| { |
| __address v; |
| uintptr_t v; |
| asm volatile ( |
| "lwbrx %0, %1, %2\n" |
| /kernel/trunk/arch/ppc32/include/cpuid.h |
|---|
| 38,8 → 38,8 |
| #include <arch/types.h> |
| struct cpu_info { |
| __u16 version; |
| __u16 revision; |
| uint16_t version; |
| uint16_t revision; |
| } __attribute__ ((packed)); |
| static inline void cpu_version(struct cpu_info *info) |
| /kernel/trunk/arch/ppc32/include/types.h |
|---|
| 37,22 → 37,22 |
| #define NULL 0 |
| typedef signed char __s8; |
| typedef signed short __s16; |
| typedef signed int __s32; |
| typedef signed long long __s64; |
| typedef signed char int8_t; |
| typedef signed short int16_t; |
| typedef signed int int32_t; |
| typedef signed long long int64_t; |
| typedef unsigned char __u8; |
| typedef unsigned short __u16; |
| typedef unsigned int __u32; |
| typedef unsigned long long __u64; |
| typedef unsigned char uint8_t; |
| typedef unsigned short uint16_t; |
| typedef unsigned int uint32_t; |
| typedef unsigned long long uint64_t; |
| typedef __u32 __address; |
| typedef __u32 pfn_t; |
| typedef uint32_t uintptr_t; |
| typedef uint32_t pfn_t; |
| typedef __u32 ipl_t; |
| typedef uint32_t ipl_t; |
| typedef __u32 __native; |
| typedef uint32_t unative_t; |
| /** Page Table Entry. */ |
| typedef struct { |
| /kernel/trunk/arch/ppc32/include/memstr.h |
|---|
| 37,10 → 37,10 |
| #define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) |
| extern void memsetw(__address dst, size_t cnt, __u16 x); |
| extern void memsetb(__address dst, size_t cnt, __u8 x); |
| extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x); |
| extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x); |
| extern int memcmp(__address src, __address dst, int cnt); |
| extern int memcmp(uintptr_t src, uintptr_t dst, int cnt); |
| #endif |
| /kernel/trunk/arch/ppc32/include/boot/boot.h |
|---|
| 48,28 → 48,28 |
| #include <arch/types.h> |
| typedef struct { |
| __address addr; |
| __u32 size; |
| uintptr_t addr; |
| uint32_t size; |
| } utask_t; |
| typedef struct { |
| __u32 count; |
| uint32_t count; |
| utask_t tasks[TASKMAP_MAX_RECORDS]; |
| } taskmap_t; |
| typedef struct { |
| __address start; |
| __u32 size; |
| uintptr_t start; |
| uint32_t size; |
| } memzone_t; |
| typedef struct { |
| __u32 total; |
| __u32 count; |
| uint32_t total; |
| uint32_t count; |
| memzone_t zones[MEMMAP_MAX_RECORDS]; |
| } memmap_t; |
| typedef struct { |
| __address addr; |
| uintptr_t addr; |
| unsigned int width; |
| unsigned int height; |
| unsigned int bpp; |
| 77,7 → 77,7 |
| } screen_t; |
| typedef struct { |
| __address addr; |
| uintptr_t addr; |
| unsigned int size; |
| } keyboard_t; |
| /kernel/trunk/arch/ppc32/include/asm.h |
|---|
| 128,9 → 128,9 |
| * The stack is assumed to be STACK_SIZE bytes long. |
| * The stack must start on page boundary. |
| */ |
| static inline __address get_stack_base(void) |
| static inline uintptr_t get_stack_base(void) |
| { |
| __address v; |
| uintptr_t v; |
| asm volatile ( |
| "and %0, %%sp, %1\n" |
| 145,9 → 145,9 |
| } |
| void cpu_halt(void); |
| void asm_delay_loop(__u32 t); |
| void asm_delay_loop(uint32_t t); |
| extern void userspace_asm(__address uspace_uarg, __address stack, __address entry); |
| extern void userspace_asm(uintptr_t uspace_uarg, uintptr_t stack, uintptr_t entry); |
| #endif |
| /kernel/trunk/arch/ppc32/include/faddr.h |
|---|
| 37,7 → 37,7 |
| #include <arch/types.h> |
| #define FADDR(fptr) ((__address) (fptr)) |
| #define FADDR(fptr) ((uintptr_t) (fptr)) |
| #endif |
| /kernel/trunk/arch/ppc32/include/mm/frame.h |
|---|
| 43,7 → 43,7 |
| #include <arch/types.h> |
| extern __address last_frame; |
| extern uintptr_t last_frame; |
| extern void frame_arch_init(void); |
| /kernel/trunk/arch/ppc32/include/mm/page.h |
|---|
| 43,8 → 43,8 |
| #ifdef KERNEL |
| #ifndef __ASM__ |
| # define KA2PA(x) (((__address) (x)) - 0x80000000) |
| # define PA2KA(x) (((__address) (x)) + 0x80000000) |
| # define KA2PA(x) (((uintptr_t) (x)) - 0x80000000) |
| # define PA2KA(x) (((uintptr_t) (x)) + 0x80000000) |
| #else |
| # define KA2PA(x) ((x) - 0x80000000) |
| # define PA2KA(x) ((x) + 0x80000000) |
| 94,7 → 94,7 |
| #define SET_PTL3_FLAGS_ARCH(ptl2, i, x) |
| #define SET_FRAME_FLAGS_ARCH(ptl3, i, x) set_pt_flags((pte_t *) (ptl3), (index_t) (i), (x)) |
| #define PTE_VALID_ARCH(pte) (*((__u32 *) (pte)) != 0) |
| #define PTE_VALID_ARCH(pte) (*((uint32_t *) (pte)) != 0) |
| #define PTE_PRESENT_ARCH(pte) ((pte)->p != 0) |
| #define PTE_GET_FRAME_ARCH(pte) ((pte)->pfn << 12) |
| #define PTE_WRITABLE_ARCH(pte) 1 |
| /kernel/trunk/arch/ppc32/include/mm/asid.h |
|---|
| 39,7 → 39,7 |
| #define ASID_MAX_ARCH 4096 |
| typedef __u32 asid_t; |
| typedef uint32_t asid_t; |
| #endif |
| /kernel/trunk/arch/ppc32/include/context.h |
|---|
| 42,31 → 42,31 |
| #define SP_DELTA 16 |
| struct context { |
| __address sp; |
| __address pc; |
| uintptr_t sp; |
| uintptr_t pc; |
| __u32 r2; |
| __u32 r13; |
| __u32 r14; |
| __u32 r15; |
| __u32 r16; |
| __u32 r17; |
| __u32 r18; |
| __u32 r19; |
| __u32 r20; |
| __u32 r21; |
| __u32 r22; |
| __u32 r23; |
| __u32 r24; |
| __u32 r25; |
| __u32 r26; |
| __u32 r27; |
| __u32 r28; |
| __u32 r29; |
| __u32 r30; |
| __u32 r31; |
| uint32_t r2; |
| uint32_t r13; |
| uint32_t r14; |
| uint32_t r15; |
| uint32_t r16; |
| uint32_t r17; |
| uint32_t r18; |
| uint32_t r19; |
| uint32_t r20; |
| uint32_t r21; |
| uint32_t r22; |
| uint32_t r23; |
| uint32_t r24; |
| uint32_t r25; |
| uint32_t r26; |
| uint32_t r27; |
| uint32_t r28; |
| uint32_t r29; |
| uint32_t r30; |
| uint32_t r31; |
| __u32 cr; |
| uint32_t cr; |
| ipl_t ipl; |
| } __attribute__ ((packed)); |
| /kernel/trunk/arch/ppc32/include/drivers/pic.h |
|---|
| 42,7 → 42,7 |
| #define PIC_ACK_LOW 10 |
| #define PIC_ACK_HIGH 6 |
| void pic_init(__address base, size_t size); |
| void pic_init(uintptr_t base, size_t size); |
| void pic_enable_interrupt(int intnum); |
| void pic_disable_interrupt(int intnum); |
| void pic_ack_interrupt(int intnum); |
| /kernel/trunk/arch/ppc32/include/drivers/cuda.h |
|---|
| 40,7 → 40,7 |
| #define CUDA_IRQ 10 |
| extern void cuda_init(__address base, size_t size); |
| extern void cuda_init(uintptr_t base, size_t size); |
| extern int cuda_get_scancode(void); |
| extern void cuda_grab(void); |
| extern void cuda_release(void); |