shithub: 5v

Info  •  Files  •  Log  •  Branches

chk: give better errors.

--- a/chk.c

+++ b/chk.c

@@ -63,9 +63,14 @@

 		exits("bad access");

 	}

 	for(; off != end; off++){

-		bits = chk << (2*(off&3));;

-		if((seg->shadow[off>>2] & bits) != bits){

-			print("invalid read: %#x at %#x (%x != %x)\n", seg->start+off, P->R[15] - 4, bits, (seg->shadow[off>>2] & bits));

+		bits = seg->shadow[off>>2] >> 2*(off&3);

+		if((bits&3) != chk){

+			if(chk&MARKALLOC)

+				print("%d: access outside alloc: %#x at PC %#x\n",

+					P->pid, seg->start+off, P->R[15] - 4);

+			if(chk&MARKINIT)

+				print("%d: invalid read: %#x at PC %#x\n", 

+					P->pid, seg->start+off, P->R[15] - 4);

 			rendezvous(&never, nil);

 			exits("bad access");

 		}