Major build system changes

[tpg/acess2.git] / Kernel / arch / armv7 / start.S

diff --git a/Kernel/arch/armv7/start.S b/Kernel/arch/armv7/start.S
index 718131c..078b998 100644 (file)
--- a/Kernel/arch/armv7/start.S
+++ b/Kernel/arch/armv7/start.S
@@ -1,3 +1,6 @@
+
+#include "include/assembly.h"
+
 KERNEL_BASE =  0x80000000
 PCI_PADDR   =  0x60000000      @ Realview
 UART0_PADDR =  0x10009000      @ Realview
@@ -6,14 +9,14 @@ UART0_PADDR = 0x10009000      @ Realview
 @ 
 .section .init
 interrupt_vector_table:
-       b _start @ Reset
-       b .     @ #UD
-       b SyscallHandler @ SVC (SWI assume)
-       b .     @ Prefetch abort
-       b .     @ Data abort
-       b .     @ Not Used
-       b IRQHandler    @ IRQ
-       b .     @ FIQ (Fast interrupt)
+ivt_reset:     b _start @ Reset
+ivt_undef:     b .     @ #UD
+ivt_svc:       b SyscallHandler @ SVC (SWI assume)
+ivt_prefetch:  b DataAbort     @ Prefetch abort
+ivt_data:      b DataAbort     @ Data abort
+ivt_unused:    b .     @ Not Used
+ivt_irq:       b IRQHandler    @ IRQ
+ivt_fiq:       b .     @ FIQ (Fast interrupt)
 
 .globl _start
 _start:
@@ -32,6 +35,11 @@ _start:
        orr r0, r0, #1 << 23
        mcr p15, 0, r0, c1, c0, 0
 
+       @ Prepare for interrupts
+       cps #18 @ IRQ Mode
+       ldr sp, =irqstack+0x1000        @ Set up stack
+       cps #19
+
        ldr sp, =stack+0x10000  @ Set up stack
        ldr r0, =kmain
        mov pc, r0
@@ -40,21 +48,79 @@ _ptr_kmain:
        .long kmain
 
 .comm stack, 0x10000   @ ; 64KiB Stack
+.comm irqstack, 0x1000 @ ; 4KiB Stack
 
 SyscallHandler:
        b .
 
+.globl gpIRQHandler
+gpIRQHandler:  .long   0
+IRQ_saved_sp:  .long   0
+IRQ_saved_lr:  .long   0
+.globl IRQHandler
 IRQHandler:
+       sub lr, #4      @ Adjust LR to the correct value
+       srsdb sp!, #19  @ Switch to supervisor mode (DDI0406B D1.6.5) (actually SRSFD)
+       cps #19
+
+       PUSH_GPRS
+
+@      ldr r0, =csIRQ_Tag
+@      ldr r1, =csIRQ_Fmt
+@      ldr r4, =Log_Debug
+@      blx r4
+       
+       @ Call the registered handler
+       ldr r0, gpIRQHandler
+       blx r0
+
+       @ Restore CPU state
+       POP_GPRS
+       cpsie i
+       rfeia sp!       @ Pop state (actually RFEFD)
+       bx lr
+
+.globl DataAbort
+DataAbort:
+       sub lr, #8      @ Adjust LR to the correct value
+       srsdb sp!, #19  @ Switch to supervisor mode (DDI0406B D1.6.5) (actually SRSFD)
+       cpsid ifa, #19
+       PUSH_GPRS
+
+       mov r2, lr
+       ldr r1, =csDataAbort_Fmt
+       ldr r0, =csDataAbort_Tag
+       ldr r4, =Log_Error
+       blx r4
        b .
 
+       POP_GPRS
+       rfeia sp!       @ Pop state (actually RFEFD)
+       bx lr
+
+csIRQ_Tag:
+csDataAbort_Tag:
+       .asciz "ARMv7"
+csIRQ_Fmt:
+       .asciz "IRQ"
+csDataAbort_Fmt:
+       .asciz "Data Abort at %p"
+
+.comm irqstack, 0x1000
+
 .section .padata
 .globl kernel_table0
 
 kernel_table0:
        .long 0x00000002        @ Identity map the first 1 MiB
-       .rept 0x800 - 1
+       .rept 0x7FC - 1
                .long 0
        .endr
+       .long user_table1_map + 0x000 - KERNEL_BASE + 1
+       .long user_table1_map + 0x400 - KERNEL_BASE + 1
+       .long 0 @ user_table1_map + 0x800 - KERNEL_BASE + 1
+       .long 0 @ user_table1_map + 0xC00 - KERNEL_BASE + 1
+       @ 0x80000000 - User/Kernel split
        .long 0x00000002        @ Map first 4 MiB to 2GiB
        .long 0x00100002        @ 
        .long 0x00200002        @ 
@@ -102,6 +168,18 @@ kernel_table0:
                .long 0
        .endr
 
+@ PID0 user table
+.globl user_table1_map
+user_table1_map:       @ Size = 4KiB
+       .rept 0x7F8/4
+               .long 0
+       .endr
+       .long kernel_table0 - KERNEL_BASE + (1 << 4) + 3
+       .long user_table1_map - KERNEL_BASE + (1 << 4) + 3
+       .rept 0x800/4
+               .long 0
+       .endr
+
 .globl kernel_table1_map
 kernel_table1_map:     @ Size = 4KiB
        .rept 0xF00/4