From 80e26a574bf9fd7006c4767d0f749c75324b9aea Mon Sep 17 00:00:00 2001
From: tracer-ysyx <tracer@ysyx.org>
Date: Wed, 13 Mar 2024 18:10:09 +0800
Subject: [PATCH] =?UTF-8?q?>=20compile=20NEMU=20ysyx=5F22040000=20?=
 =?UTF-8?q?=E6=9D=8E=E5=BF=83=E6=9D=A8=20Linux=20calcite=206.6.19=20#1-Nix?=
 =?UTF-8?q?OS=20SMP=20PREEMPT=5FDYNAMIC=20Fri=20Mar=20=201=2012:35:11=20UT?=
 =?UTF-8?q?C=202024=20x86=5F64=20GNU/Linux=20=2018:10:09=20=20up=20=20=207?=
 =?UTF-8?q?:46,=20=202=20users,=20=20load=20average:=200.58,=200.65,=200.5?=
 =?UTF-8?q?8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nemu/include/debug.h    | 3 +++
 nemu/src/memory/paddr.c | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nemu/include/debug.h b/nemu/include/debug.h
index df88556..057f8bf 100644
--- a/nemu/include/debug.h
+++ b/nemu/include/debug.h
@@ -20,6 +20,9 @@
 #include <stdio.h>
 #include <utils.h>
 
+#define Trace(format, ...) \
+    _Log("[TRACE] " format "\n", ## __VA_ARGS__)
+
 #define Log(format, ...) \
     _Log(ANSI_FMT("[INFO] %s:%d %s() ", ANSI_FG_BLUE) format "\n", \
         __FILE__, __LINE__, __func__, ## __VA_ARGS__)
diff --git a/nemu/src/memory/paddr.c b/nemu/src/memory/paddr.c
index 9c83d14..4d1e094 100644
--- a/nemu/src/memory/paddr.c
+++ b/nemu/src/memory/paddr.c
@@ -52,7 +52,7 @@ static void out_of_bound(paddr_t addr) {
 static void mtrace_print(char type, word_t addr, int len, word_t data) {
   for (int i = 0; i < range_count; i++)
     if (addr <= mtrace_end[i] && addr >= mtrace_start[i] ) {
-      printf("[TRACE] Mem %c " FMT_PADDR "%d D " FMT_PADDR "\n", type, addr, len, data);
+      Trace("Mem %c " FMT_PADDR "%d D " FMT_PADDR "\n", type, addr, len, data);
       break;
     }
 }
@@ -77,11 +77,10 @@ void init_mem() {
     ptr = strtok_r(NULL, ",", &saveptr);
     if (!ptr) break;
   }
-  puts("MTRACE ranges: ");
+  Trace("MTRACE ranges: ");
   for (int i = 0; i < range_count; i++) {
-    printf("[0x%x, 0x%x], ", mtrace_start[i], mtrace_end[i]);
+    Trace("[0x%x, 0x%x]", mtrace_start[i], mtrace_end[i]);
   }
-  puts("");
 #endif
   IFDEF(CONFIG_MEM_RANDOM, memset(pmem, rand(), CONFIG_MSIZE));
   Log("physical memory area [" FMT_PADDR ", " FMT_PADDR "]", PMEM_LEFT, PMEM_RIGHT);