xin/ysyx-workbench
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

pa2.2: cleanup includes

Browse source
This commit is contained in:
xinyangli 2024-03-20 20:07:28 +08:00
parent 9229e4318e
commit a62a132587
10 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
nemu/include/common.h
View file

@ -17,12 +17,12 @@
#define __COMMON_H__
#include <stdint.h>
#include <inttypes.h>
#include <stdbool.h>
#include <string.h>
#include <generated/autoconf.h>
#include <macro.h>
#include <types.h>
#ifdef CONFIG_TARGET_AM
#include <klib.h>
@ -31,23 +31,6 @@
#include <stdlib.h>
#endif
#if CONFIG_MBASE + CONFIG_MSIZE > 0x100000000ul
#define PMEM64 1
#endif
typedef MUXDEF(CONFIG_ISA64, uint64_t, uint32_t) word_t;
typedef MUXDEF(CONFIG_ISA64, int64_t, int32_t) sword_t;
static const word_t WORD_T_MAX = MUXDEF(CONFIG_ISA64, UINT64_MAX, UINT32_MAX);
static const sword_t SWORD_T_MAX = MUXDEF(CONFIG_ISA64, INT64_MAX, INT32_MAX);
static const sword_t SWORD_T_MIN = MUXDEF(CONFIG_ISA64, INT64_MIN, INT32_MIN);
#define WORD_BYTES MUXDEF(CONFIG_ISA64, 8, 4)
#define FMT_WORD MUXDEF(CONFIG_ISA64, "0x%016" PRIx64, "0x%08" PRIx32)
typedef word_t vaddr_t;
typedef MUXDEF(PMEM64, uint64_t, uint32_t) paddr_t;
#define FMT_PADDR MUXDEF(PMEM64, "0x%016" PRIx64, "0x%08" PRIx32)
typedef uint16_t ioaddr_t;
#include <debug.h>
#endif

3
nemu/include/debug.h
View file

@ -16,10 +16,11 @@
#ifndef __DEBUG_H__
#define __DEBUG_H__
#include <common.h>
#include <stdio.h>
#include <utils.h>
IFDEF(CONFIG_ITRACE, void log_itrace_print());
#define Trace(format, ...) \
_Log("[TRACE] " format "\n", ## __VA_ARGS__)

21
nemu/include/types.h Normal file
View file

@ -0,0 +1,21 @@
#ifndef __TYPES_H__
#define __TYPES_H__
#include <inttypes.h>
#include <macro.h>
#if CONFIG_MBASE + CONFIG_MSIZE > 0x100000000ul
#define PMEM64 1
#endif
typedef MUXDEF(CONFIG_ISA64, uint64_t, uint32_t) word_t;
typedef MUXDEF(CONFIG_ISA64, int64_t, int32_t) sword_t;
static const word_t WORD_T_MAX = MUXDEF(CONFIG_ISA64, UINT64_MAX, UINT32_MAX);
static const sword_t SWORD_T_MAX = MUXDEF(CONFIG_ISA64, INT64_MAX, INT32_MAX);
static const sword_t SWORD_T_MIN = MUXDEF(CONFIG_ISA64, INT64_MIN, INT32_MIN);
#define WORD_BYTES MUXDEF(CONFIG_ISA64, 8, 4)
#define FMT_WORD MUXDEF(CONFIG_ISA64, "0x%016" PRIx64, "0x%08" PRIx32)
typedef word_t vaddr_t;
typedef MUXDEF(PMEM64, uint64_t, uint32_t) paddr_t;
#define FMT_PADDR MUXDEF(PMEM64, "0x%016" PRIx64, "0x%08" PRIx32)
typedef uint16_t ioaddr_t;
#endif

5
nemu/include/utils.h
View file

@ -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

2
nemu/src/cpu/cpu-exec.c
View file

@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
***************************************************************************************/
#include "utils.h"
#include <utils.h>
#include <cpu/cpu.h>
#include <cpu/decode.h>
#include <cpu/difftest.h>

3
nemu/src/isa/riscv32/inst.c
View file

@ -13,12 +13,13 @@
* See the Mulan PSL v2 for more details.
***************************************************************************************/
#include "common.h"
#include <common.h>
#include "local-include/reg.h"
#include <cpu/cpu.h>
#include <cpu/ifetch.h>
#include <cpu/decode.h>
#include <ftrace.h>
#include <utils.h>
#define R(i) gpr(i)
#define Mr vaddr_read

1
nemu/src/monitor/monitor.c
View file

@ -15,6 +15,7 @@
#include <isa.h>
#include <memory/paddr.h>
#include <utils.h>
void init_rand();
void init_log(const char *log_file);

1
nemu/src/monitor/sdb/addrexp.y
View file

@ -7,6 +7,7 @@
}
%{
#include <common.h>
#include <utils.h>
#include <isa.h>
#include <stdio.h>
#include <stdlib.h>

3
nemu/src/utils/ftrace.c
View file

@ -1,9 +1,8 @@
#include "debug.h"
#include "macro.h"
#include <assert.h>
#include <common.h>
#include <elf.h>
#include <ftrace.h>
#include <utils.h>
// Put this into another file
#ifdef CONFIG_FTRACE

1
nemu/src/utils/log.c
View file

@ -14,6 +14,7 @@
***************************************************************************************/
#include <common.h>
#include <utils.h>
extern uint64_t g_nr_guest_inst;