X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Farmv7%2Fmm_virt.c;h=146caea83cdabfc49b5972db36dba244facc5cfb;hb=3bcb89ec409dc04c55465bdb79ffc7828f003e3c;hp=85f9b27fc82feb8f62abd2f222acf01849ab0725;hpb=35bd78fa5f141882c43b1bcaa0c90436ff3974f1;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/armv7/mm_virt.c b/KernelLand/Kernel/arch/armv7/mm_virt.c
index 85f9b27f..146caea8 100644
--- a/KernelLand/Kernel/arch/armv7/mm_virt.c
+++ b/KernelLand/Kernel/arch/armv7/mm_virt.c
@@ -10,6 +10,7 @@
 #include <hal_proc.h>
 
 #define TRACE_MAPS	0
+#define TRACE_COW	1
 
 #define AP_KRW_ONLY	1	// Kernel page
 #define AP_KRO_ONLY	5	// Kernel RO page
@@ -18,6 +19,13 @@
 #define AP_RO_USER	2	// User RO Page
 #define PADDR_MASK_LVL1	0xFFFFFC00
 
+const char * const caAPValueNames[] = {
+	"AP_NOACCESS", "AP_KRW_ONLY",
+	"AP_RO_USER", "AP_RW_BOTH",
+	"AP_???_4", "AP_KRO_ONLY",
+	"AP_???_6", "AP_RO_BOTH"
+};
+
 // === IMPORTS ===
 extern Uint32	kernel_table0[];
 
@@ -53,7 +61,7 @@ tPAddr	MM_Clone(void);
 tVAddr	MM_NewKStack(int bGlobal);
 void	MM_int_DumpTableEnt(tVAddr Start, size_t Len, tMM_PageInfo *Info);
 //void	MM_DumpTables(tVAddr Start, tVAddr End);
-void	MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch);
+void	MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch, Uint32 UserLR);
 
 // === GLOBALS ===
 tPAddr	giMM_ZeroPage;
@@ -902,7 +910,7 @@ tVAddr MM_NewUserStack(void)
 	tVAddr	addr, ofs;
 
 	addr = USER_STACK_TOP - USER_STACK_SIZE;
-	if( MM_GetPhysAddr(addr + PAGE_SIZE) ) {
+	if( MM_GetPhysAddr( (void*)(addr + PAGE_SIZE) ) ) {
 		Log_Error("MMVirt", "Unable to create initial user stack, addr %p taken",
 			addr + PAGE_SIZE
 			);
@@ -938,18 +946,20 @@ void MM_int_DumpTableEnt(tVAddr Start, size_t Len, tMM_PageInfo *Info)
 {
 	if( giMM_ZeroPage && Info->PhysAddr == giMM_ZeroPage )
 	{
-		Debug("%p => %8s - 0x%7x %i %x %s",
+		Debug("%p => %8s - 0x%7x D%i %x %s %s",
 			Start, "ZERO", Len,
 			Info->Domain, Info->AP,
-			Info->bGlobal ? "G" : "nG"
+			Info->bExecutable ? " X" : "nX",
+			Info->bGlobal ? " G" : "nG"
 			);
 	}
 	else
 	{
-		Debug("%p => %8x - 0x%7x %i %x %s",
+		Debug("%p => %8x - 0x%7x D%i %x %s %s",
 			Start, Info->PhysAddr-Len, Len,
 			Info->Domain, Info->AP,
-			Info->bGlobal ? "G" : "nG"
+			Info->bExecutable ? " X" : "nX",
+			Info->bGlobal ? " G" : "nG"
 			);
 	}
 }
@@ -996,7 +1006,7 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 }
 
 // NOTE: Runs in abort context, not much difference, just a smaller stack
-void MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch)
+void MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch, Uint32 UserLR)
 {
 	 int	rv;
 	tMM_PageInfo	pi;
@@ -1070,6 +1080,33 @@ void MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch)
 	Log_Error("MMVirt", "Code at %p accessed %p (DFSR = 0x%x)%s", PC, Addr, DFSR,
 		(bPrefetch ? " - Prefetch" : "")
 		);
+	Log_Error("MMVirt", "- User LR = 0x%x", UserLR);
+	const char * const dfsr_errors[] = {
+		/* 00000 */ "-", "Alignment Fault",
+		/* 00010 */ "Debug event", "Access Flag (Section)",
+		/* 00100 */ "Instr Cache Maint", "Translation (Section)",
+		/* 00110 */ "Access Flag (Page)", "Translation (Page)",
+		/* 01000 */ "Sync. External abort", "Domain (Section)",
+		/* 01010 */ "-", "Domain (Page)",
+		/* 01100 */ "Table Walk sync ext (lvl 1)", "Permission (Section)",
+		/* 01110 */ "Table Walk sync ext (lvl 2)", "Permission (Page)",
+		// 0b10000
+		/* 10000 */ "-", "-",
+		/* 10010 */ "-", "-",
+		/* 10100 */ "IMPL (Lockdown)", "-",
+		/* 10110 */ "Async. Extern. Abort", "-",
+		/* 11000 */ "Mem. access async pairity error", "Mem. access async pairity error",
+		/* 11010 */ "IMPL (Coprocessor abort)", "-",
+		/* 11100 */ "Table Walk Sync parity (lvl 1)", "-",
+		/* 11110 */ "Table Walk Sync parity (lvl 2)", "-"
+		};
+	 int	errcode = (DFSR & 0xF) | (((DFSR >> 10) & 1) << 4);
+	Log_Error("MMVirt", "- Errcode 0b%05b", errcode);
+	Log_Error("MMVirt", "- Dom %i %s %s",
+		(DFSR >> 4) & 0xF, (DFSR & 0x800 ? "Write": "Read"),
+		dfsr_errors[errcode]
+		);
+	Log_Error("MMVirt", "- AP=%i(%s) %s", pi.AP, caAPValueNames[pi.AP], pi.bExecutable ? " Executable":"");
 	if( Addr < 0x80000000 )
 		MM_DumpTables(0, 0x80000000);
 	else