jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
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>
+13
-13
+2
-2
target/xtensa/core-dc232b.c
+2
-2
target/xtensa/core-dc232b.c
···
35
35
#include "overlay_tool.h"
36
36
37
37
#define xtensa_modules xtensa_modules_dc232b
38
-
#include "core-dc232b/xtensa-modules.c"
38
+
#include "core-dc232b/xtensa-modules.inc.c"
39
39
40
40
static XtensaConfig dc232b __attribute__((unused)) = {
41
41
.name = "dc232b",
···
43
43
.num_regs = 120,
44
44
.num_core_regs = 52,
45
45
.reg = {
46
-
#include "core-dc232b/gdb-config.c"
46
+
#include "core-dc232b/gdb-config.inc.c"
47
47
}
48
48
},
49
49
.isa_internal = &xtensa_modules,
target/xtensa/core-dc232b/gdb-config.c
target/xtensa/core-dc232b/gdb-config.inc.c
target/xtensa/core-dc232b/gdb-config.c
target/xtensa/core-dc232b/gdb-config.inc.c
target/xtensa/core-dc232b/xtensa-modules.c
target/xtensa/core-dc232b/xtensa-modules.inc.c
target/xtensa/core-dc232b/xtensa-modules.c
target/xtensa/core-dc232b/xtensa-modules.inc.c
+2
-2
target/xtensa/core-dc233c.c
+2
-2
target/xtensa/core-dc233c.c
···
36
36
#include "overlay_tool.h"
37
37
38
38
#define xtensa_modules xtensa_modules_dc233c
39
-
#include "core-dc233c/xtensa-modules.c"
39
+
#include "core-dc233c/xtensa-modules.inc.c"
40
40
41
41
static XtensaConfig dc233c __attribute__((unused)) = {
42
42
.name = "dc233c",
···
44
44
.num_regs = 121,
45
45
.num_core_regs = 52,
46
46
.reg = {
47
-
#include "core-dc233c/gdb-config.c"
47
+
#include "core-dc233c/gdb-config.inc.c"
48
48
}
49
49
},
50
50
.isa_internal = &xtensa_modules,
target/xtensa/core-dc233c/gdb-config.c
target/xtensa/core-dc233c/gdb-config.inc.c
target/xtensa/core-dc233c/gdb-config.c
target/xtensa/core-dc233c/gdb-config.inc.c
target/xtensa/core-dc233c/xtensa-modules.c
target/xtensa/core-dc233c/xtensa-modules.inc.c
target/xtensa/core-dc233c/xtensa-modules.c
target/xtensa/core-dc233c/xtensa-modules.inc.c
+2
-2
target/xtensa/core-de212.c
+2
-2
target/xtensa/core-de212.c
···
36
36
#include "overlay_tool.h"
37
37
38
38
#define xtensa_modules xtensa_modules_de212
39
-
#include "core-de212/xtensa-modules.c"
39
+
#include "core-de212/xtensa-modules.inc.c"
40
40
41
41
static XtensaConfig de212 __attribute__((unused)) = {
42
42
.name = "de212",
43
43
.gdb_regmap = {
44
44
.reg = {
45
-
#include "core-de212/gdb-config.c"
45
+
#include "core-de212/gdb-config.inc.c"
46
46
}
47
47
},
48
48
.isa_internal = &xtensa_modules,
target/xtensa/core-de212/gdb-config.c
target/xtensa/core-de212/gdb-config.inc.c
target/xtensa/core-de212/gdb-config.c
target/xtensa/core-de212/gdb-config.inc.c
target/xtensa/core-de212/xtensa-modules.c
target/xtensa/core-de212/xtensa-modules.inc.c
target/xtensa/core-de212/xtensa-modules.c
target/xtensa/core-de212/xtensa-modules.inc.c
+1
-1
target/xtensa/core-fsf.c
+1
-1
target/xtensa/core-fsf.c
target/xtensa/core-fsf/xtensa-modules.c
target/xtensa/core-fsf/xtensa-modules.inc.c
target/xtensa/core-fsf/xtensa-modules.c
target/xtensa/core-fsf/xtensa-modules.inc.c
+2
-2
target/xtensa/core-sample_controller.c
+2
-2
target/xtensa/core-sample_controller.c
···
36
36
#include "overlay_tool.h"
37
37
38
38
#define xtensa_modules xtensa_modules_sample_controller
39
-
#include "core-sample_controller/xtensa-modules.c"
39
+
#include "core-sample_controller/xtensa-modules.inc.c"
40
40
41
41
static XtensaConfig sample_controller __attribute__((unused)) = {
42
42
.name = "sample_controller",
43
43
.gdb_regmap = {
44
44
.reg = {
45
-
#include "core-sample_controller/gdb-config.c"
45
+
#include "core-sample_controller/gdb-config.inc.c"
46
46
}
47
47
},
48
48
.isa_internal = &xtensa_modules,
target/xtensa/core-sample_controller/gdb-config.c
target/xtensa/core-sample_controller/gdb-config.inc.c
target/xtensa/core-sample_controller/gdb-config.c
target/xtensa/core-sample_controller/gdb-config.inc.c
target/xtensa/core-sample_controller/xtensa-modules.c
target/xtensa/core-sample_controller/xtensa-modules.inc.c
target/xtensa/core-sample_controller/xtensa-modules.c
target/xtensa/core-sample_controller/xtensa-modules.inc.c
+4
-4
target/xtensa/import_core.sh
+4
-4
target/xtensa/import_core.sh
···
22
22
tar -xf "$OVERLAY" -C "$TARGET" --strip-components=1 \
23
23
--xform='s/core/core-isa/' config/core.h
24
24
tar -xf "$OVERLAY" -O gdb/xtensa-config.c | \
25
-
sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.c
25
+
sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc.c
26
26
#
27
27
# Fix up known issues in the xtensa-modules.c
28
28
#
···
33
33
-e '/^uint32 \*bypass_entry(int i)/,/}/d' \
34
34
-e '/^#include "ansidecl.h"/d' \
35
35
-e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/s/^ return 0;$/ return XTENSA_UNDEFINED;/' \
36
-
> "$TARGET"/xtensa-modules.c
36
+
> "$TARGET"/xtensa-modules.inc.c
37
37
38
38
cat <<EOF > "${TARGET}.c"
39
39
#include "qemu/osdep.h"
···
47
47
#include "overlay_tool.h"
48
48
49
49
#define xtensa_modules xtensa_modules_$NAME
50
-
#include "core-$NAME/xtensa-modules.c"
50
+
#include "core-$NAME/xtensa-modules.inc.c"
51
51
52
52
static XtensaConfig $NAME __attribute__((unused)) = {
53
53
.name = "$NAME",
54
54
.gdb_regmap = {
55
55
.reg = {
56
-
#include "core-$NAME/gdb-config.c"
56
+
#include "core-$NAME/gdb-config.inc.c"
57
57
}
58
58
},
59
59
.isa_internal = &xtensa_modules,