[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/16] target/xtensa: update import_core.sh script f
From: |
Max Filippov |
Subject: |
[Qemu-devel] [PATCH 05/16] target/xtensa: update import_core.sh script for libisa |
Date: |
Fri, 3 Nov 2017 20:45:10 -0700 |
Extract xtensa-modules.c from the overlay, fix up known issues, include
it into the core-$NAME.c.
Signed-off-by: Max Filippov <address@hidden>
---
target/xtensa/import_core.sh | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
index cebb6e9c4c61..62d3243c1445 100755
--- a/target/xtensa/import_core.sh
+++ b/target/xtensa/import_core.sh
@@ -23,6 +23,16 @@ 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
+#
+# Fix up known issues in the xtensa-modules.c
+#
+tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \
+ sed -e 's/\(xtensa_opcode_encode_fn.*\[\] =\)/static \1/' \
+ -e '/^int num_bypass_groups()/,/}/d' \
+ -e '/^int num_bypass_group_chunks()/,/}/d' \
+ -e '/^uint32 \*bypass_entry(int i)/,/}/d' \
+ -e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/s/^
return 0;$/ return XTENSA_UNDEFINED;/' \
+ > "$TARGET"/xtensa-modules.c
cat <<EOF > "${TARGET}.c"
#include "qemu/osdep.h"
@@ -35,6 +45,9 @@ cat <<EOF > "${TARGET}.c"
#include "core-$NAME/core-isa.h"
#include "overlay_tool.h"
+#define xtensa_modules xtensa_modules_$NAME
+#include "core-$NAME/xtensa-modules.c"
+
static XtensaConfig $NAME __attribute__((unused)) = {
.name = "$NAME",
.gdb_regmap = {
@@ -42,6 +55,7 @@ static XtensaConfig $NAME __attribute__((unused)) = {
#include "core-$NAME/gdb-config.c"
}
},
+ .isa_internal = &xtensa_modules,
.clock_freq_khz = $FREQ,
DEFAULT_SECTIONS
};
--
2.1.4
- [Qemu-devel] [PATCH 00/16] target/xtensa: switch to libisa, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 01/16] target/xtensa: pass actual frame size to the entry helper, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 05/16] target/xtensa: update import_core.sh script for libisa,
Max Filippov <=
- [Qemu-devel] [PATCH 04/16] target/xtensa: extract FPU2000 opcode translators, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 02/16] target/xtensa: import libisa source, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 03/16] target/xtensa: extract core opcode translators, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 10/16] target/xtensa: tests: fix memctl SR test, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 11/16] target/xtensa: drop DisasContext::litbase, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 13/16] target/xtensa: implement salt/saltu, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 09/16] target/xtensa: use libisa for instruction decoding, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 12/16] target/xtensa: add internal/noop SRs and opcodes, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 14/16] target/xtensa: implement GPIO32, Max Filippov, 2017/11/03
- [Qemu-devel] [PATCH 15/16] target/xtensa: implement const16, Max Filippov, 2017/11/03