From 694ddb57dc1100341ccb1cfa2dfacb090e6ba6a5 Mon Sep 17 00:00:00 2001
From: tracer-ysyx <tracer@ysyx.org>
Date: Wed, 20 Mar 2024 20:06:14 +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=2020:06:14=20=20up=20=20=207?=
 =?UTF-8?q?:12,=20=202=20users,=20=20load=20average:=201.98,=201.70,=201.2?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nemu/include/common.h   | 1 -
 nemu/include/debug.h    | 4 ++++
 nemu/include/types.h    | 2 ++
 nemu/include/utils.h    | 5 +----
 nemu/src/utils/ftrace.c | 2 --
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nemu/include/common.h b/nemu/include/common.h
index 3197dd6..08a46e5 100644
--- a/nemu/include/common.h
+++ b/nemu/include/common.h
@@ -17,7 +17,6 @@
 #define __COMMON_H__
 
 #include <stdint.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <string.h>
 
diff --git a/nemu/include/debug.h b/nemu/include/debug.h
index 4f3fde5..d9a604d 100644
--- a/nemu/include/debug.h
+++ b/nemu/include/debug.h
@@ -17,8 +17,12 @@
 #define __DEBUG_H__
 
 #include <stdio.h>
+#include <types.h>
+#include <macro.h>
 #include <utils.h>
 
+IFDEF(CONFIG_ITRACE, void log_itrace_print());
+
 #define Trace(format, ...) \
     _Log("[TRACE] " format "\n", ## __VA_ARGS__)
 
diff --git a/nemu/include/types.h b/nemu/include/types.h
index d034049..364f2ed 100644
--- a/nemu/include/types.h
+++ b/nemu/include/types.h
@@ -1,5 +1,7 @@
 #ifndef __TYPES_H__
 #define __TYPES_H__
+#include <inttypes.h>
+#include <macro.h>
 #if CONFIG_MBASE + CONFIG_MSIZE > 0x100000000ul
 #define PMEM64 1
 #endif
diff --git a/nemu/include/utils.h b/nemu/include/utils.h
index 59bc9df..f974584 100644
--- a/nemu/include/utils.h
+++ b/nemu/include/utils.h
@@ -16,7 +16,7 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__
 
-#include <common.h>
+#include <types.h>
 
 // ----------- state -----------
 
@@ -74,7 +74,4 @@ uint64_t get_time();
   } while (0)
 
 
-IFDEF(CONFIG_ITRACE, void log_itrace_print());
-
-
 #endif
diff --git a/nemu/src/utils/ftrace.c b/nemu/src/utils/ftrace.c
index 10594c1..ec668c0 100644
--- a/nemu/src/utils/ftrace.c
+++ b/nemu/src/utils/ftrace.c
@@ -1,5 +1,3 @@
-#include <debug.h>
-#include <macro.h>
 #include <assert.h>
 #include <common.h>
 #include <elf.h>