| /branches/tracing/kernel/arch/arm32/include/mm/page.h |
|---|
| 43,8 → 43,6 |
| #define PAGE_WIDTH FRAME_WIDTH |
| #define PAGE_SIZE FRAME_SIZE |
| #define PAGE_COLOR_BITS 0 /* dummy */ |
| #ifndef __ASM__ |
| # define KA2PA(x) (((uintptr_t) (x)) - 0x80000000) |
| # define PA2KA(x) (((uintptr_t) (x)) + 0x80000000) |
| /branches/tracing/kernel/arch/arm32/Makefile.inc |
|---|
| 29,11 → 29,15 |
| ## Toolchain configuration |
| # |
| ifndef CROSS_PREFIX |
| CROSS_PREFIX = /usr/local |
| endif |
| BFD_NAME = elf32-littlearm |
| BFD_ARCH = arm |
| BFD = binary |
| TARGET = arm-linux-gnu |
| TOOLCHAIN_DIR = /usr/local/arm |
| TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm |
| KERNEL_LOAD_ADDRESS = 0x80200000 |
| /branches/tracing/kernel/arch/arm32/src/asm.S |
|---|
| 45,7 → 45,8 |
| add r3, r1, #3 |
| bic r3, r3, #3 |
| cmp r1, r3 |
| stmdb sp!, {r4, lr} |
| stmdb sp!, {r4, r5, lr} |
| mov r5, r0 /* save dst */ |
| beq 4f |
| 1: |
| cmp r2, #0 |
| 58,8 → 59,8 |
| cmp ip, r2 |
| bne 2b |
| 3: |
| mov r0, r1 |
| ldmia sp!, {r4, pc} |
| mov r0, r5 |
| ldmia sp!, {r4, r5, pc} |
| 4: |
| add r3, r0, #3 |
| bic r3, r3, #3 |
| 94,5 → 95,5 |
| memcpy_from_uspace_failover_address: |
| memcpy_to_uspace_failover_address: |
| mov r0, #0 |
| ldmia sp!, {r4, pc} |
| mov r0, #0 |
| ldmia sp!, {r4, r5, pc} |
| /branches/tracing/kernel/arch/arm32/src/userspace.c |
|---|
| 70,8 → 70,11 |
| /* set first parameter */ |
| ustate.r0 = (uintptr_t) kernel_uarg->uspace_uarg; |
| /* %r1 is defined to hold pcb_ptr - set it to 0 */ |
| ustate.r1 = 0; |
| /* clear other registers */ |
| ustate.r1 = ustate.r2 = ustate.r3 = ustate.r4 = ustate.r5 = |
| ustate.r2 = ustate.r3 = ustate.r4 = ustate.r5 = |
| ustate.r6 = ustate.r7 = ustate.r8 = ustate.r9 = ustate.r10 = |
| ustate.r11 = ustate.r12 = ustate.lr = 0; |