Improves printing of initial capabilities

kth-step · Nov 6, 2023 · d71c0f9 · d71c0f9
1 parent 1fc54ee
commit d71c0f9
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 2 deletions.
diff --git a/kernel/inc/cap_util.h b/kernel/inc/cap_util.h
@@ -29,3 +29,4 @@ static inline uint64_t pmp_napot_encode(uint64_t base, uint64_t size)
 
 bool cap_is_valid(cap_t cap);
 bool cap_is_derivable(cap_t parent, cap_t child);
+void cap_print(cap_t cap);
diff --git a/kernel/src/cap_table.c b/kernel/src/cap_table.c
@@ -26,7 +26,9 @@ void ctable_init(void)
 #endif
 	for (unsigned int i = 0; i < ARRAY_SIZE(init_caps); ++i) {
 #if !defined(NDEBUG) && VERBOSE > 0
-		alt_printf("  0x%x: 0x%X\n", i, init_caps[i].raw);
+		alt_printf("  0x%x: ", i);
+		cap_print(init_caps[i]);
+		alt_printf("\n");
 #endif
 		cte_insert(&ctable[i], init_caps[i], prev);
 	}

diff --git a/kernel/src/cap_util.c b/kernel/src/cap_util.c
@@ -1,5 +1,7 @@
 #include "cap_util.h"
 
+#include "altc/altio.h"
+
 cap_t cap_mk_time(hart_t hart, time_slot_t bgn, time_slot_t end)
 {
 	cap_t cap;
@@ -19,7 +21,7 @@ cap_t cap_mk_memory(addr_t bgn, addr_t end, rwx_t rwx)
 	cap.mem.tag = tag;
 	cap.mem.bgn = (bgn - (tag << MAX_BLOCK_SIZE)) >> MIN_BLOCK_SIZE;
 	cap.mem.end = (end - (tag << MAX_BLOCK_SIZE)) >> MIN_BLOCK_SIZE;
-	cap.mem.mrk = bgn;
+	cap.mem.mrk = cap.mem.bgn;
 	cap.mem.rwx = rwx;
 	cap.mem.lck = false;
 	return cap;
@@ -67,6 +69,48 @@ cap_t cap_mk_socket(chan_t chan, ipc_mode_t mode, ipc_perm_t perm, uint32_t tag)
 	return cap;
 }
 
+void cap_print(cap_t cap)
+{
+	switch (cap.type) {
+	case CAPTY_NONE:
+		alt_printf("NONE{}");
+		break;
+	case CAPTY_TIME:
+		alt_printf("TIME{hart=%x,bgn=%x,end=%x,mrk=%x}", cap.time.hart,
+			   cap.time.bgn, cap.time.end, cap.time.mrk);
+		break;
+	case CAPTY_MEMORY: {
+		uint64_t bgn = tag_block_to_addr(cap.mem.tag, cap.mem.bgn);
+		uint64_t end = tag_block_to_addr(cap.mem.tag, cap.mem.end);
+		uint64_t mrk = tag_block_to_addr(cap.mem.tag, cap.mem.mrk);
+		alt_printf("MEMORY{bgn=%X,end=%X,mrk=%x,rwx=%X,lck=%x}", bgn,
+			   end, mrk, cap.mem.rwx, cap.mem.lck);
+	} break;
+	case CAPTY_PMP: {
+		uint64_t base, size;
+		pmp_napot_decode(cap.pmp.addr, &base, &size);
+		alt_printf("PMP{bgn=%X,end=%X,rwx=%x,used=%x,slot=%x}", base,
+			   base + size, cap.pmp.rwx, cap.pmp.used,
+			   cap.pmp.slot);
+	} break;
+	case CAPTY_MONITOR:
+		alt_printf("MONITOR{bgn=%x,end=%x,mrk=%x}", cap.mon.bgn,
+			   cap.mon.end, cap.mon.mrk);
+		break;
+	case CAPTY_CHANNEL:
+		alt_printf("CHANNEL{bgn=%x,end=%x,mrk=%x}", cap.chan.bgn,
+			   cap.chan.end, cap.chan.mrk);
+		break;
+	case CAPTY_SOCKET:
+		alt_printf("SOCKET{chan=%x,tag=%x,perm=%x,mode=%x}",
+			   cap.sock.chan, cap.sock.tag, cap.sock.perm,
+			   cap.sock.mode);
+		break;
+	default:
+		alt_printf("UNKNOWN{raw=%X}", cap.raw);
+	}
+}
+
 static inline bool is_range_subset(uint64_t a_bgn, uint64_t a_end,
 				   uint64_t b_bgn, uint64_t b_end)
 {