From 60a1031181a972a199fc64abddbdf9bcac20193a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Jan 2023 09:55:07 -0500 Subject: [PATCH] sim: replace -I$srcroot/opcodes include with -I$srcroot Clean up includes a bit by making ports include opcodes/ headers explicitly. This matches other projects, and makes it more clear where these headers are coming from. --- sim/bpf/sim-main.h | 4 ++-- sim/common/Make-common.in | 2 +- sim/cris/sim-main.h | 4 ++-- sim/frv/profile.h | 2 +- sim/frv/sim-main.h | 4 ++-- sim/iq2000/sim-main.h | 4 ++-- sim/lm32/sim-main.h | 4 ++-- sim/m32c/trace.c | 2 +- sim/m32r/sim-main.h | 4 ++-- sim/microblaze/interp.c | 2 +- sim/microblaze/microblaze.h | 2 +- sim/or1k/sim-main.h | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sim/bpf/sim-main.h b/sim/bpf/sim-main.h index 812ab7e165d..d1d68d12e76 100644 --- a/sim/bpf/sim-main.h +++ b/sim/bpf/sim-main.h @@ -20,8 +20,8 @@ #define SIM_MAIN_H #include "sim-basics.h" -#include "bpf-desc.h" -#include "bpf-opc.h" +#include "opcodes/bpf-desc.h" +#include "opcodes/bpf-opc.h" #include "arch.h" #include "sim-base.h" #include "cgen-sim.h" diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 8d9585287c7..2aeb97d7c44 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -119,7 +119,7 @@ CONFIG_CFLAGS = \ CSEARCH = -I. -I$(srcdir) -I$(srccom) \ -I$(srcroot)/include \ -I../../bfd -I$(srcroot)/bfd \ - -I$(srcroot)/opcodes \ + -I$(srcroot) \ -I../.. ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(INCGNU) $(SIM_EXTRA_CFLAGS) $(CFLAGS) BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h index a56005ae3a3..abebe2bafc1 100644 --- a/sim/cris/sim-main.h +++ b/sim/cris/sim-main.h @@ -30,8 +30,8 @@ along with this program. If not, see . */ #define WITH_SCACHE_PBB 1 #include "sim-basics.h" -#include "cris-desc.h" -#include "cris-opc.h" +#include "opcodes/cris-desc.h" +#include "opcodes/cris-opc.h" #include "arch.h" #include "sim-base.h" #include "cgen-sim.h" diff --git a/sim/frv/profile.h b/sim/frv/profile.h index 051b0154272..8c29ed722ac 100644 --- a/sim/frv/profile.h +++ b/sim/frv/profile.h @@ -20,7 +20,7 @@ along with this program. If not, see . */ #ifndef PROFILE_H #define PROFILE_H -#include "frv-desc.h" +#include "opcodes/frv-desc.h" /* This struct defines the state of profiling. All fields are of general use to all machines. */ diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h index c292c6407a3..f2fbcce2b21 100644 --- a/sim/frv/sim-main.h +++ b/sim/frv/sim-main.h @@ -28,9 +28,9 @@ along with this program. If not, see . */ #define WITH_SCACHE_PBB 0 #include "sim-basics.h" -#include "frv-desc.h" +#include "opcodes/frv-desc.h" #include -#include "frv-opc.h" +#include "opcodes/frv-opc.h" #include "arch.h" #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) \ diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h index 2398e30b9a1..dcd7ed4682f 100644 --- a/sim/iq2000/sim-main.h +++ b/sim/iq2000/sim-main.h @@ -10,8 +10,8 @@ #define WITH_SCACHE_PBB 1 #include "sim-basics.h" -#include "iq2000-desc.h" -#include "iq2000-opc.h" +#include "opcodes/iq2000-desc.h" +#include "opcodes/iq2000-opc.h" #include "arch.h" /* Pull in IQ2000_{DATA,INSN}_{MASK,VALUE}. */ diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h index d7590e4fbd7..82e81988ce5 100644 --- a/sim/lm32/sim-main.h +++ b/sim/lm32/sim-main.h @@ -26,8 +26,8 @@ #define WITH_SCACHE_PBB 1 #include "sim-basics.h" -#include "lm32-desc.h" -#include "lm32-opc.h" +#include "opcodes/lm32-desc.h" +#include "opcodes/lm32-opc.h" #include "arch.h" #include "sim-base.h" #include "cgen-sim.h" diff --git a/sim/m32c/trace.c b/sim/m32c/trace.c index e9ea424c0fe..be796b147ed 100644 --- a/sim/m32c/trace.c +++ b/sim/m32c/trace.c @@ -31,7 +31,7 @@ along with this program. If not, see . */ #include "bfd.h" #include "dis-asm.h" -#include "m32c-desc.h" +#include "opcodes/m32c-desc.h" #include "cpu.h" #include "mem.h" diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h index 9a52563f25a..89502f2240e 100644 --- a/sim/m32r/sim-main.h +++ b/sim/m32r/sim-main.h @@ -9,8 +9,8 @@ #define WITH_SCACHE_PBB 1 #include "sim-basics.h" -#include "m32r-desc.h" -#include "m32r-opc.h" +#include "opcodes/m32r-desc.h" +#include "opcodes/m32r-opc.h" #include "arch.h" #include "sim-base.h" #include "cgen-sim.h" diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c index 7bd06d51339..a4f505e77a8 100644 --- a/sim/microblaze/interp.c +++ b/sim/microblaze/interp.c @@ -34,7 +34,7 @@ #include "sim-syscall.h" #include "microblaze-sim.h" -#include "microblaze-dis.h" +#include "opcodes/microblaze-dis.h" #define target_big_endian (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) diff --git a/sim/microblaze/microblaze.h b/sim/microblaze/microblaze.h index a09a1697fc2..328e8253168 100644 --- a/sim/microblaze/microblaze.h +++ b/sim/microblaze/microblaze.h @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ -#include "../../opcodes/microblaze-opcm.h" +#include "opcodes/microblaze-opcm.h" #define GET_RD ((inst & RD_MASK) >> RD_LOW) #define GET_RA ((inst & RA_MASK) >> RA_LOW) diff --git a/sim/or1k/sim-main.h b/sim/or1k/sim-main.h index 8b340c587da..326bc079f70 100644 --- a/sim/or1k/sim-main.h +++ b/sim/or1k/sim-main.h @@ -21,8 +21,8 @@ #define WITH_SCACHE_PBB 1 -#include "or1k-desc.h" -#include "or1k-opc.h" +#include "opcodes/or1k-desc.h" +#include "opcodes/or1k-opc.h" #include "sim-basics.h" #include "arch.h" #include "sim-base.h" -- 2.30.2