target/xtensa: add .inc. to non-top level source file names

Fix definitions of existing cores and core importing script to follow
the rule of naming non-top level source files.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Max Filippov 2018-03-22 10:45:57 -07:00
parent 7b93d78a04
commit dda2441b2b
15 changed files with 13 additions and 13 deletions

View File

@ -35,7 +35,7 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_dc232b
#include "core-dc232b/xtensa-modules.c"
#include "core-dc232b/xtensa-modules.inc.c"
static XtensaConfig dc232b __attribute__((unused)) = {
.name = "dc232b",
@ -43,7 +43,7 @@ static XtensaConfig dc232b __attribute__((unused)) = {
.num_regs = 120,
.num_core_regs = 52,
.reg = {
#include "core-dc232b/gdb-config.c"
#include "core-dc232b/gdb-config.inc.c"
}
},
.isa_internal = &xtensa_modules,

View File

@ -36,7 +36,7 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_dc233c
#include "core-dc233c/xtensa-modules.c"
#include "core-dc233c/xtensa-modules.inc.c"
static XtensaConfig dc233c __attribute__((unused)) = {
.name = "dc233c",
@ -44,7 +44,7 @@ static XtensaConfig dc233c __attribute__((unused)) = {
.num_regs = 121,
.num_core_regs = 52,
.reg = {
#include "core-dc233c/gdb-config.c"
#include "core-dc233c/gdb-config.inc.c"
}
},
.isa_internal = &xtensa_modules,

View File

@ -36,13 +36,13 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_de212
#include "core-de212/xtensa-modules.c"
#include "core-de212/xtensa-modules.inc.c"
static XtensaConfig de212 __attribute__((unused)) = {
.name = "de212",
.gdb_regmap = {
.reg = {
#include "core-de212/gdb-config.c"
#include "core-de212/gdb-config.inc.c"
}
},
.isa_internal = &xtensa_modules,

View File

@ -36,7 +36,7 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_fsf
#include "core-fsf/xtensa-modules.c"
#include "core-fsf/xtensa-modules.inc.c"
static XtensaConfig fsf __attribute__((unused)) = {
.name = "fsf",

View File

@ -36,13 +36,13 @@
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_sample_controller
#include "core-sample_controller/xtensa-modules.c"
#include "core-sample_controller/xtensa-modules.inc.c"
static XtensaConfig sample_controller __attribute__((unused)) = {
.name = "sample_controller",
.gdb_regmap = {
.reg = {
#include "core-sample_controller/gdb-config.c"
#include "core-sample_controller/gdb-config.inc.c"
}
},
.isa_internal = &xtensa_modules,

View File

@ -22,7 +22,7 @@ mkdir -p "$TARGET"
tar -xf "$OVERLAY" -C "$TARGET" --strip-components=1 \
--xform='s/core/core-isa/' config/core.h
tar -xf "$OVERLAY" -O gdb/xtensa-config.c | \
sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.c
sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc.c
#
# Fix up known issues in the xtensa-modules.c
#
@ -33,7 +33,7 @@ tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \
-e '/^uint32 \*bypass_entry(int i)/,/}/d' \
-e '/^#include "ansidecl.h"/d' \
-e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/s/^ return 0;$/ return XTENSA_UNDEFINED;/' \
> "$TARGET"/xtensa-modules.c
> "$TARGET"/xtensa-modules.inc.c
cat <<EOF > "${TARGET}.c"
#include "qemu/osdep.h"
@ -47,13 +47,13 @@ cat <<EOF > "${TARGET}.c"
#include "overlay_tool.h"
#define xtensa_modules xtensa_modules_$NAME
#include "core-$NAME/xtensa-modules.c"
#include "core-$NAME/xtensa-modules.inc.c"
static XtensaConfig $NAME __attribute__((unused)) = {
.name = "$NAME",
.gdb_regmap = {
.reg = {
#include "core-$NAME/gdb-config.c"
#include "core-$NAME/gdb-config.inc.c"
}
},
.isa_internal = &xtensa_modules,