From c34f132985c5139d629e073d7567f074aec6030d Mon Sep 17 00:00:00 2001
From: tracer-ysyx <tracer@ysyx.org>
Date: Wed, 13 Mar 2024 16:10:36 +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=2016:10:36=20=20up=20=20=205?=
 =?UTF-8?q?:46,=20=202=20users,=20=20load=20average:=200.80,=200.80,=200.5?=
 =?UTF-8?q?7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nemu/include/utils.h    |  3 +++
 nemu/src/cpu/cpu-exec.c | 18 ++++++------------
 nemu/src/utils/log.c    | 12 ++++++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/nemu/include/utils.h b/nemu/include/utils.h
index 2cd1561..59bc9df 100644
--- a/nemu/include/utils.h
+++ b/nemu/include/utils.h
@@ -74,4 +74,7 @@ uint64_t get_time();
   } while (0)
 
 
+IFDEF(CONFIG_ITRACE, void log_itrace_print());
+
+
 #endif
diff --git a/nemu/src/cpu/cpu-exec.c b/nemu/src/cpu/cpu-exec.c
index d3cfe5f..6bcf7b4 100644
--- a/nemu/src/cpu/cpu-exec.c
+++ b/nemu/src/cpu/cpu-exec.c
@@ -13,6 +13,7 @@
 * See the Mulan PSL v2 for more details.
 ***************************************************************************************/
 
+#include "utils.h"
 #include <cpu/cpu.h>
 #include <cpu/decode.h>
 #include <cpu/difftest.h>
@@ -29,9 +30,8 @@ CPU_state cpu = {};
 uint64_t g_nr_guest_inst = 0;
 static uint64_t g_timer = 0; // unit: us
 static bool g_print_step = false;
-
-IFDEF(CONFIG_ITRACE, char logbuf[CONFIG_ITRACE_BUFFER][128]);
-IFDEF(CONFIG_ITRACE, int logbuf_rear);
+IFDEF(CONFIG_ITRACE, extern char logbuf[CONFIG_ITRACE_BUFFER][128]);
+IFDEF(CONFIG_ITRACE, extern int logbuf_rear);
 
 void device_update();
 bool wp_eval_all();
@@ -132,16 +132,10 @@ void cpu_exec(uint64_t n) {
             ANSI_FMT("HIT BAD TRAP", ANSI_FG_RED))),
           nemu_state.halt_pc);
       nemu_state.halt_ret = 1;
-#ifdef CONFIG_ITRACE
-      if (nemu_state.halt_ret != 0) {
-        puts("ITRACE buffer:");
-        for (int i = (logbuf_rear + 1) % CONFIG_ITRACE_BUFFER; i != logbuf_rear; i = (i + 1) % CONFIG_ITRACE_BUFFER) {
-          puts(logbuf[i]);
-        }
+      if(nemu_state.halt_ret != 0) {
+        log_itrace_print();
       }
-    }
-#endif
-      // fall through
+    } // fall through
     case NEMU_QUIT: statistic();
   }
 }
diff --git a/nemu/src/utils/log.c b/nemu/src/utils/log.c
index a9bb9a7..725fe42 100644
--- a/nemu/src/utils/log.c
+++ b/nemu/src/utils/log.c
@@ -35,3 +35,15 @@ bool log_enable() {
          (g_nr_guest_inst <= CONFIG_TRACE_END), false);
 }
 #endif
+
+IFDEF(CONFIG_ITRACE, char logbuf[CONFIG_ITRACE_BUFFER][128]);
+IFDEF(CONFIG_ITRACE, int logbuf_rear);
+
+#ifdef CONFIG_ITRACE
+void log_itrace_print() {
+  puts("ITRACE buffer:");
+  for (int i = (logbuf_rear + 1) % CONFIG_ITRACE_BUFFER; i != logbuf_rear; i = (i + 1) % CONFIG_ITRACE_BUFFER) {
+    puts(logbuf[i]);
+  }
+}
+#endif