X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Farmv7%2Fstart.S;h=da57360ba3ae7e9305aa1ac85b8e496cb1f6ca33;hb=340bda1dddf444ccf46fbc9e7a37bf6c3f0aeb6a;hp=3c0779fb8ce4afc73bbf5c8f7619850451617cb3;hpb=1389dd6a77cfe0f01ae941f6f696bd5eda22e959;p=tpg%2Facess2.git

diff --git a/Kernel/arch/armv7/start.S b/Kernel/arch/armv7/start.S
index 3c0779fb..da57360b 100644
--- a/Kernel/arch/armv7/start.S
+++ b/Kernel/arch/armv7/start.S
@@ -89,10 +89,10 @@ SVC_Handler:
 	ldr r4, =SyscallHandler
 	blx r4
 	
-	ldr r0, =csSyscallPrintRetAddr
-	ldr r1, [sp,#9*4+5*4]
-	ldr r4, =Log
-	blx r4
+@	ldr r0, =csSyscallPrintRetAddr
+@	ldr r1, [sp,#9*4+5*4]
+@	ldr r4, =Log
+@	blx r4
 	
 	pop {r2}	@ errno
 	pop {r0,r1}	@ Ret/RetHi
@@ -125,10 +125,10 @@ IRQHandler:
 
 	PUSH_GPRS
 
-	ldr r0, =csIRQ_Tag
-	ldr r1, =csIRQ_Fmt
-	ldr r4, =Log_Debug
-	blx r4
+@	ldr r0, =csIRQ_Tag
+@	ldr r1, =csIRQ_Fmt
+@	ldr r4, =Log_Debug
+@	blx r4
 	
 	@ Call the registered handler
 	ldr r0, gpIRQHandler
@@ -270,7 +270,7 @@ kernel_table1_map:	@ Size = 4KiB
 	.rept (0xF00+16)/4
 		.long 0
 	.endr
-	.long hwmap_table_0 - KERNEL_BASE + (1 << 4) + 3
+	.long hwmap_table_0 - KERNEL_BASE + 0x13
 	.rept 0xFF8/4 - (0xF00+16)/4 - 1
 		.long 0
 	.endr
@@ -295,9 +295,11 @@ kernel_exception_map:
 		.long	0
 	.endr
 	.long 0x212	@ Map first page for exceptions (Kernel RO, Execute)
-	.rept 15
+	.rept 16-1-2
 		.long 0
 	.endr
+	.long gUsertextPhysStart + 0x22	@ User .text (User RO, Kernel RW, because both is COW)
+	.long 0
 	
 .section .padata
 stack: