From 75edf55dd3f213ac492206b889608634eb20e2e9 Mon Sep 17 00:00:00 2001
From: Yi-Ting Shih <ytshih@it.cs.nycu.edu.tw>
Date: Tue, 15 Apr 2025 17:49:58 +0800
Subject: [PATCH] Chore: log format

---
 kernel/lib/exception.c |  6 ++----
 kernel/lib/mman.c      | 18 +++++-------------
 kernel/lib/shell.c     |  9 ++-------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/kernel/lib/exception.c b/kernel/lib/exception.c
index 3c31ac2..7f696b4 100644
--- a/kernel/lib/exception.c
+++ b/kernel/lib/exception.c
@@ -26,17 +26,15 @@ void synchronous_handler()
   DEBUG_EXCEP("synchronous caught");
   uint64_t x0 = 0x0;
   R_REG(x0, x0);
-  LOG(x0);
   
   uint64_t spsr_el1 = 0x0;
   R_SYSREG(spsr_el1, spsr_el1);
-  LOG(spsr_el1);
 
   uint64_t elr_el1 = 0x0;
   R_SYSREG(elr_el1, elr_el1);
-  LOG(elr_el1);
 
   uint64_t esr_el1 = 0x0;
   R_SYSREG(esr_el1, esr_el1);
-  DEBUG_EXCEP(esr_el1);
+  
+  LOG(x0); LOG(spsr_el1); LOG(elr_el1); DEBUG_EXCEP(esr_el1);
 }
diff --git a/kernel/lib/mman.c b/kernel/lib/mman.c
index 4820e58..791b309 100644
--- a/kernel/lib/mman.c
+++ b/kernel/lib/mman.c
@@ -47,8 +47,7 @@ void _pull(int idx, size_t sz)
 {
   if (LCH->state == PAGE_FREE && RCH->state == PAGE_FREE) {
     if (CUR->state != PAGE_FREE) {
-      LOG("free page merged");
-      DEBUG_MEM((uint64_t)idx);
+      LOG("free page merged"); DEBUG_MEM((uint64_t)idx);
     }
     CUR->state = PAGE_FREE;
     CUR->size = sz;
@@ -80,8 +79,7 @@ void mman_init()
   mman_page_cnt = (mman_memory_end - mman_memory_start) >> 12;
   mman_frame_array = simple_alloc((mman_page_cnt << 1) * sizeof(page_header_t));
 
-  LOG(mman_memory_start);
-  LOG(mman_memory_end);
+  LOG(mman_memory_start); LOG(mman_memory_end);
   DEBUG_MEM((uint64_t)mman_page_cnt);
 
   mman_frame_array[0] = (page_header_t){
@@ -185,9 +183,7 @@ void _free_page(uint64_t req, int idx, uint64_t l, uint64_t r)
     return;
   case PAGE_ALLOCATED:
     if (req == l) {
-      LOG("page freed");
-      LOG(l);
-      DEBUG_MEM(r);
+      LOG("page freed"); LOG(l); DEBUG_MEM(r);
       CUR->state = PAGE_FREE;
       CUR->size = sz;
       return;
@@ -229,9 +225,7 @@ void _reserve_page(uint64_t ql, uint64_t qr, int idx, uint64_t l, uint64_t r)
     if (CUR->state != PAGE_FREE)
       exit(ERR_INVALID_MEM);
 
-    LOG("page reserved");
-    LOG(l);
-    DEBUG_MEM(r);
+    LOG("page reserved"); LOG(l); DEBUG_MEM(r);
     CUR->state = PAGE_RESERVED;
     CUR->size = 0;
     return;
@@ -258,8 +252,6 @@ void reserve_page(void *begin, void *end)
   uint64_t ql = ((uint64_t)begin - (uint64_t)mman_memory_start) >> 12;
   uint64_t qr = (((uint64_t)end - (uint64_t)mman_memory_start - 1) >> 12) + 1;
   
-  LOG("reserve page");
-  LOG(ql);
-  DEBUG_MEM(qr);
+  LOG("reserve page"); LOG(ql); DEBUG_MEM(qr);
   _reserve_page(ql, qr, 0, 0, mman_page_cnt);
 }
diff --git a/kernel/lib/shell.c b/kernel/lib/shell.c
index fc04dbe..c25954a 100644
--- a/kernel/lib/shell.c
+++ b/kernel/lib/shell.c
@@ -79,8 +79,7 @@ static inline
 void _free(uint64_t ptr)
 {
   kfree((void *)ptr);
-  LOG(ptr);
-  INFOR("has been freed");
+  LOG(ptr); INFOR("has been freed");
 }
 
 static inline
@@ -160,10 +159,7 @@ void _time()
   R_SYSREG(cntp_cval_el0, cntp_cval_el0);
   R_SYSREG(cntp_tval_el0, cntp_tval_el0);
 
-  LOG(cntpct_el0);
-  LOG(cntfrq_el0);
-  LOG(cntp_cval_el0);
-  INFOR(cntp_tval_el0);
+  LOG(cntpct_el0); LOG(cntfrq_el0); LOG(cntp_cval_el0); INFOR(cntp_tval_el0);
 }
 
 static inline
@@ -223,7 +219,6 @@ int shell(file_node_t *initrd_root)
     VEC_PUSH(args, tok);
     LOG(tok);
   }
-
   // DEBUG("ENDL");
   CLEAN;