Disentangle some header files

diff --git a/riscv/decode.h b/riscv/decode.h
index 1dfec6eeee6ef68e4eb0d9b528d38e0425dac75f..5f65c2731da65a4db28489bb22f8013ad3bb3a62 100644 (file)
--- a/riscv/decode.h
+++ b/riscv/decode.h
@@ -8,6 +8,7 @@
 #include <string.h>
 #include "pcr.h"
 #include "config.h"
+#include "common.h"
 
 typedef int int128_t __attribute__((mode(TI)));
 typedef unsigned int uint128_t __attribute__((mode(TI)));

diff --git a/riscv/insn_template.cc b/riscv/insn_template.cc
index 3aca669072880a1d515fbdd2a42ec00c1107c65d..5bd986e18be53d49e501b8d6d2275acc9aa51bd1 100644 (file)
--- a/riscv/insn_template.cc
+++ b/riscv/insn_template.cc
@@ -2,7 +2,7 @@
 
 #include "processor.h"
 #include "config.h"
-#include "sim.h"
+#include "mmu.h"
 #include "softfloat.h"
 #include "platform.h" // softfloat isNaNF32UI, etc.
 #include "internals.h" // ditto