Fix install of a missed header from debug_rom.

The installed header files from the riscv subproject were incomplete, since
processor.h includes debug_rom_defines.h, and the latter was not installed.
Fix by moving it into riscv/, add it to the riscv subproject header list, which
ensures it will get installed.  While here, also add a missed dependency of debug_rom
on riscv/encoding.h to debug_rom/Makefile.

diff --git a/debug_rom/Makefile b/debug_rom/Makefile
index 0a67ba102623b9861ea713ef973a447a4a3cebce..c5f2205de3bbf38baba4d600342f2277d409d098 100644 (file)
--- a/debug_rom/Makefile
+++ b/debug_rom/Makefile
@@ -7,7 +7,7 @@ OBJCOPY = $(RISCV)/bin/riscv64-unknown-elf-objcopy
 COMPILE = $(CC) -nostdlib -nostartfiles -I.. -Tlink.ld
 
 ELFS = debug_rom
-DEPS = debug_rom.S link.ld debug_rom_defines.h
+DEPS = debug_rom.S link.ld ../riscv/debug_rom_defines.h ../riscv/encoding.h
 
 all: $(patsubst %,%.h,$(ELFS))
 

diff --git a/debug_rom/debug_rom.S b/debug_rom/debug_rom.S
index 1342ee0520cd06b9b5be6216103308aaf0484f3c..28c7076fda5c17dc2f46d1cf2fead993ba92b6f5 100755 (executable)
--- a/debug_rom/debug_rom.S
+++ b/debug_rom/debug_rom.S
@@ -1,8 +1,8 @@
 // See LICENSE.SiFive for license details.
 
 #include "riscv/encoding.h"
-#include "debug_rom_defines.h"
-        
+#include "riscv/debug_rom_defines.h"
+
         .option norvc
         .global entry
         .global exception

diff --git a/riscv/debug_module.cc b/riscv/debug_module.cc
index 39e1ae01e39c17af9b93d59a4b152c868de9fd9e..de54a8377256346b8223c5a5fe6b4025b8400bfc 100644 (file)
--- a/riscv/debug_module.cc
+++ b/riscv/debug_module.cc
@@ -6,7 +6,7 @@
 #include "mmu.h"
 
 #include "debug_rom/debug_rom.h"
-#include "debug_rom/debug_rom_defines.h"
+#include "debug_rom_defines.h"
 
 #if 0
 #  define D(x) x

diff --git a/riscv/processor.h b/riscv/processor.h
index 070fccf8af1d7515c1c46add649a2912b839da29..3998ce5a49fa34af20f6963c2192d11db4f62794 100644 (file)
--- a/riscv/processor.h
+++ b/riscv/processor.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 #include <map>
-#include "debug_rom/debug_rom_defines.h"
+#include "debug_rom_defines.h"
 
 class processor_t;
 class mmu_t;