delete elf loader paging debug msg

Author: tas0dev

src/kernel/interrupt/idt.c

@@ -154,7 +154,7 @@ void irq_exception_ex(uint32_t vec, uint32_t error_code) {
 			       (unsigned long)stack_ptr[i]);
 		}
 
-		uint64_t maybe_rip = 0, maybe_cs = 0, maybe_rsp = 0;
+		uint64_t maybe_rip = 0, maybe_cs = 0;
 		for (int idx = 17; idx <= 20; idx++) {
 			uint64_t val = stack_ptr[idx];
 			if (val != 0) {
@@ -212,14 +212,7 @@ void irq_exception_ex(uint32_t vec, uint32_t error_code) {
 	printk("  CS:  0x%lx\n", saved_cs);
 	printk("  RSP: 0x%lx\n", saved_rsp);
 
-	/* ELF 呼び出し直前のスナップショットが存在すれば表示する（デバッグ用） */
-	printk("ELF: call-snapshot: func=0x%lx rdi=0x%lx rsi=0x%lx rdx=0x%lx rsp=0x%lx\n",
-	       (unsigned long)elf_call_snapshot_func_addr,
-	       (unsigned long)elf_call_snapshot_rdi,
-	       (unsigned long)elf_call_snapshot_rsi,
-	       (unsigned long)elf_call_snapshot_rdx,
-	       (unsigned long)elf_call_snapshot_rsp);
-
+	// Halt the system
 	while (1) {
 		asm volatile("hlt");
 	}

src/kernel/mem/manager.c

@@ -162,10 +162,6 @@ static void *kmalloc_internal(uint32_t size, int retry_count) {
 			void *user_ptr = (void *)((uintptr_t)cur +
 						  sizeof(block_header_t));
 
-			/* Calculate actual user bytes allocated (might be larger than wanted) */
-			uint32_t actual_user_bytes =
-				cur->size - sizeof(block_header_t);
-
 			uint32_t total_free = 0;
 			uint32_t largest = 0;
 			block_header_t *it = free_list;
@@ -190,12 +186,7 @@ static void *kmalloc_internal(uint32_t size, int retry_count) {
 							wanted_with_canary -
 							sizeof(uint32_t));
 			*canary = KMALLOC_CANARY;
-			if (size >= 256) {
-				printk("mem: set canary at %p (user_ptr=%p wanted=%u wanted_with_canary=%u actual_allocated=%u) value=0x%08x\n",
-				       canary, user_ptr, wanted,
-				       wanted_with_canary, actual_user_bytes,
-				       *canary);
-			}
+
 			spin_unlock_irqrestore(&heap_lock, flags);
 			return user_ptr;
 		}
@@ -536,11 +527,6 @@ void memory_init() {
 		phys_end = (uint64_t)heap_end;
 		printk("mem: WARNING memmap_reserve using virtual addresses as-phys start=0x%08x end=0x%08x\n",
 		       (unsigned)heap_start, (unsigned)heap_end);
-	} else {
-		printk("mem: reserving heap physical range phys_start=0x%08llx phys_end=0x%08llx (heap virt 0x%08x-0x%08x)\n",
-		       (unsigned long long)phys_start,
-		       (unsigned long long)phys_end, (unsigned)heap_start,
-		       (unsigned)heap_end);
 	}
 	memmap_reserve(phys_start, phys_end);
 }

src/kernel/mem/map.c

@@ -110,13 +110,6 @@ void memmap_init(uint64_t start, uint64_t end) {
 	memmap.max_frames = count; /* logical max */
 	memmap.bitmap = NULL;
 
-	/* Diagnostic: print memmap summary so we can see physical ranges managed */
-	printk("memmap: init start_addr=0x%08llx end_addr=0x%08llx start_frame=%llu frames=%llu\n",
-	       (unsigned long long)memmap.start_addr,
-	       (unsigned long long)memmap.end_addr,
-	       (unsigned long long)memmap.start_frame,
-	       (unsigned long long)memmap.frames);
-
 	/* clear any existing chunk list */
 	{
 		uint32_t flags = 0;
@@ -286,9 +279,6 @@ void memmap_reserve(uint64_t start, uint64_t end) {
 	if (memmap.frames == 0)
 		return;
 
-	printk("memmap_reserve: request start=0x%08llx end=0x%08llx\n",
-	       (unsigned long long)start, (unsigned long long)end);
-
 	uint64_t start_frame = start / FRAME_SIZE;
 	uint64_t end_frame = (end + FRAME_SIZE - 1) / FRAME_SIZE;
 

src/kernel/mem/paging.c

@@ -31,15 +31,11 @@ void *alloc_page_table(void) {
 		       (unsigned)phys);
 		return NULL;
 	}
-	printk("alloc_page_table: clearing table at virt=0x%x (phys=0x%x)\n",
-	       (unsigned)virt, (unsigned)phys);
-	// ページングが有効化されていない場合、virtはphysと同じ（アイデンティティ）
-	// しかし、physが1MBを超える場合、アクセスできない可能性がある
+
 	// 安全のため、物理アドレスで直接アクセス
 	uint32_t *tbl_phys = (uint32_t *)(uintptr_t)phys;
 	for (size_t i = 0; i < 1024; ++i)
 		tbl_phys[i] = 0;
-	printk("alloc_page_table: table cleared\n");
 	// return the virtual pointer for convenience to callers
 	return (void *)(uintptr_t)virt;
 }

src/kernel/mem/paging64.c

@@ -27,11 +27,6 @@ int map_page_64(uint64_t pml4_phys, uint64_t phys, uint64_t virt,
 	if ((flags & PAGING_PRESENT) == 0)
 		flags |= PAGING_PRESENT;
 
-	/* Debug: print incoming args to help diagnose caller/ABI issues */
-	printk("map_page_64: enter pml4_phys=0x%016lx phys=0x%016lx virt=0x%016lx flags=0x%08x\n",
-	       (unsigned long)pml4_phys, (unsigned long)phys,
-	       (unsigned long)virt, (unsigned)flags);
-
 	// 64ビットページングのインデックス計算
 	uint64_t pml4_idx = (virt >> 39) & 0x1FF; // bits 47-39
 	uint64_t pdpt_idx = (virt >> 30) & 0x1FF; // bits 38-30
@@ -111,11 +106,6 @@ int map_page_64(uint64_t pml4_phys, uint64_t phys, uint64_t virt,
 				 PAGING_PRESENT | PAGING_RW | PAGING_USER;
 		entry &= ~(1ULL << 63); // NXビットをクリア
 		pdpt[pdpt_idx] = entry;
-		/* Debug: print the PD we just created for this PDPT index */
-		printk("map_page_64: created PD: pd_phys=0x%016lx pd_virt=0x%016lx pdpt_idx=%lu\n",
-		       (unsigned long)pd_phys,
-		       (unsigned long)(uintptr_t)pd_virt,
-		       (unsigned long)pdpt_idx);
 	} else {
 		// 既存のエントリ - NXビットをクリア
 		pdpt[pdpt_idx] &= ~(1ULL << 63);
@@ -156,44 +146,43 @@ int map_page_64(uint64_t pml4_phys, uint64_t phys, uint64_t virt,
 		entry &= ~(1ULL << 63); // NXビットをクリア
 		pd[pd_idx] = entry;
 	} else if (pd[pd_idx] & (1ULL << 7)) {
-		// 既存エントリが2MBラージページ（PS bit=1）の場合：分割する
-		printk("map_page_64: Breaking 2MB large page at PD[%lu] into 4KB pages\n",
-		       (unsigned long)pd_idx);
-		
 		uint64_t large_page_base = pd[pd_idx] & 0xFFFFFFFFFFE00000ULL;
 		uint64_t large_page_flags = pd[pd_idx] & 0xFFF;
-		
+
 		// 新しいPTを割り当て
 		void *pt_virt = alloc_page_table();
 		if (!pt_virt) {
 			printk("map_page_64: Failed to allocate PT for page split\n");
 			return -1;
 		}
 		uint64_t *pt_split = (uint64_t *)pt_virt;
-		
+
 		// 2MBラージページを512個の4KBページに分割
 		for (int i = 0; i < 512; i++) {
-			uint64_t page_phys = large_page_base + ((uint64_t)i * 0x1000);
+			uint64_t page_phys =
+				large_page_base + ((uint64_t)i * 0x1000);
 			// PS bitを除去し、他のフラグは保持
 			pt_split[i] = (page_phys & 0xFFFFFFFFFFFFF000ULL) |
 				      (large_page_flags & ~(1ULL << 7));
 		}
-		
-		uint64_t pt_phys = vmem_virt_to_phys64((uint64_t)(uintptr_t)pt_virt);
+
+		uint64_t pt_phys =
+			vmem_virt_to_phys64((uint64_t)(uintptr_t)pt_virt);
 		if (pt_phys == UINT64_MAX) {
 			printk("map_page_64: vmem_virt_to_phys64 failed for pt_virt=0x%016lx\n",
 			       (unsigned long)(uintptr_t)pt_virt);
 			return -1;
 		}
-		
+
 		// PDエントリを新しいPTを指すように更新（PS bitをクリア）
 		pd[pd_idx] = (pt_phys & 0xFFFFFFFFFFFFF000ULL) |
 			     PAGING_PRESENT | PAGING_RW | PAGING_USER;
 		pd[pd_idx] &= ~(1ULL << 63); // NXビットをクリア
-		
+
 		// TLB を無効化（2MB分）
 		for (uint64_t i = 0; i < 512; i++) {
-			uint64_t flush_addr = (virt & 0xFFFFFFFFFFE00000ULL) + (i * 0x1000);
+			uint64_t flush_addr =
+				(virt & 0xFFFFFFFFFFE00000ULL) + (i * 0x1000);
 			invlpg((void *)(uintptr_t)flush_addr);
 		}
 	} else {
@@ -216,12 +205,6 @@ int map_page_64(uint64_t pml4_phys, uint64_t phys, uint64_t virt,
 	uint64_t entry = (phys & 0xFFFFFFFFFFFFF000ULL) | (flags & 0xFFF);
 	entry &= ~(1ULL << 63); // NXビットをクリア（実行可能）
 	pt[pt_idx] = entry;
-	/* Debug: verify write */
-	printk("map_page_64: set PTE: pml4_phys=0x%016lx pml4_idx=0x%03lx pdpt_idx=0x%03lx pd_idx=0x%03lx pt_idx=0x%03lx phys=0x%016lx entry=0x%016lx readback=0x%016lx\n",
-	       (unsigned long)pml4_phys, (unsigned long)pml4_idx,
-	       (unsigned long)pdpt_idx, (unsigned long)pd_idx,
-	       (unsigned long)pt_idx, (unsigned long)phys, (unsigned long)entry,
-	       (unsigned long)pt[pt_idx]);
 
 	// TLBを無効化
 	invlpg((void *)(uintptr_t)virt);
@@ -336,14 +319,6 @@ void paging64_init_kernel_pml4(void) {
 
 	// カーネルPML4の物理アドレスを保存
 	kernel_pml4_phys = new_pml4_phys;
-
-	printk("paging64_init_kernel_pml4: Switched from UEFI PML4 (0x%016lx) to kernel PML4 (0x%016lx)\n",
-	       uefi_cr3, new_pml4_phys);
-	/* Debug: print the newly created PML4[0] so we can verify the low-4GB
-     * identity mapping was installed correctly. */
-	printk("paging64_init_kernel_pml4: new_pml4[0]=0x%016lx uefi_pml4[0]=0x%016lx\n",
-	       (unsigned long)new_pml4[0], (unsigned long)uefi_pml4[0]);
-	printk("paging64_init_kernel_pml4: Added identity mapping for low 4GB (0x0-0xFFFFFFFF)\n");
 }
 
 /**
@@ -402,7 +377,7 @@ uint64_t paging64_create_user_pml4(void) {
 		new_pml4[i] = kernel_pml4[i];
 	}
 
-    /*
+	/*
      * IMPORTANT: Copy kernel_pml4[0] to enable access to kernel code/data
      * in low memory (identity-mapped region) even after CR3 switch.
      * Without this, iretq instruction itself (which is in kernel code at low
@@ -411,10 +386,7 @@ uint64_t paging64_create_user_pml4(void) {
      * User mappings at low addresses will still work because map_page_64
      * creates 4KB page tables which override the 2MB large pages from kernel.
      */
-    new_pml4[0] = kernel_pml4[0];
-    printk("paging64_create_user_pml4: kernel_pml4_phys=0x%016lx kernel_pml4[0]=0x%016lx new_pml4[0]=0x%016lx\n",
-	    (unsigned long)kernel_pml4_phys, (unsigned long)kernel_pml4[0],
-	    (unsigned long)new_pml4[0]);
+	new_pml4[0] = kernel_pml4[0];
 
 	return new_pml4_phys;
 }

src/kernel/mem/segment.c

@@ -24,15 +24,20 @@ void gdt_build() {
 	gdt_set_gate(0, 0, 0, 0, 0); /* NULL descriptor */
 	gdt_set_gate(1, 0x0, 0xFFFFF, 0x9A,
 		     0xAF); /* 64-bit kernel code: 0xAF = Long mode */
-	gdt_set_gate(2, 0x0, 0xFFFFF, 0x92, 0xCF); /* kernel data: 0xCF = 32-bit (L-bit must be 0 for data) */
+	gdt_set_gate(
+		2, 0x0, 0xFFFFF, 0x92,
+		0xCF); /* kernel data: 0xCF = 32-bit (L-bit must be 0 for data) */
 	gdt_set_gate(3, 0x0, 0xFFFFF, 0xFA, 0xAF); /* 64-bit user code: L=1 */
-	gdt_set_gate(4, 0x0, 0xFFFFF, 0xF2, 0xCF); /* user data: 0xCF = 32-bit (L-bit must be 0 for data) */
+	gdt_set_gate(
+		4, 0x0, 0xFFFFF, 0xF2,
+		0xCF); /* user data: 0xCF = 32-bit (L-bit must be 0 for data) */
 	gp.limit = (sizeof(struct gdt_entry) * 5) - 1;
 	gp.base = (uint64_t)&gdt_entries;
 }
 
 void gdt_install();
 
+#if 0 // デバッグ用 - 必要に応じて有効化
 void gdt_dump(void) {
 	extern void printk(const char *fmt, ...);
 	printk("[GDT DUMP] gp.base=0x%016lx gp.limit=0x%04x\n", gp.base,
@@ -48,3 +53,4 @@ void gdt_dump(void) {
 		printk("\n");
 	}
 }
+#endif

src/kernel/mem/vmem.c

@@ -20,10 +20,7 @@ static vmem_phys2virt_fn phys2virt = NULL;
 
 // 仮想アドレス→物理アドレス変換
 uint32_t vmem_virt_to_phys(uint32_t virt) {
-	printk("vmem_virt_to_phys: virt=0x%x mode=%d\n", (unsigned)virt,
-	       (int)current_mode);
 	if (current_mode == VMEM_MODE_IDENTITY) {
-		printk("vmem_virt_to_phys: identity -> 0x%x\n", (unsigned)virt);
 		return virt;
 	}
 	if (current_mode == VMEM_MODE_OFFSET) {