aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Zhao <jerryz123@berkeley.edu>2023-02-04 17:48:13 -0800
committerJerry Zhao <jerryz123@berkeley.edu>2023-02-04 17:48:13 -0800
commit3cc6c02fedca2086459974137c17e3d119c31dab (patch)
tree6fadb6627cc402eb804300e5cc0fc79047cf64ae
parenta3b5e41fd3349fd5960dd2ad8c3ad5719c3ae545 (diff)
downloadriscv-isa-sim-3cc6c02fedca2086459974137c17e3d119c31dab.zip
riscv-isa-sim-3cc6c02fedca2086459974137c17e3d119c31dab.tar.gz
riscv-isa-sim-3cc6c02fedca2086459974137c17e3d119c31dab.tar.bz2
Remove decode_macros.h from disasm.h
-rw-r--r--customext/cflush.cc1
-rw-r--r--disasm/disasm.cc1
-rw-r--r--riscv/disasm.h3
-rw-r--r--riscv/execute.cc1
-rw-r--r--riscv/interactive.cc1
-rw-r--r--riscv/processor.cc1
6 files changed, 7 insertions, 1 deletions
diff --git a/customext/cflush.cc b/customext/cflush.cc
index b8cbe59..485716a 100644
--- a/customext/cflush.cc
+++ b/customext/cflush.cc
@@ -1,5 +1,6 @@
#include "insn_macros.h"
#include "extension.h"
+#include "decode_macros.h"
#include <cstring>
struct : public arg_t {
diff --git a/disasm/disasm.cc b/disasm/disasm.cc
index bc82024..3988072 100644
--- a/disasm/disasm.cc
+++ b/disasm/disasm.cc
@@ -1,6 +1,7 @@
// See LICENSE for license details.
#include "disasm.h"
+#include "decode_macros.h"
#include <cassert>
#include <string>
#include <vector>
diff --git a/riscv/disasm.h b/riscv/disasm.h
index bb49a59..d4b8c2c 100644
--- a/riscv/disasm.h
+++ b/riscv/disasm.h
@@ -3,7 +3,8 @@
#ifndef _RISCV_DISASM_H
#define _RISCV_DISASM_H
-#include "decode_macros.h"
+#include "common.h"
+#include "decode.h"
#include "isa_parser.h"
#include <string>
#include <sstream>
diff --git a/riscv/execute.cc b/riscv/execute.cc
index d244419..f412a35 100644
--- a/riscv/execute.cc
+++ b/riscv/execute.cc
@@ -4,6 +4,7 @@
#include "processor.h"
#include "mmu.h"
#include "disasm.h"
+#include "decode_macros.h"
#include <cassert>
static void commit_log_reset(processor_t* p)
diff --git a/riscv/interactive.cc b/riscv/interactive.cc
index 02ba227..53d68dd 100644
--- a/riscv/interactive.cc
+++ b/riscv/interactive.cc
@@ -3,6 +3,7 @@
#include "config.h"
#include "sim.h"
#include "decode.h"
+#include "decode_macros.h"
#include "disasm.h"
#include "mmu.h"
#include "vector_unit.h"
diff --git a/riscv/processor.cc b/riscv/processor.cc
index d55d218..b3d2467 100644
--- a/riscv/processor.cc
+++ b/riscv/processor.cc
@@ -5,6 +5,7 @@
#include "extension.h"
#include "common.h"
#include "config.h"
+#include "decode_macros.h"
#include "simif.h"
#include "mmu.h"
#include "disasm.h"