[Update] devel/xtensa-esp32-elf to 2021r2

Hello,

Here is an update to devel/xtensa-esp32-elf bringing us to 2021r2. This
will allow us to update arduino-esp32 to the latest development version
release of ESP-IDF.

I chose to move this to its own installation directory, like I did with
xtensa-lx106-elf. I am working on some more toolchains for the new ESP32
variants, and this helps bring conflict management to a minimum. This
diff also rearranges the port to be more inline with the lx106 port as
well.

This has been tested out to chip from builds on amd64 and sparc64.
Please give this close review.

Ok?

Thanks.
--

Tracey Emery

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/Makefile.inc,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile.inc
--- Makefile.inc 29 Oct 2020 14:10:51 -0000 1.3
+++ Makefile.inc 1 Nov 2021 16:39:22 -0000
@@ -4,6 +4,8 @@ CONFIG = xtensa-esp32-elf
CATEGORIES += devel
HOMEPAGE = https://www.espressif.com/en/products/software/esp-sdk/overview

+# DEBUG_PACKAGES = ${BUILD_PACKAGES}
+
# GPLv3
# For newlib: multiple copyrights, but basically BSD.
# See: ${PREFIX}/share/doc/newlib
@@ -12,15 +14,37 @@ PERMIT_PACKAGE = Yes
# permits build on sparc64
COMPILER = base-clang ports-clang

-# XXX at least gmkdir gets picked up if present
-BUILD_DEPENDS += sysutils/coreutils
+BUILD_DEPENDS += devel/bison \
+ sysutils/coreutils
+
+SEPARATE_BUILD = Yes
+USE_GMAKE = Yes
+YACC = bison -y

-CONFIGURE_STYLE ?= gnu
-CONFIGURE_ARGS += --target=${CONFIG} \
- --program-prefix=xtensa-esp32-elf- \
+CE_VARS = "-mlongcalls -Os -g -free -fipa-pta"
+
+INSTALLDIR = "${LOCALBASE}/${CONFIG}"
+CONFIGURE_STYLE ?= simple
+CONFIGURE_ENV += CFLAGS_FOR_TARGET=${CE_VARS} \
+ CXXFLAGS_FOR_TARGET=${CE_VARS} \
+ CFLAGS="-I${INSTALLDIR}/include -pipe -g" \
+ LDFLAGS="-L${INSTALLDIR}/lib -g"
+CONFIGURE_ARGS += --target="${CONFIG}" \
+ --prefix="${INSTALLDIR}" \
+ --disable-shared \
+ --with-newlib \
+ --enable-threads=no \
+ --disable-__cxa_atexit \
+ --disable-libgomp \
+ --disable-libmudflap \
--disable-nls \
- --disable-werror \
- --with-bugurl="http://www.espressif.com/"
+ --disable-bootstrap \
+ --enable-languages=c,c++ \
+ --disable-lto \
+ --disable-libstdcxx-verbose \
+ --disable-option-checking \
+ --without-long-double-128 \
+ --with-system-zlib \
+ --enable-static=yes

-USE_GMAKE = Yes
-SEPARATE_BUILD = Yes
+NO_TEST = Yes
Index: binutils/Makefile
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/binutils/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- binutils/Makefile 29 Oct 2020 14:10:51 -0000 1.2
+++ binutils/Makefile 1 Nov 2021 16:39:22 -0000
@@ -1,28 +1,19 @@
# $OpenBSD: Makefile,v 1.2 2020/10/29 14:10:51 tracey Exp $

COMMENT = binutils for ${CONFIG} cross-development
-VERSION = 2.33.1.2020.3
+VERSION = 2.35.1.2020.1223
PKGNAME = ${CONFIG}-binutils-${VERSION}

GH_ACCOUNT = espressif
GH_PROJECT = binutils-gdb
-GH_TAGNAME = esp-2020r3-binutils
+GH_TAGNAME = esp-2021r2-binutils

-WANTLIB = c z
+WANTLIB += c z

-USE_LIBTOOL = No
-
-CONFIGURE_ARGS += --disable-werror \
- --enable-ld=yes \
- --enable-gold=no \
- --enable-multilib \
- --disable-sim \
- --disable-gdb \
- --with-sysroot=${LOCALBASE}/${CONFIG} \
- --disable-option-checking \
- --with-gnu-ld \
+CONFIGURE_ARGS += --disable-multilib \
--with-gnu-as \
- --with-newlib \
- --with-system-zlib
+ --with-gnu-ld \
+ --disable-werror \
+ --disable-gdb

.include <bsd.port.mk>
Index: binutils/distinfo
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/binutils/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- binutils/distinfo 29 Oct 2020 14:10:51 -0000 1.2
+++ binutils/distinfo 1 Nov 2021 16:39:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (binutils-gdb-esp-2020r3-binutils.tar.gz) = IK7F3R6RSuzIv3kqeQ2ZFLwfklpZaWolxJY0qZAB+dM=
-SIZE (binutils-gdb-esp-2020r3-binutils.tar.gz) = 55967670
+SHA256 (binutils-gdb-esp-2021r2-binutils.tar.gz) = zsRv11iRKXZVSpMDVfg6iTkt4YO1nXXXRbj9qwFzDIk=
+SIZE (binutils-gdb-esp-2021r2-binutils.tar.gz) = 60652952
Index: binutils/patches/patch-bfd_xtensa-modules_c
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/binutils/patches/patch-bfd_xtensa-modules_c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-bfd_xtensa-modules_c
--- binutils/patches/patch-bfd_xtensa-modules_c 11 Mar 2020 14:24:57 -0000 1.1.1.1
+++ binutils/patches/patch-bfd_xtensa-modules_c 1 Nov 2021 16:39:22 -0000
@@ -7,7 +7,7 @@ Index: bfd/xtensa-modules.c
+++ bfd/xtensa-modules.c
@@ -1,22 +1,25 @@
/* Xtensa configuration-specific ISA information.
-- Copyright (C) 2003-2018 Free Software Foundation, Inc.
+- Copyright (C) 2003-2020 Free Software Foundation, Inc.

- This file is part of BFD, the Binary File Descriptor library.
+ Copyright (c) 2003-2016 Tensilica Inc.
@@ -133,7 +133,7 @@ Index: bfd/xtensa-modules.c
{ "MISC0", 32, 0 },
{ "MISC1", 32, 0 },
{ "MISC2", 32, 0 },
-@@ -176,187 +178,150 @@ static xtensa_state_internal states[] = {
+@@ -176,3152 +178,2217 @@ static xtensa_state_internal states[] = {
{ "CCOMPARE0", 32, 0 },
{ "CCOMPARE1", 32, 0 },
{ "CCOMPARE2", 32, 0 },
@@ -365,8 +365,8 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_inst_get (const xtensa_insnbuf insn)
+Field_r_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
return tie_t;
}
@@ -375,9 +375,10 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_r_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
}

@@ -385,58 +386,56 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_inst16a_get (const xtensa_insnbuf insn)
+Field_op0_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
-- return tie_t;
--}
--
--static void
+- unsigned tie_t = ((insn[0] >> 4) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+ return tie_t;
+ }
+
+ static void
-Field_t_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
++Field_op0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-}
-
-static unsigned
-Field_t_Slot_inst16b_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
- return tie_t;
-}
-
-static void
-Field_t_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-}
-
-static unsigned
-Field_t_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
- return tie_t;
- }
-
- static void
+- unsigned tie_t = insn[0] & 0xf;
+- return tie_t;
+-}
+-
+-static void
-Field_t_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-+Field_op0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
-@@ -364,486 +329,429 @@ Field_t_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn,
+-{
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
}

static unsigned
-Field_t_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_op2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
return tie_t;
}
@@ -445,9 +444,10 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_op2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
}

@@ -455,8 +455,8 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_op1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
return tie_t;
}
@@ -465,9 +465,10 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_op1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
}

@@ -475,52 +476,50 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_t_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-- return tie_t;
--}
--
--static void
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+ return tie_t;
+ }
+
+ static void
-Field_t_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
++Field_t_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-}
-
-static unsigned
-Field_bbi4_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+- unsigned tie_t = (insn[0] >> 12) & 1;
- return tie_t;
-}
-
-static void
-Field_bbi4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
-}
-
-static unsigned
-Field_bbi_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
- return tie_t;
- }
-
- static void
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
+- return tie_t;
+-}
+-
+-static void
-Field_bbi_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-+Field_t_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+-{
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
}

@@ -528,9 +527,9 @@ Index: bfd/xtensa-modules.c
-Field_bbi_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_s_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = (insn[0] >> 26) & 1;
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
return tie_t;
}
@@ -539,11 +538,12 @@ Index: bfd/xtensa-modules.c
-Field_bbi_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_s_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
}

@@ -551,8 +551,8 @@ Index: bfd/xtensa-modules.c
-Field_imm12_Slot_inst_get (const xtensa_insnbuf insn)
+Field_n_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 12) | ((insn[0] << 8) >> 20);
+- unsigned tie_t = (insn[0] >> 12) & 0xfff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
return tie_t;
}
@@ -561,9 +561,9 @@ Index: bfd/xtensa-modules.c
-Field_imm12_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_n_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 20) >> 20;
+- uint32 tie_t = val & 0xfff;
- insn[0] = (insn[0] & ~0xfff000) | (tie_t << 12);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
}
@@ -572,8 +572,8 @@ Index: bfd/xtensa-modules.c
-Field_imm8_Slot_inst_get (const xtensa_insnbuf insn)
+Field_m_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 8) | ((insn[0] << 8) >> 24);
+- unsigned tie_t = (insn[0] >> 16) & 0xff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
return tie_t;
}
@@ -582,9 +582,9 @@ Index: bfd/xtensa-modules.c
-Field_imm8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_m_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 24) >> 24;
+- uint32 tie_t = val & 0xff;
- insn[0] = (insn[0] & ~0xff0000) | (tie_t << 16);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
}
@@ -593,38 +593,39 @@ Index: bfd/xtensa-modules.c
-Field_imm8_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_sr_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 8) | ((insn[0] << 12) >> 24);
-- return tie_t;
--}
--
--static void
+- unsigned tie_t = (insn[0] >> 12) & 0xff;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
-Field_imm8_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 24) >> 24;
++Field_sr_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xff;
- insn[0] = (insn[0] & ~0xff000) | (tie_t << 12);
-}
-
-static unsigned
-Field_imm8_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
-+ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
- return tie_t;
- }
-
- static void
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
+- return tie_t;
+-}
+-
+-static void
-Field_imm8_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_sr_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+-{
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+- tie_t = (val >> 4) & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
- tie_t = (val << 24) >> 28;
++ tie_t = (val << 24) >> 28;
insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
}

@@ -632,8 +633,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst_get (const xtensa_insnbuf insn)
+Field_st_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}
@@ -642,8 +644,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_st_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+ tie_t = (val << 24) >> 28;
insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
@@ -653,8 +656,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst16a_get (const xtensa_insnbuf insn)
+Field_thi3_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
return tie_t;
}
@@ -663,9 +666,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+Field_thi3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
}
@@ -674,8 +677,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst16b_get (const xtensa_insnbuf insn)
+Field_t3_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
return tie_t;
}
@@ -684,9 +687,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+Field_t3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
}
@@ -695,8 +698,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_tlo_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
return tie_t;
}
@@ -705,9 +708,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_tlo_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
}
@@ -716,8 +719,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_w_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 18) >> 30);
return tie_t;
}
@@ -726,9 +729,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_w_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x3000) | (tie_t << 12);
}
@@ -737,8 +740,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_r3_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
return tie_t;
}
@@ -747,9 +750,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_r3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
}
@@ -758,8 +761,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_rhi_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
return tie_t;
}
@@ -768,9 +771,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_rhi_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
}
@@ -779,9 +782,9 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_inst_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_3_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
-- tie_t = (tie_t << 8) | ((insn[0] << 8) >> 24);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
+- tie_t = (tie_t << 8) | ((insn[0] >> 16) & 0xff);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 8) >> 31);
return tie_t;
}
@@ -790,11 +793,11 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 24) >> 24;
+- uint32 tie_t = val & 0xff;
- insn[0] = (insn[0] & ~0xff0000) | (tie_t << 16);
-- tie_t = (val << 20) >> 28;
+- tie_t = (val >> 8) & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x800000) | (tie_t << 23);
}
@@ -803,9 +806,9 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
-- tie_t = (tie_t << 8) | ((insn[0] << 12) >> 24);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
+- tie_t = (tie_t << 8) | ((insn[0] >> 12) & 0xff);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
return tie_t;
}
@@ -814,11 +817,11 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 24) >> 24;
+- uint32 tie_t = val & 0xff;
- insn[0] = (insn[0] & ~0xff000) | (tie_t << 12);
-- tie_t = (val << 20) >> 28;
+- tie_t = (val >> 8) & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
}
@@ -827,8 +830,8 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_3_2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 12) | ((insn[0] << 16) >> 20);
+- unsigned tie_t = (insn[0] >> 4) & 0xfff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 8) >> 30);
return tie_t;
}
@@ -837,9 +840,9 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_3_2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 20) >> 20;
+- uint32 tie_t = val & 0xfff;
- insn[0] = (insn[0] & ~0xfff0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc00000) | (tie_t << 22);
}
@@ -848,8 +851,8 @@ Index: bfd/xtensa-modules.c
-Field_imm16_Slot_inst_get (const xtensa_insnbuf insn)
+Field_dfp_fld_r_3_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 16) | ((insn[0] << 8) >> 16);
+- unsigned tie_t = (insn[0] >> 8) & 0xffff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
return tie_t;
}
@@ -858,9 +861,9 @@ Index: bfd/xtensa-modules.c
-Field_imm16_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_r_3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 16) >> 16;
+- uint32 tie_t = val & 0xffff;
- insn[0] = (insn[0] & ~0xffff00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
}
@@ -869,8 +872,8 @@ Index: bfd/xtensa-modules.c
-Field_imm16_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 16) | ((insn[0] << 12) >> 16);
+- unsigned tie_t = (insn[0] >> 4) & 0xffff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
return tie_t;
}
@@ -879,9 +882,9 @@ Index: bfd/xtensa-modules.c
-Field_imm16_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 16) >> 16;
+- uint32 tie_t = val & 0xffff;
- insn[0] = (insn[0] & ~0xffff0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
}
@@ -890,8 +893,8 @@ Index: bfd/xtensa-modules.c
-Field_m_Slot_inst_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_3_1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+- unsigned tie_t = (insn[0] >> 6) & 3;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 8) >> 29);
return tie_t;
}
@@ -900,9 +903,9 @@ Index: bfd/xtensa-modules.c
-Field_m_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_3_1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00000) | (tie_t << 21);
}
@@ -911,8 +914,8 @@ Index: bfd/xtensa-modules.c
-Field_m_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_3_1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 28) >> 30);
+- unsigned tie_t = (insn[0] >> 2) & 3;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}
@@ -921,9 +924,9 @@ Index: bfd/xtensa-modules.c
-Field_m_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_3_1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0xc) | (tie_t << 2);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
}
@@ -932,8 +935,8 @@ Index: bfd/xtensa-modules.c
-Field_n_Slot_inst_get (const xtensa_insnbuf insn)
+Field_dfp_fld_r_3_1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+- unsigned tie_t = (insn[0] >> 4) & 3;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
return tie_t;
}
@@ -942,9 +945,9 @@ Index: bfd/xtensa-modules.c
-Field_n_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_r_3_1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
}
@@ -953,8 +956,8 @@ Index: bfd/xtensa-modules.c
-Field_n_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_s3to1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 30) >> 30);
+- unsigned tie_t = insn[0] & 3;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}
@@ -963,9 +966,9 @@ Index: bfd/xtensa-modules.c
-Field_n_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_s3to1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x3) | (tie_t << 0);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
}
@@ -974,8 +977,8 @@ Index: bfd/xtensa-modules.c
-Field_offset_Slot_inst_get (const xtensa_insnbuf insn)
+Field_op0_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 18) | ((insn[0] << 8) >> 14);
+- unsigned tie_t = (insn[0] >> 6) & 0x3ffff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
return tie_t;
}
@@ -984,9 +987,9 @@ Index: bfd/xtensa-modules.c
-Field_offset_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_op0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 14) >> 14;
+- uint32 tie_t = val & 0x3ffff;
- insn[0] = (insn[0] & ~0xffffc0) | (tie_t << 6);
++ uint32 tie_t;
+ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
}
@@ -995,8 +998,8 @@ Index: bfd/xtensa-modules.c
-Field_offset_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_t_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 18) | ((insn[0] << 14) >> 14);
+- unsigned tie_t = insn[0] & 0x3ffff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}
@@ -1005,9 +1008,9 @@ Index: bfd/xtensa-modules.c
-Field_offset_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_t_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 14) >> 14;
+- uint32 tie_t = val & 0x3ffff;
- insn[0] = (insn[0] & ~0x3ffff) | (tie_t << 0);
++ uint32 tie_t;
+ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
}
@@ -1016,8 +1019,8 @@ Index: bfd/xtensa-modules.c
-Field_op0_Slot_inst_get (const xtensa_insnbuf insn)
+Field_r_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
return tie_t;
}
@@ -1026,9 +1029,10 @@ Index: bfd/xtensa-modules.c
-Field_op0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_r_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
}

@@ -1036,26 +1040,28 @@ Index: bfd/xtensa-modules.c
-Field_op0_Slot_inst16a_get (const xtensa_insnbuf insn)
+Field_op0_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-@@ -851,7 +759,7 @@ Field_op0_Slot_inst16a_get (const xtensa_insnbuf insn)
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+ return tie_t;
}

static void
-Field_op0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+Field_op0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
-@@ -859,211 +767,217 @@ Field_op0_Slot_inst16a_set (xtensa_insnbuf insn, uint3
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
}

static unsigned
-Field_op0_Slot_inst16b_get (const xtensa_insnbuf insn)
+Field_z_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
return tie_t;
}
@@ -1064,9 +1070,9 @@ Index: bfd/xtensa-modules.c
-Field_op0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+Field_z_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
}
@@ -1075,8 +1081,8 @@ Index: bfd/xtensa-modules.c
-Field_op1_Slot_inst_get (const xtensa_insnbuf insn)
+Field_i_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
+- unsigned tie_t = (insn[0] >> 16) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
return tie_t;
}
@@ -1085,9 +1091,9 @@ Index: bfd/xtensa-modules.c
-Field_op1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_i_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
}
@@ -1096,8 +1102,8 @@ Index: bfd/xtensa-modules.c
-Field_op1_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_s_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
return tie_t;
}
@@ -1106,9 +1112,10 @@ Index: bfd/xtensa-modules.c
-Field_op1_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_s_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
}

@@ -1116,8 +1123,8 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_inst_get (const xtensa_insnbuf insn)
+Field_t_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
+- unsigned tie_t = (insn[0] >> 20) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}
@@ -1126,9 +1133,10 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_t_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
}

@@ -1136,8 +1144,8 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_bbi4_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
+- unsigned tie_t = (insn[0] >> 16) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
return tie_t;
}
@@ -1146,9 +1154,9 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_bbi4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
}
@@ -1157,8 +1165,8 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_bbi_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
@@ -1168,9 +1176,10 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_bbi_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
@@ -1180,8 +1189,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst_get (const xtensa_insnbuf insn)
+Field_imm12_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 12) | ((insn[0] << 8) >> 20);
return tie_t;
}
@@ -1190,9 +1199,9 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_imm12_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
++ uint32 tie_t;
+ tie_t = (val << 20) >> 20;
+ insn[0] = (insn[0] & ~0xfff000) | (tie_t << 12);
}
@@ -1201,8 +1210,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst16a_get (const xtensa_insnbuf insn)
+Field_imm8_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 8) | ((insn[0] << 8) >> 24);
return tie_t;
}
@@ -1211,9 +1220,9 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+Field_imm8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
++ uint32 tie_t;
+ tie_t = (val << 24) >> 24;
+ insn[0] = (insn[0] & ~0xff0000) | (tie_t << 16);
}
@@ -1222,8 +1231,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst16b_get (const xtensa_insnbuf insn)
+Field_s_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
return tie_t;
}
@@ -1232,9 +1241,10 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+Field_s_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
}

@@ -1242,8 +1252,9 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_imm12b_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ tie_t = (tie_t << 8) | ((insn[0] << 8) >> 24);
return tie_t;
}
@@ -1252,8 +1263,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_imm12b_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
+ tie_t = (val << 24) >> 24;
+ insn[0] = (insn[0] & ~0xff0000) | (tie_t << 16);
+ tie_t = (val << 20) >> 28;
@@ -1264,8 +1275,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_imm16_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 16) | ((insn[0] << 8) >> 16);
return tie_t;
}
@@ -1274,9 +1285,9 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_imm16_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 16) >> 16;
+ insn[0] = (insn[0] & ~0xffff00) | (tie_t << 8);
}
@@ -1285,8 +1296,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_offset_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 18) | ((insn[0] << 8) >> 14);
return tie_t;
}
@@ -1295,9 +1306,9 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_offset_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 14) >> 14;
+ insn[0] = (insn[0] & ~0xffffc0) | (tie_t << 6);
}
@@ -1306,8 +1317,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_r_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
return tie_t;
}
@@ -1316,345 +1327,835 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_r_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
}

static unsigned
-@@ -1099,22 +1013,6 @@ Field_sae4_Slot_inst_set (xtensa_insnbuf insn, uint32
+ Field_sa4_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 20) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_sa4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
+ }
+
+ static unsigned
+ Field_sae4_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 16) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_sae4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
}

static unsigned
-Field_sae4_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+- unsigned tie_t = (insn[0] << 12) & 1;
- return tie_t;
-}
-
-static void
-Field_sae4_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
-}
-
-static unsigned
Field_sae_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1134,41 +1032,6 @@ Field_sae_Slot_inst_set (xtensa_insnbuf insn, uint32 v
+- unsigned tie_t = (insn[0] >> 16) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sae_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+- tie_t = (val >> 4) & 1;
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
}

static unsigned
-Field_sae_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
- return tie_t;
-}
-
-static void
-Field_sae_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
-}
-
-static unsigned
-Field_sae_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 15) >> 27);
+- unsigned tie_t = (insn[0] >> 12) & 0x1f;
- return tie_t;
-}
-
-static void
-Field_sae_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
+- uint32 tie_t = val & 0x1f;
- insn[0] = (insn[0] & ~0x1f000) | (tie_t << 12);
-}
-
-static unsigned
Field_sal_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1188,44 +1051,6 @@ Field_sal_Slot_inst_set (xtensa_insnbuf insn, uint32 v
+- unsigned tie_t = (insn[0] >> 20) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
++ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sal_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+- tie_t = (val >> 4) & 1;
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
}

static unsigned
-Field_sal_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = (insn[0] >> 16) & 1;
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
- return tie_t;
-}
-
-static void
-Field_sal_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
-}
-
-static unsigned
-Field_sal_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
- return tie_t;
-}
-
-static void
-Field_sal_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
-}
-
-static unsigned
Field_sargt_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1245,57 +1070,6 @@ Field_sargt_Slot_inst_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 20) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sargt_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+- tie_t = (val >> 4) & 1;
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
}

static unsigned
-Field_sargt_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 16) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
- return tie_t;
-}
-
-static void
-Field_sargt_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
-}
-
-static unsigned
-Field_sargt_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 19) >> 27);
+- unsigned tie_t = (insn[0] >> 8) & 0x1f;
- return tie_t;
-}
-
-static void
-Field_sargt_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
+- uint32 tie_t = val & 0x1f;
- insn[0] = (insn[0] & ~0x1f00) | (tie_t << 8);
-}
-
-static unsigned
-Field_sargt_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 19) >> 27);
+- unsigned tie_t = (insn[0] >> 8) & 0x1f;
- return tie_t;
-}
-
-static void
-Field_sargt_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
+- uint32 tie_t = val & 0x1f;
- insn[0] = (insn[0] & ~0x1f00) | (tie_t << 8);
-}
-
-static unsigned
Field_sas4_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1331,44 +1105,6 @@ Field_sas_Slot_inst_set (xtensa_insnbuf insn, uint32 v
+- unsigned tie_t = (insn[0] >> 4) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_sas4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_sas_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sas_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+- tie_t = (val >> 4) & 1;
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
}

static unsigned
-Field_sas_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 31) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = insn[0] & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
- return tie_t;
-}
-
-static void
-Field_sas_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x1) | (tie_t << 0);
-}
-
-static unsigned
-Field_sr_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
- return tie_t;
-}
-
-static void
-Field_sr_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
-- tie_t = (val << 24) >> 28;
+- tie_t = (val >> 4) & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
-}
-
-static unsigned
Field_sr_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1407,25 +1143,6 @@ Field_sr_Slot_inst16b_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sr_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+- tie_t = (val >> 4) & 0xf;
++ tie_t = (val << 24) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_sr_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sr_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+- tie_t = (val >> 4) & 0xf;
++ tie_t = (val << 24) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
}

static unsigned
-Field_st_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
- return tie_t;
-}
-
-static void
-Field_st_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-- tie_t = (val << 24) >> 28;
+- tie_t = (val >> 4) & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
-}
-
-static unsigned
Field_st_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1464,38 +1181,6 @@ Field_st_Slot_inst16b_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
++ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_st_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+- tie_t = (val >> 4) & 0xf;
++ tie_t = (val << 24) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
}

static unsigned
--Field_thi3_Slot_inst_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
-- return tie_t;
--}
+ Field_st_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
++ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_st_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+- tie_t = (val >> 4) & 0xf;
++ tie_t = (val << 24) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+ }
+
+ static unsigned
+-Field_thi3_Slot_inst_get (const xtensa_insnbuf insn)
+-{
+- unsigned tie_t = (insn[0] >> 5) & 7;
+- return tie_t;
+-}
-
-static void
-Field_thi3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
-}
-
-static unsigned
-Field_thi3_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 28) >> 29);
+- unsigned tie_t = (insn[0] >> 1) & 7;
- return tie_t;
-}
-
-static void
-Field_thi3_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe) | (tie_t << 1);
-}
-
-static unsigned
Field_imm4_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1579,22 +1264,6 @@ Field_i_Slot_inst16a_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm4_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm4_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_mn_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 3;
+- tie_t = (tie_t << 2) | ((insn[0] >> 4) & 3);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
++ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_mn_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+- tie_t = (val >> 2) & 3;
++ tie_t = (val << 28) >> 30;
+ insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+ }
+
+ static unsigned
+ Field_i_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 7) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_i_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
}

static unsigned
-Field_i_Slot_inst16b_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+- unsigned tie_t = (insn[0] >> 7) & 1;
- return tie_t;
-}
-
-static void
-Field_i_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-}
-
-static unsigned
Field_imm6lo_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1739,22 +1408,6 @@ Field_z_Slot_inst16a_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6lo_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm6lo_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6lo_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm6hi_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6hi_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm6hi_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6hi_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm7lo_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7lo_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm7lo_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7lo_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm7hi_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7hi_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm7hi_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7hi_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_z_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_z_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
}

static unsigned
-Field_z_Slot_inst16b_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+- unsigned tie_t = (insn[0] >> 6) & 1;
- return tie_t;
-}
-
-static void
-Field_z_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
-}
-
-static unsigned
Field_imm6_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1831,38 +1484,6 @@ Field_imm7_Slot_inst16b_set (xtensa_insnbuf insn, uint
+- unsigned tie_t = (insn[0] >> 4) & 3;
+- tie_t = (tie_t << 4) | ((insn[0] >> 12) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+- tie_t = (val >> 4) & 3;
++ tie_t = (val << 26) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm6_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 3;
+- tie_t = (tie_t << 4) | ((insn[0] >> 12) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+- tie_t = (val >> 4) & 3;
++ tie_t = (val << 26) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm7_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 7;
+- tie_t = (tie_t << 4) | ((insn[0] >> 12) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+- tie_t = (val >> 4) & 7;
++ tie_t = (val << 25) >> 29;
+ insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm7_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 7;
+- tie_t = (tie_t << 4) | ((insn[0] >> 12) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+- tie_t = (val >> 4) & 7;
++ tie_t = (val << 25) >> 29;
+ insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
}

static unsigned
-Field_imm7_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 7) | ((insn[0] << 25) >> 25);
+- unsigned tie_t = insn[0] & 0x7f;
- return tie_t;
-}
-
@@ -1662,1470 +2163,1962 @@ Index: bfd/xtensa-modules.c
-Field_imm7_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
-{
- uint32 tie_t;
-- tie_t = (val << 25) >> 25;
+- tie_t = val & 0x7f;
- insn[0] = (insn[0] & ~0x7f) | (tie_t << 0);
-}
-
-static unsigned
-Field_r3_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+- unsigned tie_t = (insn[0] >> 15) & 1;
- return tie_t;
-}
-
-static void
-Field_r3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
-}
-
-static unsigned
Field_rbit2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1879,38 +1500,6 @@ Field_rbit2_Slot_inst_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 14) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 17) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_rbit2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x4000) | (tie_t << 14);
}

static unsigned
-Field_rhi_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+- unsigned tie_t = (insn[0] >> 14) & 3;
- return tie_t;
-}
-
-static void
-Field_rhi_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
-}
-
-static unsigned
-Field_t3_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+- unsigned tie_t = (insn[0] >> 7) & 1;
- return tie_t;
-}
-
-static void
-Field_t3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-}
-
-static unsigned
Field_tbit2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1927,38 +1516,6 @@ Field_tbit2_Slot_inst_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 6) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_tbit2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
}

static unsigned
-Field_tlo_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+- unsigned tie_t = (insn[0] >> 4) & 3;
- return tie_t;
-}
-
-static void
-Field_tlo_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
-}
-
-static unsigned
-Field_w_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 18) >> 30);
+- unsigned tie_t = (insn[0] >> 12) & 3;
- return tie_t;
-}
-
-static void
-Field_w_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x3000) | (tie_t << 12);
-}
-
-static unsigned
Field_y_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -2455,510 +2012,151 @@ Field_xt_wbr18_imm_Slot_inst_set (xtensa_insnbuf insn,
- }
-
- static unsigned
--Field_xt_wbr18_imm_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_0_Slot_inst_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 18) | ((insn[0] << 6) >> 14);
-+ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+- unsigned tie_t = (insn[0] >> 6) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
return tie_t;
}

static void
--Field_xt_wbr18_imm_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ Field_y_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 14) >> 14;
-- insn[0] = (insn[0] & ~0x3ffff00) | (tie_t << 8);
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
-+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+ insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
}

static unsigned
--Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_0_Slot_inst16a_get (const xtensa_insnbuf insn)
+ Field_x_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
-+ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+- unsigned tie_t = (insn[0] >> 14) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 17) >> 31);
return tie_t;
}

static void
--Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ Field_x_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
-- insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
-+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+ insn[0] = (insn[0] & ~0x4000) | (tie_t << 14);
}

static unsigned
--Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_0_Slot_inst16b_get (const xtensa_insnbuf insn)
+ Field_t2_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 5) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_t2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
+ }
+
+ static unsigned
+ Field_t2_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 5) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_t2_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
+ }
+
+ static unsigned
+ Field_t2_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 5) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_t2_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
+ }
+
+ static unsigned
+ Field_s2_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 9) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_s2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+ }
+
+ static unsigned
+ Field_s2_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 9) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_s2_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+ }
+
+ static unsigned
+ Field_s2_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 9) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_s2_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+ }
+
+ static unsigned
+ Field_r2_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 13) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_r2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+ }
+
+ static unsigned
+ Field_r2_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 13) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_r2_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+ }
+
+ static unsigned
+ Field_r2_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 13) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_r2_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+ }
+
+ static unsigned
+ Field_t4_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_t4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+ }
+
+ static unsigned
+ Field_t4_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_t4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+ }
+
+ static unsigned
+ Field_t4_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_t4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+ }
+
+ static unsigned
+ Field_s4_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 10) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_s4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+ }
+
+ static unsigned
+ Field_s4_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 10) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_s4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+ }
+
+ static unsigned
+ Field_s4_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 10) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_s4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+ }
+
+ static unsigned
+ Field_r4_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 14) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_r4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
+ }
+
+ static unsigned
+ Field_r4_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 14) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_r4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
+ }
+
+ static unsigned
+ Field_r4_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 14) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_r4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
+ }
+
+ static unsigned
+ Field_t8_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 7) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_t8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+ }
+
+ static unsigned
+ Field_t8_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 7) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_t8_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+ }
+
+ static unsigned
+ Field_t8_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 7) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_t8_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+ }
+
+ static unsigned
+ Field_s8_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 11) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_s8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+ }
+
+ static unsigned
+ Field_s8_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 11) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_s8_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+ }
+
+ static unsigned
+ Field_s8_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 11) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_s8_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+ }
+
+ static unsigned
+ Field_r8_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 15) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_r8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+ }
+
+ static unsigned
+ Field_r8_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 15) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_r8_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+ }
+
+ static unsigned
+ Field_r8_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 15) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_r8_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+ }
+
+ static unsigned
+ Field_xt_wbr15_imm_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 9) & 0x7fff;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 15) | ((insn[0] << 8) >> 17);
+ return tie_t;
+ }
+
+ static void
+ Field_xt_wbr15_imm_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0x7fff;
++ uint32 tie_t;
++ tie_t = (val << 17) >> 17;
+ insn[0] = (insn[0] & ~0xfffe00) | (tie_t << 9);
+ }
+
+ static unsigned
+ Field_xt_wbr18_imm_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 0x3ffff;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 18) | ((insn[0] << 8) >> 14);
+ return tie_t;
+ }
+
+ static void
+ Field_xt_wbr18_imm_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0x3ffff;
++ uint32 tie_t;
++ tie_t = (val << 14) >> 14;
+ insn[0] = (insn[0] & ~0xffffc0) | (tie_t << 6);
+ }
+
+ static unsigned
+-Field_xt_wbr18_imm_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_0_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+- unsigned tie_t = (insn[0] >> 8) & 0x3ffff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+-Field_xt_wbr18_imm_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 0x3ffff;
+- insn[0] = (insn[0] & ~0x3ffff00) | (tie_t << 8);
+-}
+-
+-static unsigned
+-Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+-{
+- unsigned tie_t = (insn[0] >> 20) & 0xf;
+- return tie_t;
+-}
+-
+-static void
+-Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+-{
+- uint32 tie_t = val & 0xf;
+- insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
+-}
+-
+-static unsigned
+-Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+-{
+- unsigned tie_t = (insn[0] >> 13) & 7;
+- return tie_t;
+-}
+-
+-static void
+-Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+-{
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
-}
-
-static unsigned
-Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+- unsigned tie_t = (insn[0] >> 13) & 7;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
-}
-
-static unsigned
-Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 12) >> 29);
+- unsigned tie_t = (insn[0] >> 17) & 7;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe0000) | (tie_t << 17);
-}
-
-static unsigned
-Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 12) >> 29);
+- unsigned tie_t = (insn[0] >> 17) & 7;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe0000) | (tie_t << 17);
-}
-
-static unsigned
-Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 16) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
-- tie_t = (val << 24) >> 28;
+- tie_t = (val >> 4) & 0xf;
- insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
-}
-
-static unsigned
-Field_op0_s4_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 12) >> 30);
+- unsigned tie_t = (insn[0] >> 18) & 3;
- return tie_t;
-}
-
-static void
-Field_op0_s4_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0xc0000) | (tie_t << 18);
-}
-
-static unsigned
-Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 14) >> 31);
+- unsigned tie_t = (insn[0] >> 17) & 1;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x20000) | (tie_t << 17);
-+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_2_1_Slot_inst_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 14) >> 30);
-+ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 16) & 3;
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_2_1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
- tie_t = (val << 30) >> 30;
+-{
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x30000) | (tie_t << 16);
-+ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld21xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_2_1_Slot_inst16a_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 14) >> 27);
-+ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 13) & 0x1f;
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld21xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_2_1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
+-{
+- uint32 tie_t = val & 0x1f;
- insn[0] = (insn[0] & ~0x3e000) | (tie_t << 13);
-}
-
-static unsigned
-Field_combined3e2c5767_fld22xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld22xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 26) >> 26;
+- uint32 tie_t = val & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 3) | ((insn[0] >> 4) & 7);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
-- tie_t = (val << 23) >> 26;
+- tie_t = (val >> 3) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 3) | ((insn[0] >> 4) & 7);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
-- tie_t = (val << 23) >> 26;
+- tie_t = (val >> 3) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 2) | ((insn[0] << 25) >> 30);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 2) | ((insn[0] >> 5) & 3);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
-- tie_t = (val << 24) >> 26;
+- tie_t = (val >> 2) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-+ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_2_1_Slot_inst16b_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
-+ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 1) | ((insn[0] >> 6) & 1);
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_2_1_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+-{
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
-- tie_t = (val << 25) >> 26;
+- tie_t = (val >> 1) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 2) | ((insn[0] << 22) >> 30);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 2) | ((insn[0] >> 8) & 3);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
-- tie_t = (val << 24) >> 26;
+- tie_t = (val >> 2) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-+ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_3_Slot_inst16a_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 2) | ((insn[0] << 22) >> 30);
-+ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 2) | ((insn[0] >> 8) & 3);
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_3_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+-{
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
-- tie_t = (val << 24) >> 26;
+- tie_t = (val >> 2) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 1) | ((insn[0] << 22) >> 31);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 1) | ((insn[0] >> 9) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x200) | (tie_t << 9);
-- tie_t = (val << 25) >> 26;
+- tie_t = (val >> 1) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_3_Slot_inst16b_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 14) >> 29);
-+ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 15) & 7;
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_3_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+-{
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0x38000) | (tie_t << 15);
-}
-
-static unsigned
-Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+- unsigned tie_t = (insn[0] >> 7) & 1;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_3_1_Slot_inst16a_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-+ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 7) & 1;
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_3_1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+-{
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-}
-
-static unsigned
-Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+- unsigned tie_t = (insn[0] >> 10) & 3;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
-}
-
-static unsigned
-Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 20) >> 27);
-- tie_t = (tie_t << 6) | ((insn[0] << 26) >> 26);
+- unsigned tie_t = (insn[0] >> 7) & 0x1f;
+- tie_t = (tie_t << 6) | (insn[0] & 0x3f);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 26) >> 26;
+- uint32 tie_t = val & 0x3f;
- insn[0] = (insn[0] & ~0x3f) | (tie_t << 0);
-- tie_t = (val << 21) >> 27;
+- tie_t = (val >> 6) & 0x1f;
- insn[0] = (insn[0] & ~0xf80) | (tie_t << 7);
-}
-
-static unsigned
-Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
--}
--
--static unsigned
+- tie_t = (val >> 4) & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+ }
+
+ static unsigned
-Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
-- tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
-- return tie_t;
--}
--
--static void
++Field_dfp_fld_r_0_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 10) & 3;
+- tie_t = (tie_t << 1) | ((insn[0] >> 8) & 1);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+ return tie_t;
+ }
+
+ static void
-Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
++Field_dfp_fld_r_0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
-- tie_t = (val << 29) >> 30;
+- tie_t = (val >> 1) & 3;
- insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
-}
-
-static unsigned
-Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
-- tie_t = (tie_t << 5) | ((insn[0] << 27) >> 27);
+- unsigned tie_t = (insn[0] >> 7) & 1;
+- tie_t = (tie_t << 5) | (insn[0] & 0x1f);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
+- uint32 tie_t = val & 0x1f;
- insn[0] = (insn[0] & ~0x1f) | (tie_t << 0);
-- tie_t = (val << 26) >> 31;
+- tie_t = (val >> 5) & 1;
- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-}
-
-static unsigned
-Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 17) >> 29);
+- unsigned tie_t = (insn[0] >> 12) & 7;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0x7000) | (tie_t << 12);
+-}
+-
+-static unsigned
+-Field_op0_s5_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-{
+- unsigned tie_t = (insn[0] >> 13) & 7;
+- return tie_t;
+-}
+-
+-static void
+-Field_op0_s5_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-{
+- uint32 tie_t = val & 7;
+- insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+-}
+-
+-static unsigned
+-Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-{
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- return tie_t;
+-}
+-
+-static void
+-Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-{
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_0_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 1) | ((insn[0] >> 7) & 1);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
+- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+- tie_t = (val >> 1) & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_2_1_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 1) | ((insn[0] >> 7) & 1);
+- tie_t = (tie_t << 1) | ((insn[0] >> 4) & 1);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_2_1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
+- insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
+- tie_t = (val >> 1) & 1;
+- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+- tie_t = (val >> 2) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
++ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_2_1_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 1) | ((insn[0] >> 7) & 1);
+- tie_t = (tie_t << 1) | ((insn[0] >> 4) & 1);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_2_1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
+- insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
+- tie_t = (val >> 1) & 1;
+- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+- tie_t = (val >> 2) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
++ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_2_1_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 3) | ((insn[0] >> 8) & 7);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_2_1_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
+- insn[0] = (insn[0] & ~0x700) | (tie_t << 8);
+- tie_t = (val >> 3) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
++ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_3_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 3) | ((insn[0] >> 8) & 7);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_3_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
+- insn[0] = (insn[0] & ~0x700) | (tie_t << 8);
+- tie_t = (val >> 3) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
++ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_3_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 2) | ((insn[0] >> 9) & 3);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_3_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
+- insn[0] = (insn[0] & ~0x600) | (tie_t << 9);
+- tie_t = (val >> 2) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
++ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_3_1_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 1) | ((insn[0] >> 10) & 1);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_3_1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
+- insn[0] = (insn[0] & ~0x400) | (tie_t << 10);
+- tie_t = (val >> 1) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
}

static unsigned
--Field_op0_s5_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_dfp_fld_r_3_1_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
- tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
-@@ -2966,7 +2164,7 @@ Field_op0_s5_Slot_xt_flix64_slot2_get (const xtensa_in
+- unsigned tie_t = (insn[0] >> 5) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+ return tie_t;
}

static void
--Field_op0_s5_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_r_3_1_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 29) >> 29;
-@@ -2974,750 +2172,223 @@ Field_op0_s5_Slot_xt_flix64_slot2_set (xtensa_insnbuf
+- uint32 tie_t = val & 3;
+- insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
++ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
}

static unsigned
--Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_0_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+- unsigned tie_t = (insn[0] >> 11) & 1;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+- uint32 tie_t = val & 1;
+- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
}

static unsigned
--Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_0_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
+- tie_t = (tie_t << 2) | ((insn[0] >> 5) & 3);
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-- tie_t = (val << 30) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+- uint32 tie_t = val & 0xf;
+- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+- tie_t = (val >> 4) & 3;
+- insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
+- tie_t = (val >> 6) & 0xf;
+- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
}

static unsigned
--Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_0_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
+- unsigned tie_t = (insn[0] >> 11) & 1;
+- tie_t = (tie_t << 1) | ((insn[0] >> 8) & 1);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
-- tie_t = (val << 30) >> 31;
-- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-- tie_t = (val << 29) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
-+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
+- tie_t = (val >> 1) & 1;
+- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
}

static unsigned
--Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_3_1_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
+- unsigned tie_t = (insn[0] >> 11) & 1;
+- tie_t = (tie_t << 2) | ((insn[0] >> 8) & 3);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}

static void
--Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_3_1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
-- tie_t = (val << 30) >> 31;
-- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-- tie_t = (val << 29) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
--}
--
--static unsigned
--Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 3) | ((insn[0] << 21) >> 29);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
- tie_t = (val << 29) >> 29;
-- insn[0] = (insn[0] & ~0x700) | (tie_t << 8);
-- tie_t = (val << 28) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+- uint32 tie_t = val & 3;
+- insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
+- tie_t = (val >> 2) & 1;
+- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
}

static unsigned
--Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_op0_s6_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_3_1_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 3) | ((insn[0] << 21) >> 29);
+- unsigned tie_t = (insn[0] >> 27) & 0x1f;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}

static void
--Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_op0_s6_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_3_1_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 29) >> 29;
-- insn[0] = (insn[0] & ~0x700) | (tie_t << 8);
-- tie_t = (val << 28) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+- uint32 tie_t = val & 0x1f;
+- insn[0] = (insn[0] & ~0xf8000000) | (tie_t << 27);
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
}

static unsigned
--Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_0_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 2) | ((insn[0] << 21) >> 30);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
-- insn[0] = (insn[0] & ~0x600) | (tie_t << 9);
-- tie_t = (val << 29) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
--}
--
--static unsigned
--Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 21) >> 31);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x400) | (tie_t << 10);
-- tie_t = (val << 30) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+- uint32 tie_t = val & 0xf;
+- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+- tie_t = (val >> 4) & 1;
+- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+- tie_t = (val >> 5) & 7;
+- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
}

static unsigned
--Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_1_0_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 25) >> 30);
+- unsigned tie_t = insn[1] & 7;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 10) >> 30);
return tie_t;
}

static void
--Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_1_0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 30) >> 30;
-- insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
+- uint32 tie_t = val & 7;
+- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x300000) | (tie_t << 20);
}

static unsigned
--Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 9) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+- uint32 tie_t = val & 0xf;
+- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+- tie_t = (val >> 4) & 1;
+- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+- tie_t = (val >> 5) & 7;
+- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x400000) | (tie_t << 22);
}

static unsigned
--Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_bitindex_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
-- tie_t = (tie_t << 2) | ((insn[0] << 25) >> 30);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
-- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 26) >> 30;
-- insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
-- tie_t = (val << 22) >> 28;
-- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
--}
--
--static unsigned
--Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
- tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}

static void
--Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_bitindex_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
-- tie_t = (val << 30) >> 31;
-- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
--}
--
--static unsigned
--Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
-- tie_t = (tie_t << 2) | ((insn[0] << 22) >> 30);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
-- insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
-- tie_t = (val << 29) >> 31;
-- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
--}
--
--static unsigned
--Field_op0_s6_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 0) >> 27);
-- return tie_t;
--}
--
--static void
--Field_op0_s6_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
-- insn[0] = (insn[0] & ~0xf8000000) | (tie_t << 27);
--}
--
--static unsigned
--Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 24) >> 29;
+- tie_t = (val >> 5) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
++ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
}

static unsigned
--Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_bitindex_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}

static void
--Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_bitindex_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
-- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
--}
--
--static unsigned
--Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 24) >> 29;
+- tie_t = (val >> 5) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
++ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
}

static unsigned
--Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_bitindex_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}

static void
--Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_bitindex_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
-- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
- tie_t = (val << 27) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 24) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
++ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
}

static unsigned
--Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_s3to1_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}

static void
--Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_s3to1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
-- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 24) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
}

static unsigned
--Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_s3to1_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}

static void
--Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_s3to1_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
-- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-+ tie_t = (val << 29) >> 29;
-+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
- }
-
--static unsigned
--Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- return tie_t;
--}
--
- static void
--Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
-- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
--}
--
--static unsigned
--Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 27) | ((insn[0] << 5) >> 5);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 27) | (insn[0] & 0x7ffffff);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 5) >> 5;
+ uint32 tie_t;
+- tie_t = val & 0x7ffffff;
- insn[0] = (insn[0] & ~0x7ffffff) | (tie_t << 0);
-- tie_t = (val << 2) >> 29;
+- tie_t = (val >> 27) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
--}
--
++ tie_t = (val << 29) >> 29;
++ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+ }
+
-static unsigned
-Field_op0_xt_flix64_slot0_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
+- unsigned tie_t = (insn[0] >> 20) & 0xf;
- return tie_t;
-}
-
--static void
+ static void
-Field_op0_xt_flix64_slot0_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
-}
-
@@ -3133,7 +4126,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_set (xtensa_insnbuf insn ATTRIBUTE_UNUSED,
uint32 val ATTRIBUTE_UNUSED)
{
-@@ -3796,35 +2467,144 @@ Implicit_Field_brall_get (const xtensa_insnbuf insn AT
+@@ -3400,35 +2467,144 @@ Implicit_Field_brall_get (const xtensa_insnbuf insn AT
return 0;
}

@@ -3290,7 +4283,7 @@ Index: bfd/xtensa-modules.c
/* Constant tables. */

/* constant table ai4c */
-@@ -3890,1697 +2670,3201 @@ static const unsigned CONST_TBL_b4cu_0[] = {
+@@ -3494,1697 +2670,3201 @@ static const unsigned CONST_TBL_b4cu_0[] = {
0
};

@@ -4224,7 +5217,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned soffsetx4_0, offset_0;
- offset_0 = *valp & 0x3ffff;
-- soffsetx4_0 = 0x4 + ((((int) offset_0 << 14) >> 14) << 2);
+- soffsetx4_0 = 0x4 + (((offset_0 ^ 0x20000) - 0x20000) << 2);
- *valp = soffsetx4_0;
+ *valp += 2;
return 0;
@@ -4309,7 +5302,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned simm4_0, mn_0;
- mn_0 = *valp & 0xf;
-- simm4_0 = ((int) mn_0 << 28) >> 28;
+- simm4_0 = (mn_0 ^ 0x8) - 0x8;
- *valp = simm4_0;
+ unsigned simm4_out_0;
+ unsigned simm4_in_0;
@@ -4483,7 +5476,7 @@ Index: bfd/xtensa-modules.c
-{
- unsigned immrx4_0, r_0;
- r_0 = *valp & 0xf;
-- immrx4_0 = (((0xfffffff) << 4) | r_0) << 2;
+- immrx4_0 = (0xfffffff0 | r_0) << 2;
- *valp = immrx4_0;
+ unsigned lsi4x4_out_0;
+ unsigned lsi4x4_in_0;
@@ -4939,7 +5932,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned simm8_0, imm8_0;
- imm8_0 = *valp & 0xff;
-- simm8_0 = ((int) imm8_0 << 24) >> 24;
+- simm8_0 = (imm8_0 ^ 0x80) - 0x80;
- *valp = simm8_0;
+ unsigned simm8_out_0;
+ unsigned simm8_in_0;
@@ -4971,7 +5964,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned simm8x256_0, imm8_0;
- imm8_0 = *valp & 0xff;
-- simm8x256_0 = (((int) imm8_0 << 24) >> 24) << 8;
+- simm8x256_0 = ((imm8_0 ^ 0x80) - 0x80) << 8;
- *valp = simm8x256_0;
+ unsigned simm8x256_out_0;
+ unsigned simm8x256_in_0;
@@ -5003,7 +5996,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned simm12b_0, imm12b_0;
- imm12b_0 = *valp & 0xfff;
-- simm12b_0 = ((int) imm12b_0 << 20) >> 20;
+- simm12b_0 = (imm12b_0 ^ 0x800) - 0x800;
- *valp = simm12b_0;
+ unsigned simm12b_out_0;
+ unsigned simm12b_in_0;
@@ -5099,7 +6092,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned label8_0, imm8_0;
- imm8_0 = *valp & 0xff;
-- label8_0 = 0x4 + (((int) imm8_0 << 24) >> 24);
+- label8_0 = 0x4 + ((imm8_0 ^ 0x80) - 0x80);
- *valp = label8_0;
+ unsigned label8_out_0;
+ unsigned label8_in_0;
@@ -5215,7 +6208,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned label12_0, imm12_0;
- imm12_0 = *valp & 0xfff;
-- label12_0 = 0x4 + (((int) imm12_0 << 20) >> 20);
+- label12_0 = 0x4 + ((imm12_0 ^ 0x800) - 0x800);
- *valp = label12_0;
+ unsigned uimm16x4_out_0;
+ unsigned uimm16x4_in_0;
@@ -5273,7 +6266,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned soffset_0, offset_0;
- offset_0 = *valp & 0x3ffff;
-- soffset_0 = 0x4 + (((int) offset_0 << 14) >> 14);
+- soffset_0 = 0x4 + ((offset_0 ^ 0x20000) - 0x20000);
- *valp = soffset_0;
+ unsigned s_out_0;
+ unsigned s_in_0;
@@ -5320,7 +6313,7 @@ Index: bfd/xtensa-modules.c
-{
- unsigned uimm16x4_0, imm16_0;
- imm16_0 = *valp & 0xffff;
-- uimm16x4_0 = (((0xffff) << 16) | imm16_0) << 2;
+- uimm16x4_0 = (0xffff0000 | imm16_0) << 2;
- *valp = uimm16x4_0;
- return 0;
-}
@@ -5903,7 +6896,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned xt_wbr15_label_0, xt_wbr15_imm_0;
- xt_wbr15_imm_0 = *valp & 0x7fff;
-- xt_wbr15_label_0 = 0x4 + (((int) xt_wbr15_imm_0 << 17) >> 17);
+- xt_wbr15_label_0 = 0x4 + ((xt_wbr15_imm_0 ^ 0x4000) - 0x4000);
- *valp = xt_wbr15_label_0;
+ *valp -= pc;
return 0;
@@ -5943,7 +6936,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned xt_wbr18_label_0, xt_wbr18_imm_0;
- xt_wbr18_imm_0 = *valp & 0x3ffff;
-- xt_wbr18_label_0 = 0x4 + (((int) xt_wbr18_imm_0 << 14) >> 14);
+- xt_wbr18_label_0 = 0x4 + ((xt_wbr18_imm_0 ^ 0x20000) - 0x20000);
- *valp = xt_wbr18_label_0;
+ *valp -= pc;
return 0;
@@ -7403,7 +8396,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_call12_stateArgs[] = {
-@@ -5588,8 +5872,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call12_sta
+@@ -5192,8 +5872,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call12_sta
};

static xtensa_arg_internal Iclass_xt_iclass_call8_args[] = {
@@ -7414,7 +8407,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_call8_stateArgs[] = {
-@@ -5597,8 +5881,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call8_stat
+@@ -5201,8 +5881,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call8_stat
};

static xtensa_arg_internal Iclass_xt_iclass_call4_args[] = {
@@ -7425,7 +8418,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_call4_stateArgs[] = {
-@@ -5606,8 +5890,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call4_stat
+@@ -5210,8 +5890,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call4_stat
};

static xtensa_arg_internal Iclass_xt_iclass_callx12_args[] = {
@@ -7436,7 +8429,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_callx12_stateArgs[] = {
-@@ -5615,8 +5899,8 @@ static xtensa_arg_internal Iclass_xt_iclass_callx12_st
+@@ -5219,8 +5899,8 @@ static xtensa_arg_internal Iclass_xt_iclass_callx12_st
};

static xtensa_arg_internal Iclass_xt_iclass_callx8_args[] = {
@@ -7447,7 +8440,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_callx8_stateArgs[] = {
-@@ -5624,8 +5908,8 @@ static xtensa_arg_internal Iclass_xt_iclass_callx8_sta
+@@ -5228,8 +5908,8 @@ static xtensa_arg_internal Iclass_xt_iclass_callx8_sta
};

static xtensa_arg_internal Iclass_xt_iclass_callx4_args[] = {
@@ -7458,7 +8451,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_callx4_stateArgs[] = {
-@@ -5633,9 +5917,9 @@ static xtensa_arg_internal Iclass_xt_iclass_callx4_sta
+@@ -5237,9 +5917,9 @@ static xtensa_arg_internal Iclass_xt_iclass_callx4_sta
};

static xtensa_arg_internal Iclass_xt_iclass_entry_args[] = {
@@ -7471,7 +8464,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_entry_stateArgs[] = {
-@@ -5647,8 +5931,8 @@ static xtensa_arg_internal Iclass_xt_iclass_entry_stat
+@@ -5251,8 +5931,8 @@ static xtensa_arg_internal Iclass_xt_iclass_entry_stat
};

static xtensa_arg_internal Iclass_xt_iclass_movsp_args[] = {
@@ -7482,7 +8475,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_movsp_stateArgs[] = {
-@@ -5657,162 +5941,138 @@ static xtensa_arg_internal Iclass_xt_iclass_movsp_stat
+@@ -5261,162 +5941,138 @@ static xtensa_arg_internal Iclass_xt_iclass_movsp_stat
};

static xtensa_arg_internal Iclass_xt_iclass_rotw_args[] = {
@@ -7681,7 +8674,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_rur_threadptr_stateArgs[] = {
-@@ -5820,7 +6080,7 @@ static xtensa_arg_internal Iclass_rur_threadptr_stateA
+@@ -5424,7 +6080,7 @@ static xtensa_arg_internal Iclass_rur_threadptr_stateA
};

static xtensa_arg_internal Iclass_wur_threadptr_args[] = {
@@ -7690,7 +8683,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_wur_threadptr_stateArgs[] = {
-@@ -5828,120 +6088,115 @@ static xtensa_arg_internal Iclass_wur_threadptr_stateA
+@@ -5432,120 +6088,115 @@ static xtensa_arg_internal Iclass_wur_threadptr_stateA
};

static xtensa_arg_internal Iclass_xt_iclass_addi_args[] = {
@@ -7863,7 +8856,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_loop_stateArgs[] = {
-@@ -5951,8 +6206,8 @@ static xtensa_arg_internal Iclass_xt_iclass_loop_state
+@@ -5555,8 +6206,8 @@ static xtensa_arg_internal Iclass_xt_iclass_loop_state
};

static xtensa_arg_internal Iclass_xt_iclass_loopz_args[] = {
@@ -7874,7 +8867,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_loopz_stateArgs[] = {
-@@ -5962,45 +6217,51 @@ static xtensa_arg_internal Iclass_xt_iclass_loopz_stat
+@@ -5566,45 +6217,51 @@ static xtensa_arg_internal Iclass_xt_iclass_loopz_stat
};

static xtensa_arg_internal Iclass_xt_iclass_movi_args[] = {
@@ -7944,7 +8937,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_sar_stateArgs[] = {
-@@ -6008,7 +6269,7 @@ static xtensa_arg_internal Iclass_xt_iclass_sar_stateA
+@@ -5612,7 +6269,7 @@ static xtensa_arg_internal Iclass_xt_iclass_sar_stateA
};

static xtensa_arg_internal Iclass_xt_iclass_sari_args[] = {
@@ -7953,7 +8946,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_sari_stateArgs[] = {
-@@ -6016,8 +6277,8 @@ static xtensa_arg_internal Iclass_xt_iclass_sari_state
+@@ -5620,8 +6277,8 @@ static xtensa_arg_internal Iclass_xt_iclass_sari_state
};

static xtensa_arg_internal Iclass_xt_iclass_shifts_args[] = {
@@ -7964,7 +8957,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_shifts_stateArgs[] = {
-@@ -6025,9 +6286,9 @@ static xtensa_arg_internal Iclass_xt_iclass_shifts_sta
+@@ -5629,9 +6286,9 @@ static xtensa_arg_internal Iclass_xt_iclass_shifts_sta
};

static xtensa_arg_internal Iclass_xt_iclass_shiftst_args[] = {
@@ -7977,7 +8970,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_shiftst_stateArgs[] = {
-@@ -6035,8 +6296,8 @@ static xtensa_arg_internal Iclass_xt_iclass_shiftst_st
+@@ -5639,8 +6296,8 @@ static xtensa_arg_internal Iclass_xt_iclass_shiftst_st
};

static xtensa_arg_internal Iclass_xt_iclass_shiftt_args[] = {
@@ -7988,7 +8981,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_shiftt_stateArgs[] = {
-@@ -6044,21 +6305,21 @@ static xtensa_arg_internal Iclass_xt_iclass_shiftt_sta
+@@ -5648,21 +6305,21 @@ static xtensa_arg_internal Iclass_xt_iclass_shiftt_sta
};

static xtensa_arg_internal Iclass_xt_iclass_slli_args[] = {
@@ -8019,7 +9012,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_sync_stateArgs[] = {
-@@ -6066,22 +6327,21 @@ static xtensa_arg_internal Iclass_xt_iclass_sync_state
+@@ -5670,22 +6327,21 @@ static xtensa_arg_internal Iclass_xt_iclass_sync_state
};

static xtensa_arg_internal Iclass_xt_iclass_rsil_args[] = {
@@ -8045,7 +9038,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_lend_stateArgs[] = {
-@@ -6089,7 +6349,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lend_s
+@@ -5693,7 +6349,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lend_s
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lend_args[] = {
@@ -8054,7 +9047,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lend_stateArgs[] = {
-@@ -6097,7 +6357,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lend_s
+@@ -5701,7 +6357,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lend_s
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lend_args[] = {
@@ -8063,7 +9056,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lend_stateArgs[] = {
-@@ -6105,7 +6365,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lend_s
+@@ -5709,7 +6365,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lend_s
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_lcount_args[] = {
@@ -8072,7 +9065,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_lcount_stateArgs[] = {
-@@ -6113,7 +6373,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lcount
+@@ -5717,7 +6373,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lcount
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lcount_args[] = {
@@ -8081,7 +9074,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lcount_stateArgs[] = {
-@@ -6122,7 +6382,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lcount
+@@ -5726,7 +6382,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lcount
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lcount_args[] = {
@@ -8090,7 +9083,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lcount_stateArgs[] = {
-@@ -6131,7 +6391,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lcount
+@@ -5735,7 +6391,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lcount
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_lbeg_args[] = {
@@ -8099,7 +9092,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_lbeg_stateArgs[] = {
-@@ -6139,7 +6399,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lbeg_s
+@@ -5743,7 +6399,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lbeg_s
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lbeg_args[] = {
@@ -8108,7 +9101,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lbeg_stateArgs[] = {
-@@ -6147,7 +6407,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lbeg_s
+@@ -5751,7 +6407,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lbeg_s
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lbeg_args[] = {
@@ -8117,7 +9110,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lbeg_stateArgs[] = {
-@@ -6155,7 +6415,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lbeg_s
+@@ -5759,7 +6415,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lbeg_s
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_sar_args[] = {
@@ -8126,7 +9119,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_sar_stateArgs[] = {
-@@ -6163,7 +6423,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_sar_st
+@@ -5767,7 +6423,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_sar_st
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_sar_args[] = {
@@ -8135,7 +9128,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_sar_stateArgs[] = {
-@@ -6172,953 +6432,798 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_sar_st
+@@ -5776,953 +6432,798 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_sar_st
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_sar_args[] = {
@@ -9227,7 +10220,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_aa_stateArgs[] = {
-@@ -7126,8 +7231,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_aa_s
+@@ -6730,8 +7231,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_aa_s
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_ad_args[] = {
@@ -9238,7 +10231,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_ad_stateArgs[] = {
-@@ -7135,8 +7240,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_ad_s
+@@ -6739,8 +7240,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_ad_s
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_da_args[] = {
@@ -9249,7 +10242,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_da_stateArgs[] = {
-@@ -7144,8 +7249,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_da_s
+@@ -6748,8 +7249,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_da_s
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_dd_args[] = {
@@ -9260,7 +10253,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_dd_stateArgs[] = {
-@@ -7153,8 +7258,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_dd_s
+@@ -6757,8 +7258,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_dd_s
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_aa_args[] = {
@@ -9271,7 +10264,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_aa_stateArgs[] = {
-@@ -7162,8 +7267,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_aa_
+@@ -6766,8 +7267,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_aa_
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_ad_args[] = {
@@ -9282,7 +10275,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_ad_stateArgs[] = {
-@@ -7171,8 +7276,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_ad_
+@@ -6775,8 +7276,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_ad_
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_da_args[] = {
@@ -9293,7 +10286,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_da_stateArgs[] = {
-@@ -7180,8 +7285,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_da_
+@@ -6784,8 +7285,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_da_
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_dd_args[] = {
@@ -9304,7 +10297,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_dd_stateArgs[] = {
-@@ -7189,10 +7294,10 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_dd_
+@@ -6793,10 +7294,10 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_dd_
};

static xtensa_arg_internal Iclass_xt_iclass_mac16al_da_args[] = {
@@ -9319,7 +10312,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16al_da_stateArgs[] = {
-@@ -7200,10 +7305,10 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16al_da
+@@ -6804,10 +7305,10 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16al_da
};

static xtensa_arg_internal Iclass_xt_iclass_mac16al_dd_args[] = {
@@ -9334,7 +10327,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16al_dd_stateArgs[] = {
-@@ -7211,78 +7316,72 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16al_dd
+@@ -6815,78 +7316,72 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16al_dd
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_l_args[] = {
@@ -9440,7 +10433,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_acclo_stateArgs[] = {
-@@ -7290,7 +7389,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_acclo_
+@@ -6894,7 +7389,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_acclo_
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_acclo_args[] = {
@@ -9449,7 +10442,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_acclo_stateArgs[] = {
-@@ -7298,7 +7397,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_acclo_
+@@ -6902,7 +7397,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_acclo_
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_acclo_args[] = {
@@ -9458,7 +10451,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_acclo_stateArgs[] = {
-@@ -7306,7 +7405,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_acclo_
+@@ -6910,7 +7405,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_acclo_
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_acchi_args[] = {
@@ -9467,7 +10460,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_acchi_stateArgs[] = {
-@@ -7314,7 +7413,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_acchi_
+@@ -6918,7 +7413,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_acchi_
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_acchi_args[] = {
@@ -9476,7 +10469,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_acchi_stateArgs[] = {
-@@ -7322,7 +7421,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_acchi_
+@@ -6926,7 +7421,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_acchi_
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_acchi_args[] = {
@@ -9485,7 +10478,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_acchi_stateArgs[] = {
-@@ -7330,16 +7429,15 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_acchi_
+@@ -6934,16 +7429,15 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_acchi_
};

static xtensa_arg_internal Iclass_xt_iclass_rfi_args[] = {
@@ -9504,7 +10497,7 @@ Index: bfd/xtensa-modules.c
{ { STATE_PSINTLEVEL }, 'o' },
{ { STATE_EPC1 }, 'i' },
{ { STATE_EPC2 }, 'i' },
-@@ -7358,80 +7456,66 @@ static xtensa_arg_internal Iclass_xt_iclass_rfi_stateA
+@@ -6962,80 +7456,66 @@ static xtensa_arg_internal Iclass_xt_iclass_rfi_stateA
};

static xtensa_arg_internal Iclass_xt_iclass_wait_args[] = {
@@ -9594,7 +10587,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_break_stateArgs[] = {
-@@ -7440,7 +7524,7 @@ static xtensa_arg_internal Iclass_xt_iclass_break_stat
+@@ -7044,7 +7524,7 @@ static xtensa_arg_internal Iclass_xt_iclass_break_stat
};

static xtensa_arg_internal Iclass_xt_iclass_break_n_args[] = {
@@ -9603,7 +10596,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_break_n_stateArgs[] = {
-@@ -7449,352 +7533,305 @@ static xtensa_arg_internal Iclass_xt_iclass_break_n_st
+@@ -7053,352 +7533,305 @@ static xtensa_arg_internal Iclass_xt_iclass_break_n_st
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_dbreaka0_args[] = {
@@ -10009,7 +11002,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rfdo_stateArgs[] = {
-@@ -7803,7 +7840,6 @@ static xtensa_arg_internal Iclass_xt_iclass_rfdo_state
+@@ -7407,7 +7840,6 @@ static xtensa_arg_internal Iclass_xt_iclass_rfdo_state
{ { STATE_PSWOE }, 'o' },
{ { STATE_PSCALLINC }, 'o' },
{ { STATE_PSOWB }, 'o' },
@@ -10017,7 +11010,7 @@ Index: bfd/xtensa-modules.c
{ { STATE_PSUM }, 'o' },
{ { STATE_PSEXCM }, 'o' },
{ { STATE_PSINTLEVEL }, 'o' },
-@@ -7815,613 +7851,501 @@ static xtensa_arg_internal Iclass_xt_iclass_rfdd_state
+@@ -7419,613 +7851,501 @@ static xtensa_arg_internal Iclass_xt_iclass_rfdd_state
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_mmid_args[] = {
@@ -10861,7 +11854,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_rur_fcr_stateArgs[] = {
-@@ -8437,7 +8361,7 @@ static xtensa_arg_internal Iclass_rur_fcr_stateArgs[]
+@@ -8041,7 +8361,7 @@ static xtensa_arg_internal Iclass_rur_fcr_stateArgs[]
};

static xtensa_arg_internal Iclass_wur_fcr_args[] = {
@@ -10870,7 +11863,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_wur_fcr_stateArgs[] = {
-@@ -8453,7 +8377,7 @@ static xtensa_arg_internal Iclass_wur_fcr_stateArgs[]
+@@ -8057,7 +8377,7 @@ static xtensa_arg_internal Iclass_wur_fcr_stateArgs[]
};

static xtensa_arg_internal Iclass_rur_fsr_args[] = {
@@ -10879,7 +11872,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_rur_fsr_stateArgs[] = {
-@@ -8468,7 +8392,7 @@ static xtensa_arg_internal Iclass_rur_fsr_stateArgs[]
+@@ -8072,7 +8392,7 @@ static xtensa_arg_internal Iclass_rur_fsr_stateArgs[]
};

static xtensa_arg_internal Iclass_wur_fsr_args[] = {
@@ -10888,7 +11881,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_wur_fsr_stateArgs[] = {
-@@ -8482,226 +8406,164 @@ static xtensa_arg_internal Iclass_wur_fsr_stateArgs[]
+@@ -8086,226 +8406,164 @@ static xtensa_arg_internal Iclass_wur_fsr_stateArgs[]
{ { STATE_CPENABLE }, 'i' }
};

@@ -11242,7 +12235,7 @@ Index: bfd/xtensa-modules.c
{ 2, Iclass_xt_iclass_call12_args,
1, Iclass_xt_iclass_call12_stateArgs, 0, 0 },
{ 2, Iclass_xt_iclass_call8_args,
-@@ -8719,27 +8581,27 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8323,27 +8581,27 @@ static xtensa_iclass_internal iclasses[] = {
{ 2, Iclass_xt_iclass_movsp_args,
2, Iclass_xt_iclass_movsp_stateArgs, 0, 0 },
{ 1, Iclass_xt_iclass_rotw_args,
@@ -11281,7 +12274,7 @@ Index: bfd/xtensa-modules.c
{ 3, Iclass_xt_iclass_add_n_args,
0, 0, 0, 0 },
{ 3, Iclass_xt_iclass_addi_n_args,
-@@ -8801,7 +8663,7 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8405,7 +8663,7 @@ static xtensa_iclass_internal iclasses[] = {
{ 3, Iclass_xt_iclass_l32i_args,
0, 0, 0, 0 },
{ 2, Iclass_xt_iclass_l32r_args,
@@ -11290,7 +12283,7 @@ Index: bfd/xtensa-modules.c
{ 3, Iclass_xt_iclass_l8i_args,
0, 0, 0, 0 },
{ 2, Iclass_xt_iclass_loop_args,
-@@ -8818,10 +8680,14 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8422,10 +8680,14 @@ static xtensa_iclass_internal iclasses[] = {
0, 0, 0, 0 },
{ 1, Iclass_xt_iclass_return_args,
0, 0, 0, 0 },
@@ -11305,7 +12298,7 @@ Index: bfd/xtensa-modules.c
{ 3, Iclass_xt_iclass_s8i_args,
0, 0, 0, 0 },
{ 1, Iclass_xt_iclass_sar_args,
-@@ -8849,7 +8715,7 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8453,7 +8715,7 @@ static xtensa_iclass_internal iclasses[] = {
{ 0, 0 /* xt_iclass_sync */,
1, Iclass_xt_iclass_sync_stateArgs, 0, 0 },
{ 2, Iclass_xt_iclass_rsil_args,
@@ -11314,7 +12307,7 @@ Index: bfd/xtensa-modules.c
{ 1, Iclass_xt_iclass_rsr_lend_args,
1, Iclass_xt_iclass_rsr_lend_stateArgs, 0, 0 },
{ 1, Iclass_xt_iclass_wsr_lend_args,
-@@ -8874,192 +8740,206 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8478,192 +8740,206 @@ static xtensa_iclass_internal iclasses[] = {
2, Iclass_xt_iclass_wsr_sar_stateArgs, 0, 0 },
{ 1, Iclass_xt_iclass_xsr_sar_args,
1, Iclass_xt_iclass_xsr_sar_stateArgs, 0, 0 },
@@ -11616,7 +12609,7 @@ Index: bfd/xtensa-modules.c
{ 2, Iclass_xt_iclass_mac16_aa_args,
1, Iclass_xt_iclass_mac16_aa_stateArgs, 0, 0 },
{ 2, Iclass_xt_iclass_mac16_ad_args,
-@@ -9082,8 +8962,6 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8686,8 +8962,6 @@ static xtensa_iclass_internal iclasses[] = {
1, Iclass_xt_iclass_mac16al_dd_stateArgs, 0, 0 },
{ 2, Iclass_xt_iclass_mac16_l_args,
0, 0, 0, 0 },
@@ -11625,7 +12618,7 @@ Index: bfd/xtensa-modules.c
{ 2, Iclass_xt_iclass_rsr_m0_args,
0, 0, 0, 0 },
{ 2, Iclass_xt_iclass_wsr_m0_args,
-@@ -9121,97 +8999,101 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8725,97 +8999,101 @@ static xtensa_iclass_internal iclasses[] = {
{ 1, Iclass_xt_iclass_xsr_acchi_args,
1, Iclass_xt_iclass_xsr_acchi_stateArgs, 0, 0 },
{ 1, Iclass_xt_iclass_rfi_args,
@@ -11770,7 +12763,7 @@ Index: bfd/xtensa-modules.c
{ 3, Iclass_xt_iclass_bbool1_args,
0, 0, 0, 0 },
{ 2, Iclass_xt_iclass_bbool4_args,
-@@ -9229,101 +9111,47 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8833,101 +9111,47 @@ static xtensa_iclass_internal iclasses[] = {
{ 2, Iclass_xt_iclass_XSR_BR_args,
0, 0, 0, 0 },
{ 1, Iclass_xt_iclass_rsr_ccount_args,
@@ -11893,7 +12886,7 @@ Index: bfd/xtensa-modules.c
{ 3, Iclass_xt_iclass_clamp_args,
0, 0, 0, 0 },
{ 3, Iclass_xt_iclass_minmax_args,
-@@ -9337,17 +9165,57 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8941,17 +9165,57 @@ static xtensa_iclass_internal iclasses[] = {
{ 3, Iclass_xt_iclass_s32ri_args,
0, 0, 0, 0 },
{ 3, Iclass_xt_iclass_s32c1i_args,
@@ -11953,7 +12946,7 @@ Index: bfd/xtensa-modules.c
{ 1, Iclass_rur_fcr_args,
9, Iclass_rur_fcr_stateArgs, 0, 0 },
{ 1, Iclass_wur_fcr_args,
-@@ -9356,580 +9224,1023 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8960,580 +9224,1023 @@ static xtensa_iclass_internal iclasses[] = {
8, Iclass_rur_fsr_stateArgs, 0, 0 },
{ 1, Iclass_wur_fsr_args,
8, Iclass_wur_fsr_stateArgs, 0, 0 },
@@ -13196,7 +14189,7 @@ Index: bfd/xtensa-modules.c
Opcode_beqi_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x26;
-@@ -10092,18 +10403,6 @@ Opcode_extui_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -9696,18 +10403,6 @@ Opcode_extui_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -13215,7 +14208,7 @@ Index: bfd/xtensa-modules.c
Opcode_ill_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0;
-@@ -10116,84 +10415,42 @@ Opcode_j_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -9720,84 +10415,42 @@ Opcode_j_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -13300,7 +14293,7 @@ Index: bfd/xtensa-modules.c
Opcode_loop_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x8076;
-@@ -10218,190 +10475,75 @@ Opcode_movi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -9822,190 +10475,75 @@ Opcode_movi_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -13497,7 +14490,7 @@ Index: bfd/xtensa-modules.c
}

static void
-@@ -10411,228 +10553,78 @@ Opcode_s8i_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -10015,228 +10553,78 @@ Opcode_s8i_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -13726,7 +14719,7 @@ Index: bfd/xtensa-modules.c
Opcode_memw_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x20c0;
-@@ -10747,6 +10739,24 @@ Opcode_xsr_sar_Slot_inst_encode (xtensa_insnbuf slotbu
+@@ -10351,6 +10739,24 @@ Opcode_xsr_sar_Slot_inst_encode (xtensa_insnbuf slotbu
}

static void
@@ -13751,7 +14744,7 @@ Index: bfd/xtensa-modules.c
Opcode_rsr_litbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x30500;
-@@ -10765,14 +10775,20 @@ Opcode_xsr_litbase_Slot_inst_encode (xtensa_insnbuf sl
+@@ -10369,14 +10775,20 @@ Opcode_xsr_litbase_Slot_inst_encode (xtensa_insnbuf sl
}

static void
@@ -13774,7 +14767,7 @@ Index: bfd/xtensa-modules.c
slotbuf[0] = 0x3d000;
}

-@@ -11305,6 +11321,36 @@ Opcode_xsr_vecbase_Slot_inst_encode (xtensa_insnbuf sl
+@@ -10909,6 +11321,36 @@ Opcode_xsr_vecbase_Slot_inst_encode (xtensa_insnbuf sl
}

static void
@@ -13811,7 +14804,7 @@ Index: bfd/xtensa-modules.c
Opcode_mul_aa_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x740004;
-@@ -11725,42 +11771,6 @@ Opcode_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -11329,42 +11771,6 @@ Opcode_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -13854,7 +14847,7 @@ Index: bfd/xtensa-modules.c
Opcode_rsr_m0_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x32000;
-@@ -12127,6 +12137,18 @@ Opcode_xsr_ddr_Slot_inst_encode (xtensa_insnbuf slotbu
+@@ -11731,6 +12137,18 @@ Opcode_xsr_ddr_Slot_inst_encode (xtensa_insnbuf slotbu
}

static void
@@ -13873,7 +14866,7 @@ Index: bfd/xtensa-modules.c
Opcode_rfdo_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0xf1e000;
-@@ -12313,228 +12335,6 @@ Opcode_xsr_ccompare2_Slot_inst_encode (xtensa_insnbuf
+@@ -11917,228 +12335,6 @@ Opcode_xsr_ccompare2_Slot_inst_encode (xtensa_insnbuf
}

static void
@@ -14102,7 +15095,7 @@ Index: bfd/xtensa-modules.c
Opcode_idtlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x50c000;
-@@ -12595,24 +12395,6 @@ Opcode_witlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -12199,24 +12395,6 @@ Opcode_witlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -14127,7 +15120,7 @@ Index: bfd/xtensa-modules.c
Opcode_rsr_cpenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x3e000;
-@@ -12637,108 +12419,48 @@ Opcode_clamps_Slot_inst_encode (xtensa_insnbuf slotbuf
+@@ -12241,108 +12419,48 @@ Opcode_clamps_Slot_inst_encode (xtensa_insnbuf slotbuf
}

static void
@@ -14236,7 +15229,7 @@ Index: bfd/xtensa-modules.c
Opcode_l32ai_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0xb002;
-@@ -12775,6291 +12497,5794 @@ Opcode_xsr_scompare1_Slot_inst_encode (xtensa_insnbuf
+@@ -12379,6291 +12497,5794 @@ Opcode_xsr_scompare1_Slot_inst_encode (xtensa_insnbuf
}

static void
@@ -23855,7 +24848,7 @@ Index: bfd/xtensa-modules.c
return 0;
}

-@@ -19070,7 +18295,6 @@ static void
+@@ -18674,7 +18295,6 @@ static void
Slot_x24_Format_inst_0_get (const xtensa_insnbuf insn,
xtensa_insnbuf slotbuf)
{
@@ -23863,7 +24856,7 @@ Index: bfd/xtensa-modules.c
slotbuf[0] = (insn[0] & 0xffffff);
}

-@@ -19085,7 +18309,6 @@ static void
+@@ -18689,7 +18309,6 @@ static void
Slot_x16a_Format_inst16a_0_get (const xtensa_insnbuf insn,
xtensa_insnbuf slotbuf)
{
@@ -23871,7 +24864,7 @@ Index: bfd/xtensa-modules.c
slotbuf[0] = (insn[0] & 0xffff);
}

-@@ -19100,7 +18323,6 @@ static void
+@@ -18704,7 +18323,6 @@ static void
Slot_x16b_Format_inst16b_0_get (const xtensa_insnbuf insn,
xtensa_insnbuf slotbuf)
{
@@ -23879,7 +24872,7 @@ Index: bfd/xtensa-modules.c
slotbuf[0] = (insn[0] & 0xffff);
}

-@@ -19111,86 +18333,6 @@ Slot_x16b_Format_inst16b_0_set (xtensa_insnbuf insn,
+@@ -18715,86 +18333,6 @@ Slot_x16b_Format_inst16b_0_set (xtensa_insnbuf insn,
insn[0] = (insn[0] & ~0xffff) | (slotbuf[0] & 0xffff);
}

@@ -23966,7 +24959,7 @@ Index: bfd/xtensa-modules.c
static xtensa_get_field_fn
Slot_inst_get_field_fns[] = {
Field_t_Slot_inst_get,
-@@ -19248,74 +18390,22 @@ Slot_inst_get_field_fns[] = {
+@@ -18852,74 +18390,22 @@ Slot_inst_get_field_fns[] = {
Field_r8_Slot_inst_get,
Field_xt_wbr15_imm_Slot_inst_get,
Field_xt_wbr18_imm_Slot_inst_get,
@@ -24057,7 +25050,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_ar0_get,
Implicit_Field_ar4_get,
Implicit_Field_ar8_get,
-@@ -19387,74 +18477,22 @@ Slot_inst_set_field_fns[] = {
+@@ -18991,74 +18477,22 @@ Slot_inst_set_field_fns[] = {
Field_r8_Slot_inst_set,
Field_xt_wbr15_imm_Slot_inst_set,
Field_xt_wbr18_imm_Slot_inst_set,
@@ -24148,7 +25141,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_set,
Implicit_Field_set,
Implicit_Field_set,
-@@ -19528,72 +18566,20 @@ Slot_inst16a_get_field_fns[] = {
+@@ -19132,72 +18566,20 @@ Slot_inst16a_get_field_fns[] = {
0,
0,
0,
@@ -24229,7 +25222,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_ar0_get,
Implicit_Field_ar4_get,
Implicit_Field_ar8_get,
-@@ -19667,72 +18653,20 @@ Slot_inst16a_set_field_fns[] = {
+@@ -19271,72 +18653,20 @@ Slot_inst16a_set_field_fns[] = {
0,
0,
0,
@@ -24310,7 +25303,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_set,
Implicit_Field_set,
Implicit_Field_set,
-@@ -19806,72 +18740,20 @@ Slot_inst16b_get_field_fns[] = {
+@@ -19410,72 +18740,20 @@ Slot_inst16b_get_field_fns[] = {
0,
0,
0,
@@ -24391,7 +25384,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_ar0_get,
Implicit_Field_ar4_get,
Implicit_Field_ar8_get,
-@@ -19945,72 +18827,20 @@ Slot_inst16b_set_field_fns[] = {
+@@ -19549,72 +18827,20 @@ Slot_inst16b_set_field_fns[] = {
0,
0,
0,
@@ -24472,7 +25465,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_set,
Implicit_Field_set,
Implicit_Field_set,
-@@ -20025,1118 +18855,6 @@ Slot_inst16b_set_field_fns[] = {
+@@ -19629,1118 +18855,6 @@ Slot_inst16b_set_field_fns[] = {
Implicit_Field_set
};

@@ -25591,7 +26584,7 @@ Index: bfd/xtensa-modules.c
static xtensa_slot_internal slots[] = {
{ "Inst", "x24", 0,
Slot_x24_Format_inst_0_get, Slot_x24_Format_inst_0_set,
-@@ -21149,27 +18867,7 @@ static xtensa_slot_internal slots[] = {
+@@ -20753,27 +18867,7 @@ static xtensa_slot_internal slots[] = {
{ "Inst16b", "x16b", 0,
Slot_x16b_Format_inst16b_0_get, Slot_x16b_Format_inst16b_0_set,
Slot_inst16b_get_field_fns, Slot_inst16b_set_field_fns,
@@ -25620,7 +26613,7 @@ Index: bfd/xtensa-modules.c
};


-@@ -21179,73 +18877,46 @@ static void
+@@ -20783,73 +18877,46 @@ static void
Format_x24_encode (xtensa_insnbuf insn)
{
insn[0] = 0;
@@ -25699,7 +26692,7 @@ Index: bfd/xtensa-modules.c
3,
3,
3,
-@@ -21260,15 +18931,255 @@ static int length_table[16] = {
+@@ -20864,15 +18931,255 @@ static int length_table[16] = {
2,
2,
2,
@@ -25959,7 +26952,7 @@ Index: bfd/xtensa-modules.c
}


-@@ -21276,17 +19187,17 @@ length_decoder (const unsigned char *insn)
+@@ -20880,17 +19187,17 @@ length_decoder (const unsigned char *insn)

xtensa_isa_internal xtensa_modules = {
0 /* little-endian */,
Index: binutils/patches/patch-include_xtensa-config_h
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/binutils/patches/patch-include_xtensa-config_h,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-include_xtensa-config_h
--- binutils/patches/patch-include_xtensa-config_h 11 Mar 2020 14:24:57 -0000 1.1.1.1
+++ binutils/patches/patch-include_xtensa-config_h 1 Nov 2021 16:39:22 -0000
@@ -8,7 +8,7 @@ Index: include/xtensa-config.h
+++ include/xtensa-config.h
@@ -1,5 +1,6 @@
/* Xtensa configuration settings.
-- Copyright (C) 2001-2018 Free Software Foundation, Inc.
+- Copyright (C) 2001-2020 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ Free Software Foundation, Inc.
Contributed by Bob Wilson (bob.wilson@acm.org) at Tensilica.
Index: binutils/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/binutils/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- binutils/pkg/PLIST 11 Mar 2020 14:24:57 -0000 1.1.1.1
+++ binutils/pkg/PLIST 1 Nov 2021 16:39:22 -0000
@@ -1,75 +1,82 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/03/11 14:24:57 tracey Exp $
-@bin bin/xtensa-esp32-elf-addr2line
-@bin bin/xtensa-esp32-elf-ar
-@bin bin/xtensa-esp32-elf-as
-@bin bin/xtensa-esp32-elf-c++filt
-@bin bin/xtensa-esp32-elf-elfedit
-@bin bin/xtensa-esp32-elf-gprof
-@bin bin/xtensa-esp32-elf-ld
-@bin bin/xtensa-esp32-elf-ld.bfd
-@bin bin/xtensa-esp32-elf-nm
-@bin bin/xtensa-esp32-elf-objcopy
-@bin bin/xtensa-esp32-elf-objdump
-@bin bin/xtensa-esp32-elf-ranlib
-@bin bin/xtensa-esp32-elf-readelf
-@bin bin/xtensa-esp32-elf-size
-@bin bin/xtensa-esp32-elf-strings
-@bin bin/xtensa-esp32-elf-strip
-@comment @info info/as.info
-@comment @info info/bfd.info
-@comment @info info/binutils.info
-@comment @info info/gprof.info
-@comment @info info/ld.info
-lib/ldscripts/
-lib/ldscripts/elf32xtensa.x
-lib/ldscripts/elf32xtensa.xbn
-lib/ldscripts/elf32xtensa.xc
-lib/ldscripts/elf32xtensa.xce
-lib/ldscripts/elf32xtensa.xd
-lib/ldscripts/elf32xtensa.xdc
-lib/ldscripts/elf32xtensa.xdce
-lib/ldscripts/elf32xtensa.xde
-lib/ldscripts/elf32xtensa.xdw
-lib/ldscripts/elf32xtensa.xdwe
-lib/ldscripts/elf32xtensa.xe
-lib/ldscripts/elf32xtensa.xn
-lib/ldscripts/elf32xtensa.xr
-lib/ldscripts/elf32xtensa.xs
-lib/ldscripts/elf32xtensa.xsc
-lib/ldscripts/elf32xtensa.xsce
-lib/ldscripts/elf32xtensa.xse
-lib/ldscripts/elf32xtensa.xsw
-lib/ldscripts/elf32xtensa.xswe
-lib/ldscripts/elf32xtensa.xu
-lib/ldscripts/elf32xtensa.xw
-lib/ldscripts/elf32xtensa.xwe
-@man man/man1/xtensa-esp32-elf-addr2line.1
-@man man/man1/xtensa-esp32-elf-ar.1
-@man man/man1/xtensa-esp32-elf-as.1
-@man man/man1/xtensa-esp32-elf-c++filt.1
-@man man/man1/xtensa-esp32-elf-dlltool.1
-@man man/man1/xtensa-esp32-elf-elfedit.1
-@man man/man1/xtensa-esp32-elf-gprof.1
-@man man/man1/xtensa-esp32-elf-ld.1
-@man man/man1/xtensa-esp32-elf-nm.1
-@man man/man1/xtensa-esp32-elf-objcopy.1
-@man man/man1/xtensa-esp32-elf-objdump.1
-@man man/man1/xtensa-esp32-elf-ranlib.1
-@man man/man1/xtensa-esp32-elf-readelf.1
-@man man/man1/xtensa-esp32-elf-size.1
-@man man/man1/xtensa-esp32-elf-strings.1
-@man man/man1/xtensa-esp32-elf-strip.1
-@man man/man1/xtensa-esp32-elf-windmc.1
-@man man/man1/xtensa-esp32-elf-windres.1
+@comment $OpenBSD: PLIST,v$
xtensa-esp32-elf/
xtensa-esp32-elf/bin/
-@bin xtensa-esp32-elf/bin/ar
-@bin xtensa-esp32-elf/bin/as
-@bin xtensa-esp32-elf/bin/ld
-@bin xtensa-esp32-elf/bin/ld.bfd
-@bin xtensa-esp32-elf/bin/nm
-@bin xtensa-esp32-elf/bin/objcopy
-@bin xtensa-esp32-elf/bin/objdump
-@bin xtensa-esp32-elf/bin/ranlib
-@bin xtensa-esp32-elf/bin/readelf
-@bin xtensa-esp32-elf/bin/strip
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-addr2line
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-ar
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-as
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-c++filt
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-elfedit
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-gprof
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-ld
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-ld.bfd
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-nm
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-objcopy
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-objdump
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-ranlib
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-readelf
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-size
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-strings
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-strip
+xtensa-esp32-elf/lib/
+xtensa-esp32-elf/lib/ldscripts/
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.x
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xbn
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xc
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xce
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xd
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xdc
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xdce
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xde
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xdw
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xdwe
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xe
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xn
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xr
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xs
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xsc
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xsce
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xse
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xsw
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xswe
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xu
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xw
+xtensa-esp32-elf/lib/ldscripts/elf32xtensa.xwe
+xtensa-esp32-elf/share/
+@info xtensa-esp32-elf/share/info/
+@info xtensa-esp32-elf/share/info/as.info
+@info xtensa-esp32-elf/share/info/bfd.info
+@info xtensa-esp32-elf/share/info/binutils.info
+@info xtensa-esp32-elf/share/info/gprof.info
+@info xtensa-esp32-elf/share/info/ld.info
+@mandir xtensa-esp32-elf/share/man/
+xtensa-esp32-elf/share/man/man1/
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-addr2line.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-ar.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-as.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-c++filt.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-dlltool.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-elfedit.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gprof.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-ld.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-nm.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-objcopy.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-objdump.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-ranlib.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-readelf.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-size.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-strings.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-strip.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-windmc.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-windres.1
+xtensa-esp32-elf/xtensa-esp32-elf/
+xtensa-esp32-elf/xtensa-esp32-elf/bin/
+@bin xtensa-esp32-elf/xtensa-esp32-elf/bin/ar
+@bin xtensa-esp32-elf/xtensa-esp32-elf/bin/as
+@bin xtensa-esp32-elf/xtensa-esp32-elf/bin/ld
+@bin xtensa-esp32-elf/xtensa-esp32-elf/bin/ld.bfd
+@bin xtensa-esp32-elf/xtensa-esp32-elf/bin/nm
+@bin xtensa-esp32-elf/xtensa-esp32-elf/bin/objcopy
+@bin xtensa-esp32-elf/xtensa-esp32-elf/bin/objdump
+@bin xtensa-esp32-elf/xtensa-esp32-elf/bin/ranlib
+@bin xtensa-esp32-elf/xtensa-esp32-elf/bin/readelf
+@bin xtensa-esp32-elf/xtensa-esp32-elf/bin/strip
Index: gcc/Makefile
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- gcc/Makefile 15 Jan 2021 19:03:58 -0000 1.3
+++ gcc/Makefile 1 Nov 2021 16:39:22 -0000
@@ -3,61 +3,61 @@
COMMENT = gcc for ${CONFIG} cross-development

V = 8.4.0
-VERSION = 8.4.0.2020.3
+VERSION = ${V}.2021.2
PKGNAME = ${CONFIG}-gcc-${VERSION}

+SHARED_LIBS += cc1plugin 0.0 # 0.0
+SHARED_LIBS += cp1plugin 0.0 # 0.0
+SHARED_LIBS += cc1 0.0 # 0.0
+
GH_ACCOUNT = espressif
GH_PROJECT = gcc
-GH_TAGNAME = esp-2020r3
+GH_TAGNAME = esp-2021r2
+
+WANTLIB += ${COMPILER_LIBCXX} c gmp isl m mpc mpfr z

SUBST_VARS += V

-WANTLIB = ${COMPILER_LIBCXX} c gmp m mpc mpfr z
+LIBELF = libelf-0.8.13
+MASTER_SITES0 = https://github.com/earlephilhower/esp-quick-toolchain/raw/master/blobs/
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES += ${LIBELF}${EXTRACT_SUFX}:0

.if ${MACHINE_ARCH} == "powerpc64"
PATCH_LIST = patch-* vecstep-*
.endif

-BUILD_DEPENDS += devel/bison \
- devel/${CONFIG}/binutils \
- devel/${CONFIG}/newlib
+MODULES = lang/python
+
+BUILD_DEPENDS += devel/${CONFIG}/binutils \
+ devel/${CONFIG}/newlib \
+ lang/gawk \
+ textproc/gsed
RUN_DEPENDS = devel/${CONFIG}/binutils \
devel/${CONFIG}/newlib
LIB_DEPENDS = devel/gmp \
+ devel/libmpc \
devel/mpfr \
- devel/libmpc
-
-YACC = bison
+ math/isl

-CONFIGURE_ARGS += --enable-languages=c,c++ \
- --with-headers=${LOCALBASE}/${CONFIG}/include \
- --with-local-prefix=${LOCALBASE}/${CONFIG} \
- --with-gmp=${LOCALBASE} \
- --with-newlib \
- --with-system-zlib \
- --disable-thread \
- --disable-shared \
- --disable-__cxa_atexit \
- --disable-libgomp \
- --disable-libmudflap \
- --disable-libmpx \
- --disable-libssp \
- --disable-libquadmath \
- --disable-libquadmath-support \
- --disable-lto \
- --disable-libstdcxx-verbose \
- --enable-cxx-flags="-fno-rtti -ffunction-sections -mlongcalls -mtext-section-literals" \
+CONFIGURE_ENV += AR_FOR_TARGET="${INSTALLDIR}/bin/${CONFIG}-ar" \
+ RANLIB_FOR_TARGET="${INSTALLDIR}/bin/${CONFIG}-ranlib"
+CONFIGURE_ARGS += --with-as="${INSTALLDIR}/bin/${CONFIG}-as" \
+ --with-ld="${INSTALLDIR}/bin/${CONFIG}-ld" \
+ --with-sysroot="${INSTALLDIR}/${CONFIG}" \
+ --with-gmp="${LOCALBASE}" \
+ --with-isl="${LOCALBASE}" \
--enable-target-optspace \
- --without-long-double-128 \
--enable-gcov-custom-rtio \
--enable-libstdcxx-time=yes

-ALL_TARGET = all-gcc all-target-libgcc all-target-libstdc++-v3
-INSTALL_TARGET = install-gcc install-target-libgcc \
- install-target-libstdc++-v3
+post-extract:
+ mv ${WRKDIR}/${LIBELF} ${WRKSRC}/libelf

post-install:
chown -R ${SHAREOWN}:${SHAREGRP} \
- ${PREFIX}/lib/gcc/${CONFIG}/8.2.0/
+ ${PREFIX}/lib/gcc/${CONFIG}/${V}/
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/${CONFIG}/
+ @cd ${PREFIX}/${CONFIG}/bin && ln -s ${CONFIG}-gcc ${CONFIG}-cc

.include <bsd.port.mk>
Index: gcc/distinfo
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- gcc/distinfo 29 Oct 2020 14:10:51 -0000 1.2
+++ gcc/distinfo 1 Nov 2021 16:39:22 -0000
@@ -1,2 +1,4 @@
-SHA256 (gcc-esp-2020r3.tar.gz) = qdZraISIoiXG6O5po3YR9G0M3M+bj5tCYBKmihK4xHs=
-SIZE (gcc-esp-2020r3.tar.gz) = 102866867
+SHA256 (gcc-esp-2021r2.tar.gz) = lJ1lgKB6lUmO2/DDU36oQNgDVk2HT995EnX17MlksJs=
+SHA256 (libelf-0.8.13.tar.gz) = WRqbTsgcHyBCqXqmBWTgy3nQQcUvqnQWrLOLyVvSx20=
+SIZE (gcc-esp-2021r2.tar.gz) = 102863056
+SIZE (libelf-0.8.13.tar.gz) = 148529
Index: gcc/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- gcc/pkg/PLIST 29 Oct 2020 14:10:51 -0000 1.2
+++ gcc/pkg/PLIST 1 Nov 2021 16:39:23 -0000
@@ -1,1409 +1,1454 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/10/29 14:10:51 tracey Exp $
-@bin bin/xtensa-esp32-elf-c++
-@bin bin/xtensa-esp32-elf-cpp
-@bin bin/xtensa-esp32-elf-g++
-@bin bin/xtensa-esp32-elf-gcc
-@bin bin/xtensa-esp32-elf-gcc-${V}
-@bin bin/xtensa-esp32-elf-gcc-ar
-@bin bin/xtensa-esp32-elf-gcc-nm
-@bin bin/xtensa-esp32-elf-gcc-ranlib
-@bin bin/xtensa-esp32-elf-gcov
-@bin bin/xtensa-esp32-elf-gcov-dump
-@bin bin/xtensa-esp32-elf-gcov-tool
-@comment @info info/cpp.info
-@comment @info info/cppinternals.info
-@comment @info info/gcc.info
-@comment @info info/gccinstall.info
-@comment @info info/gccint.info
-lib/gcc/
-lib/gcc/xtensa-esp32-elf/
-lib/gcc/xtensa-esp32-elf/${V}/
-lib/gcc/xtensa-esp32-elf/${V}/crtbegin.o
-lib/gcc/xtensa-esp32-elf/${V}/crtend.o
-lib/gcc/xtensa-esp32-elf/${V}/crti.o
-lib/gcc/xtensa-esp32-elf/${V}/crtn.o
-lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/
-lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crtbegin.o
-lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crtend.o
-lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crti.o
-lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crtn.o
-@static-lib lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/libgcc.a
-@static-lib lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/libgcov.a
-lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/
-lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crtbegin.o
-lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crtend.o
-lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crti.o
-lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crtn.o
-@static-lib lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/libgcc.a
-@static-lib lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/libgcov.a
-lib/gcc/xtensa-esp32-elf/${V}/include/
-lib/gcc/xtensa-esp32-elf/${V}/include-fixed/
-lib/gcc/xtensa-esp32-elf/${V}/include-fixed/README
-lib/gcc/xtensa-esp32-elf/${V}/include-fixed/limits.h
-lib/gcc/xtensa-esp32-elf/${V}/include-fixed/syslimits.h
-lib/gcc/xtensa-esp32-elf/${V}/include/float.h
-lib/gcc/xtensa-esp32-elf/${V}/include/gcov.h
-lib/gcc/xtensa-esp32-elf/${V}/include/iso646.h
-lib/gcc/xtensa-esp32-elf/${V}/include/stdalign.h
-lib/gcc/xtensa-esp32-elf/${V}/include/stdarg.h
-lib/gcc/xtensa-esp32-elf/${V}/include/stdatomic.h
-lib/gcc/xtensa-esp32-elf/${V}/include/stdbool.h
-lib/gcc/xtensa-esp32-elf/${V}/include/stddef.h
-lib/gcc/xtensa-esp32-elf/${V}/include/stdfix.h
-lib/gcc/xtensa-esp32-elf/${V}/include/stdint-gcc.h
-lib/gcc/xtensa-esp32-elf/${V}/include/stdint.h
-lib/gcc/xtensa-esp32-elf/${V}/include/stdnoreturn.h
-lib/gcc/xtensa-esp32-elf/${V}/include/tgmath.h
-lib/gcc/xtensa-esp32-elf/${V}/include/unwind.h
-lib/gcc/xtensa-esp32-elf/${V}/include/varargs.h
-lib/gcc/xtensa-esp32-elf/${V}/install-tools/
-lib/gcc/xtensa-esp32-elf/${V}/install-tools/fixinc_list
-lib/gcc/xtensa-esp32-elf/${V}/install-tools/gsyslimits.h
-lib/gcc/xtensa-esp32-elf/${V}/install-tools/include/
-lib/gcc/xtensa-esp32-elf/${V}/install-tools/include/README
-lib/gcc/xtensa-esp32-elf/${V}/install-tools/include/limits.h
-lib/gcc/xtensa-esp32-elf/${V}/install-tools/macro_list
-lib/gcc/xtensa-esp32-elf/${V}/install-tools/mkheaders.conf
-@static-lib lib/gcc/xtensa-esp32-elf/${V}/libgcc.a
-@static-lib lib/gcc/xtensa-esp32-elf/${V}/libgcov.a
-lib/gcc/xtensa-esp32-elf/${V}/no-rtti/
-lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crtbegin.o
-lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crtend.o
-lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crti.o
-lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crtn.o
-@static-lib lib/gcc/xtensa-esp32-elf/${V}/no-rtti/libgcc.a
-@static-lib lib/gcc/xtensa-esp32-elf/${V}/no-rtti/libgcov.a
-lib/gcc/xtensa-esp32-elf/${V}/plugin/
-lib/gcc/xtensa-esp32-elf/${V}/plugin/gtype.state
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ada/
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ada/gcc-interface/
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ada/gcc-interface/ada-tree.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/addresses.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/alias.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/all-tree.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/alloc-pool.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ansidecl.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/asan.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/attribs.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/auto-host.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/auto-profile.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/b-header-vars
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/backend.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/basic-block.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/bb-reorder.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/bitmap.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/brig-builtins.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/builtin-attrs.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/builtin-types.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/builtins.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/builtins.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/bversion.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/c-common.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/c-common.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/c-objc.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/c-pragma.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/c-pretty-print.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-tree.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/calls.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ccmp.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfg-flags.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfg.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfganal.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgbuild.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgcleanup.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgexpand.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfghooks.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgloop.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgloopmanip.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgrtl.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cgraph.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/chkp-builtins.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cif-code.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/collect-utils.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/collect2-aix.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/collect2.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/color-macros.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/conditions.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/dbxelf.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/elfos.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/initfini-array.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/newlib-stdint.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/elf.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa-opts.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa-protos.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/configargs.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/context.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/convert.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/coretypes.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/coverage.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/cp-tree.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/cp-tree.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/cxx-pretty-print.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/name-lookup.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/operators.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/type-utils.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cppbuiltin.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cppdefault.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cpplib.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cselib.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/data-streamer.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dbgcnt.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dbgcnt.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dbxout.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dce.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ddg.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/debug.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/defaults.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/df.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dfp.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/diagnostic-color.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/diagnostic-core.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/diagnostic.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/diagnostic.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dojump.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dominance.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/domwalk.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/double-int.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dumpfile.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dwarf2asm.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dwarf2out.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/edit-context.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/emit-rtl.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/errors.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/et-forest.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/except.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/explow.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/expmed.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/expr.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/fibonacci_heap.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/file-find.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/file-prefix-map.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/filenames.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/fixed-value.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/flag-types.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/flags.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/fold-const-call.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/fold-const.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/function.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcc-plugin.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcc-rich-location.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcc-symtab.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcc.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcov-counter.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcov-io.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcse-common.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcse.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/generic-match.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gengtype.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/genrtl.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gensupport.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ggc-internal.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ggc.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-builder.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-expr.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-fold.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-iterator.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-low.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-match.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-predict.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-pretty-print.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-ssa-evrp-analyze.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-ssa-warn-restrict.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-ssa.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-streamer.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-walk.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimplify-me.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimplify.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/glimits.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/graph.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/graphds.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/graphite.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gsstruct.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gstab.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gsyms.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gsyslimits.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gtm-builtins.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gtype-desc.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hard-reg-set.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hash-map-traits.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hash-map.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hash-set.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hash-table.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hash-traits.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hashtab.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/highlev-plugin-common.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hooks.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hosthooks-def.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hosthooks.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hsa-brig-format.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hsa-builtins.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hsa-common.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hw-doloop.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hwint.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ifcvt.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/inchash.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/incpath.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/input.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-addr.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-codes.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-constants.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-flags.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-modes-inline.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-modes.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-notes.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/int-vector-builder.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/internal-fn.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/internal-fn.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/intl.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-chkp.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-fnsummary.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-icf-gimple.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-icf.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-inline.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-param-manipulation.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-predicate.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-prop.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-ref.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-reference.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-utils.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ira-int.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ira.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/is-a.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/langhooks-def.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/langhooks.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lcm.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/libfuncs.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/libiberty.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/limitx.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/limity.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/line-map.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/loop-unroll.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lower-subreg.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lra-int.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lra.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lto-compress.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lto-section-names.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lto-streamer.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/machmode.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/machmode.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/md5.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/mem-stats-traits.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/mem-stats.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/memmodel.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/memory-block.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/mode-classes.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/objc/
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/objc/objc-tree.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/obstack.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-builtins.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-expand.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-general.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-grid.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-low.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-offload.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-simd-clone.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/optabs-libfuncs.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/optabs-query.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/optabs-tree.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/optabs.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/optabs.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/options.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/opts-diagnostic.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/opts.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/output.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params-enum.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params-list.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params-options.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params.list
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/pass-instances.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/pass_manager.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/passes.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/plugin-api.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/plugin-version.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/plugin.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/plugin.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/poly-int-types.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/poly-int.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/predict.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/predict.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/prefix.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/pretty-print.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/print-rtl.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/print-tree.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/profile-count.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/profile.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/read-md.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/read-rtl-function.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/real.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/realmpfr.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/recog.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/reg-notes.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/regcprop.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/regrename.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/regs.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/regset.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/reload.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/resource.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtl-chkp.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtl-error.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtl-iter.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtl.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtl.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtlhash.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtlhooks-def.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtx-vector-builder.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/run-rtl-passes.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/safe-ctype.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sanitizer.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sbitmap.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sched-int.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sel-sched-dump.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sel-sched-ir.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sel-sched.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/selftest-diagnostic.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/selftest-rtl.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/selftest.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sese.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/shrink-wrap.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/signop.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sparseset.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/spellcheck-tree.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/spellcheck.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/splay-tree.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sreal.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ssa-iterators.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ssa.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/stab.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/statistics.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/stmt.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/stor-layout.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/streamer-hooks.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/stringpool.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/substring-locations.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/symbol-summary.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/symtab.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sync-builtins.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/system.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target-def.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target-globals.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target-hooks-macros.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target-insns.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/targhooks.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/timevar.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/timevar.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tm-preds.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tm.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tm_p.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/toplev.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tracer.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/trans-mem.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-affine.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-cfg.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-cfgcleanup.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-check.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-chkp.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-chrec.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-core.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-data-ref.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-dfa.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-diagnostic.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-dump.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-eh.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-hash-traits.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-hasher.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-if-conv.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-inline.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-into-ssa.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-iterator.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-nested.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-object-size.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-outof-ssa.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-parloops.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-pass.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-phinodes.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-pretty-print.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-scalar-evolution.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-address.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-alias.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-ccp.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-coalesce.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-dce.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-dom.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-live.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-loop-ivopts.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-loop-manip.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-loop-niter.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-loop.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-operands.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-propagate.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-sccvn.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-scopedtables.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-strlen.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-ter.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-threadedge.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-threadupdate.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssanames.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-stdarg.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-streamer.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-vector-builder.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-vectorizer.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-vrp.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/treestruct.def
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tsan.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tsystem.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/typeclass.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/typed-splay-tree.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ubsan.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/valtrack.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/value-prof.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/varasm.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vec-perm-indices.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vec.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vector-builder.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/version.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vmsdbg.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vr-values.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vtable-verify.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/wide-int-bitmask.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/wide-int-print.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/wide-int.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/xcoff.h
-lib/gcc/xtensa-esp32-elf/${V}/plugin/include/xcoffout.h
-libexec/gcc/
-libexec/gcc/xtensa-esp32-elf/
-libexec/gcc/xtensa-esp32-elf/${V}/
-@bin libexec/gcc/xtensa-esp32-elf/${V}/cc1
-@bin libexec/gcc/xtensa-esp32-elf/${V}/cc1plus
-@bin libexec/gcc/xtensa-esp32-elf/${V}/collect2
-libexec/gcc/xtensa-esp32-elf/${V}/install-tools/
-libexec/gcc/xtensa-esp32-elf/${V}/install-tools/fixinc.sh
-@bin libexec/gcc/xtensa-esp32-elf/${V}/install-tools/fixincl
-libexec/gcc/xtensa-esp32-elf/${V}/install-tools/mkheaders
-libexec/gcc/xtensa-esp32-elf/${V}/install-tools/mkinstalldirs
-@bin libexec/gcc/xtensa-esp32-elf/${V}/lto-wrapper
-libexec/gcc/xtensa-esp32-elf/${V}/plugin/
-@bin libexec/gcc/xtensa-esp32-elf/${V}/plugin/gengtype
-@comment share/gcc-${V}/python/libstdcxx/__init__.pyc
-@comment share/gcc-${V}/python/libstdcxx/v6/__init__.pyc
-@comment share/gcc-${V}/python/libstdcxx/v6/printers.pyc
-@comment share/gcc-${V}/python/libstdcxx/v6/xmethods.pyc
-@comment @man man/man1/xtensa-esp32-elf-cpp.1
-@comment @man man/man1/xtensa-esp32-elf-g++.1
-@comment @man man/man1/xtensa-esp32-elf-gcc.1
-@comment @man man/man1/xtensa-esp32-elf-gcov-dump.1
-@comment @man man/man1/xtensa-esp32-elf-gcov-tool.1
-@comment @man man/man1/xtensa-esp32-elf-gcov.1
-@comment @man man/man7/fsf-funding.7
-@comment @man man/man7/gfdl.7
-@comment @man man/man7/gpl.7
-@comment share/gcc-${V}/
-@comment share/gcc-${V}/python/
-@comment share/gcc-${V}/python/libstdcxx/
-@comment share/gcc-${V}/python/libstdcxx/__init__.py
-@comment share/gcc-${V}/python/libstdcxx/v6/
-@comment share/gcc-${V}/python/libstdcxx/v6/__init__.py
-@comment share/gcc-${V}/python/libstdcxx/v6/printers.py
-@comment share/gcc-${V}/python/libstdcxx/v6/xmethods.py
-xtensa-esp32-elf/include/c++/
-xtensa-esp32-elf/include/c++/${V}/
-xtensa-esp32-elf/include/c++/${V}/algorithm
-xtensa-esp32-elf/include/c++/${V}/any
-xtensa-esp32-elf/include/c++/${V}/array
-xtensa-esp32-elf/include/c++/${V}/atomic
-xtensa-esp32-elf/include/c++/${V}/backward/
-xtensa-esp32-elf/include/c++/${V}/backward/auto_ptr.h
-xtensa-esp32-elf/include/c++/${V}/backward/backward_warning.h
-xtensa-esp32-elf/include/c++/${V}/backward/binders.h
-xtensa-esp32-elf/include/c++/${V}/backward/hash_fun.h
-xtensa-esp32-elf/include/c++/${V}/backward/hash_map
-xtensa-esp32-elf/include/c++/${V}/backward/hash_set
-xtensa-esp32-elf/include/c++/${V}/backward/hashtable.h
-xtensa-esp32-elf/include/c++/${V}/backward/strstream
-xtensa-esp32-elf/include/c++/${V}/bits/
-xtensa-esp32-elf/include/c++/${V}/bits/algorithmfwd.h
-xtensa-esp32-elf/include/c++/${V}/bits/alloc_traits.h
-xtensa-esp32-elf/include/c++/${V}/bits/allocated_ptr.h
-xtensa-esp32-elf/include/c++/${V}/bits/allocator.h
-xtensa-esp32-elf/include/c++/${V}/bits/atomic_base.h
-xtensa-esp32-elf/include/c++/${V}/bits/atomic_futex.h
-xtensa-esp32-elf/include/c++/${V}/bits/atomic_lockfree_defines.h
-xtensa-esp32-elf/include/c++/${V}/bits/basic_ios.h
-xtensa-esp32-elf/include/c++/${V}/bits/basic_ios.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/basic_string.h
-xtensa-esp32-elf/include/c++/${V}/bits/basic_string.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/boost_concept_check.h
-xtensa-esp32-elf/include/c++/${V}/bits/c++0x_warning.h
-xtensa-esp32-elf/include/c++/${V}/bits/char_traits.h
-xtensa-esp32-elf/include/c++/${V}/bits/codecvt.h
-xtensa-esp32-elf/include/c++/${V}/bits/concept_check.h
-xtensa-esp32-elf/include/c++/${V}/bits/cpp_type_traits.h
-xtensa-esp32-elf/include/c++/${V}/bits/cxxabi_forced.h
-xtensa-esp32-elf/include/c++/${V}/bits/cxxabi_init_exception.h
-xtensa-esp32-elf/include/c++/${V}/bits/deque.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/enable_special_members.h
-xtensa-esp32-elf/include/c++/${V}/bits/exception.h
-xtensa-esp32-elf/include/c++/${V}/bits/exception_defines.h
-xtensa-esp32-elf/include/c++/${V}/bits/exception_ptr.h
-xtensa-esp32-elf/include/c++/${V}/bits/forward_list.h
-xtensa-esp32-elf/include/c++/${V}/bits/forward_list.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/fs_dir.h
-xtensa-esp32-elf/include/c++/${V}/bits/fs_fwd.h
-xtensa-esp32-elf/include/c++/${V}/bits/fs_ops.h
-xtensa-esp32-elf/include/c++/${V}/bits/fs_path.h
-xtensa-esp32-elf/include/c++/${V}/bits/fstream.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/functexcept.h
-xtensa-esp32-elf/include/c++/${V}/bits/functional_hash.h
-xtensa-esp32-elf/include/c++/${V}/bits/gslice.h
-xtensa-esp32-elf/include/c++/${V}/bits/gslice_array.h
-xtensa-esp32-elf/include/c++/${V}/bits/hash_bytes.h
-xtensa-esp32-elf/include/c++/${V}/bits/hashtable.h
-xtensa-esp32-elf/include/c++/${V}/bits/hashtable_policy.h
-xtensa-esp32-elf/include/c++/${V}/bits/indirect_array.h
-xtensa-esp32-elf/include/c++/${V}/bits/invoke.h
-xtensa-esp32-elf/include/c++/${V}/bits/ios_base.h
-xtensa-esp32-elf/include/c++/${V}/bits/istream.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/list.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/locale_classes.h
-xtensa-esp32-elf/include/c++/${V}/bits/locale_classes.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/locale_conv.h
-xtensa-esp32-elf/include/c++/${V}/bits/locale_facets.h
-xtensa-esp32-elf/include/c++/${V}/bits/locale_facets.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/locale_facets_nonio.h
-xtensa-esp32-elf/include/c++/${V}/bits/locale_facets_nonio.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/localefwd.h
-xtensa-esp32-elf/include/c++/${V}/bits/mask_array.h
-xtensa-esp32-elf/include/c++/${V}/bits/memoryfwd.h
-xtensa-esp32-elf/include/c++/${V}/bits/move.h
-xtensa-esp32-elf/include/c++/${V}/bits/nested_exception.h
-xtensa-esp32-elf/include/c++/${V}/bits/node_handle.h
-xtensa-esp32-elf/include/c++/${V}/bits/ostream.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/ostream_insert.h
-xtensa-esp32-elf/include/c++/${V}/bits/parse_numbers.h
-xtensa-esp32-elf/include/c++/${V}/bits/postypes.h
-xtensa-esp32-elf/include/c++/${V}/bits/predefined_ops.h
-xtensa-esp32-elf/include/c++/${V}/bits/ptr_traits.h
-xtensa-esp32-elf/include/c++/${V}/bits/quoted_string.h
-xtensa-esp32-elf/include/c++/${V}/bits/random.h
-xtensa-esp32-elf/include/c++/${V}/bits/random.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/range_access.h
-xtensa-esp32-elf/include/c++/${V}/bits/refwrap.h
-xtensa-esp32-elf/include/c++/${V}/bits/regex.h
-xtensa-esp32-elf/include/c++/${V}/bits/regex.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/regex_automaton.h
-xtensa-esp32-elf/include/c++/${V}/bits/regex_automaton.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/regex_compiler.h
-xtensa-esp32-elf/include/c++/${V}/bits/regex_compiler.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/regex_constants.h
-xtensa-esp32-elf/include/c++/${V}/bits/regex_error.h
-xtensa-esp32-elf/include/c++/${V}/bits/regex_executor.h
-xtensa-esp32-elf/include/c++/${V}/bits/regex_executor.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/regex_scanner.h
-xtensa-esp32-elf/include/c++/${V}/bits/regex_scanner.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/shared_ptr.h
-xtensa-esp32-elf/include/c++/${V}/bits/shared_ptr_atomic.h
-xtensa-esp32-elf/include/c++/${V}/bits/shared_ptr_base.h
-xtensa-esp32-elf/include/c++/${V}/bits/slice_array.h
-xtensa-esp32-elf/include/c++/${V}/bits/specfun.h
-xtensa-esp32-elf/include/c++/${V}/bits/sstream.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/std_abs.h
-xtensa-esp32-elf/include/c++/${V}/bits/std_function.h
-xtensa-esp32-elf/include/c++/${V}/bits/std_mutex.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_algo.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_algobase.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_bvector.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_construct.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_deque.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_function.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_heap.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_iterator.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_iterator_base_funcs.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_iterator_base_types.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_list.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_map.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_multimap.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_multiset.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_numeric.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_pair.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_queue.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_raw_storage_iter.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_relops.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_set.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_stack.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_tempbuf.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_tree.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_uninitialized.h
-xtensa-esp32-elf/include/c++/${V}/bits/stl_vector.h
-xtensa-esp32-elf/include/c++/${V}/bits/stream_iterator.h
-xtensa-esp32-elf/include/c++/${V}/bits/streambuf.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/streambuf_iterator.h
-xtensa-esp32-elf/include/c++/${V}/bits/string_view.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/stringfwd.h
-xtensa-esp32-elf/include/c++/${V}/bits/uniform_int_dist.h
-xtensa-esp32-elf/include/c++/${V}/bits/unique_ptr.h
-xtensa-esp32-elf/include/c++/${V}/bits/unordered_map.h
-xtensa-esp32-elf/include/c++/${V}/bits/unordered_set.h
-xtensa-esp32-elf/include/c++/${V}/bits/uses_allocator.h
-xtensa-esp32-elf/include/c++/${V}/bits/valarray_after.h
-xtensa-esp32-elf/include/c++/${V}/bits/valarray_array.h
-xtensa-esp32-elf/include/c++/${V}/bits/valarray_array.tcc
-xtensa-esp32-elf/include/c++/${V}/bits/valarray_before.h
-xtensa-esp32-elf/include/c++/${V}/bits/vector.tcc
-xtensa-esp32-elf/include/c++/${V}/bitset
-xtensa-esp32-elf/include/c++/${V}/cassert
-xtensa-esp32-elf/include/c++/${V}/ccomplex
-xtensa-esp32-elf/include/c++/${V}/cctype
-xtensa-esp32-elf/include/c++/${V}/cerrno
-xtensa-esp32-elf/include/c++/${V}/cfenv
-xtensa-esp32-elf/include/c++/${V}/cfloat
-xtensa-esp32-elf/include/c++/${V}/charconv
-xtensa-esp32-elf/include/c++/${V}/chrono
-xtensa-esp32-elf/include/c++/${V}/cinttypes
-xtensa-esp32-elf/include/c++/${V}/ciso646
-xtensa-esp32-elf/include/c++/${V}/climits
-xtensa-esp32-elf/include/c++/${V}/clocale
-xtensa-esp32-elf/include/c++/${V}/cmath
-xtensa-esp32-elf/include/c++/${V}/codecvt
-xtensa-esp32-elf/include/c++/${V}/complex
-xtensa-esp32-elf/include/c++/${V}/complex.h
-xtensa-esp32-elf/include/c++/${V}/condition_variable
-xtensa-esp32-elf/include/c++/${V}/csetjmp
-xtensa-esp32-elf/include/c++/${V}/csignal
-xtensa-esp32-elf/include/c++/${V}/cstdalign
-xtensa-esp32-elf/include/c++/${V}/cstdarg
-xtensa-esp32-elf/include/c++/${V}/cstdbool
-xtensa-esp32-elf/include/c++/${V}/cstddef
-xtensa-esp32-elf/include/c++/${V}/cstdint
-xtensa-esp32-elf/include/c++/${V}/cstdio
-xtensa-esp32-elf/include/c++/${V}/cstdlib
-xtensa-esp32-elf/include/c++/${V}/cstring
-xtensa-esp32-elf/include/c++/${V}/ctgmath
-xtensa-esp32-elf/include/c++/${V}/ctime
-xtensa-esp32-elf/include/c++/${V}/cuchar
-xtensa-esp32-elf/include/c++/${V}/cwchar
-xtensa-esp32-elf/include/c++/${V}/cwctype
-xtensa-esp32-elf/include/c++/${V}/cxxabi.h
-xtensa-esp32-elf/include/c++/${V}/debug/
-xtensa-esp32-elf/include/c++/${V}/debug/array
-xtensa-esp32-elf/include/c++/${V}/debug/assertions.h
-xtensa-esp32-elf/include/c++/${V}/debug/bitset
-xtensa-esp32-elf/include/c++/${V}/debug/debug.h
-xtensa-esp32-elf/include/c++/${V}/debug/deque
-xtensa-esp32-elf/include/c++/${V}/debug/formatter.h
-xtensa-esp32-elf/include/c++/${V}/debug/forward_list
-xtensa-esp32-elf/include/c++/${V}/debug/functions.h
-xtensa-esp32-elf/include/c++/${V}/debug/helper_functions.h
-xtensa-esp32-elf/include/c++/${V}/debug/list
-xtensa-esp32-elf/include/c++/${V}/debug/macros.h
-xtensa-esp32-elf/include/c++/${V}/debug/map
-xtensa-esp32-elf/include/c++/${V}/debug/map.h
-xtensa-esp32-elf/include/c++/${V}/debug/multimap.h
-xtensa-esp32-elf/include/c++/${V}/debug/multiset.h
-xtensa-esp32-elf/include/c++/${V}/debug/safe_base.h
-xtensa-esp32-elf/include/c++/${V}/debug/safe_container.h
-xtensa-esp32-elf/include/c++/${V}/debug/safe_iterator.h
-xtensa-esp32-elf/include/c++/${V}/debug/safe_iterator.tcc
-xtensa-esp32-elf/include/c++/${V}/debug/safe_local_iterator.h
-xtensa-esp32-elf/include/c++/${V}/debug/safe_local_iterator.tcc
-xtensa-esp32-elf/include/c++/${V}/debug/safe_sequence.h
-xtensa-esp32-elf/include/c++/${V}/debug/safe_sequence.tcc
-xtensa-esp32-elf/include/c++/${V}/debug/safe_unordered_base.h
-xtensa-esp32-elf/include/c++/${V}/debug/safe_unordered_container.h
-xtensa-esp32-elf/include/c++/${V}/debug/safe_unordered_container.tcc
-xtensa-esp32-elf/include/c++/${V}/debug/set
-xtensa-esp32-elf/include/c++/${V}/debug/set.h
-xtensa-esp32-elf/include/c++/${V}/debug/stl_iterator.h
-xtensa-esp32-elf/include/c++/${V}/debug/string
-xtensa-esp32-elf/include/c++/${V}/debug/unordered_map
-xtensa-esp32-elf/include/c++/${V}/debug/unordered_set
-xtensa-esp32-elf/include/c++/${V}/debug/vector
-xtensa-esp32-elf/include/c++/${V}/decimal/
-xtensa-esp32-elf/include/c++/${V}/decimal/decimal
-xtensa-esp32-elf/include/c++/${V}/decimal/decimal.h
-xtensa-esp32-elf/include/c++/${V}/deque
-xtensa-esp32-elf/include/c++/${V}/exception
-xtensa-esp32-elf/include/c++/${V}/experimental/
-xtensa-esp32-elf/include/c++/${V}/experimental/algorithm
-xtensa-esp32-elf/include/c++/${V}/experimental/any
-xtensa-esp32-elf/include/c++/${V}/experimental/array
-xtensa-esp32-elf/include/c++/${V}/experimental/bits/
-xtensa-esp32-elf/include/c++/${V}/experimental/bits/erase_if.h
-xtensa-esp32-elf/include/c++/${V}/experimental/bits/lfts_config.h
-xtensa-esp32-elf/include/c++/${V}/experimental/bits/shared_ptr.h
-xtensa-esp32-elf/include/c++/${V}/experimental/bits/string_view.tcc
-xtensa-esp32-elf/include/c++/${V}/experimental/chrono
-xtensa-esp32-elf/include/c++/${V}/experimental/deque
-xtensa-esp32-elf/include/c++/${V}/experimental/forward_list
-xtensa-esp32-elf/include/c++/${V}/experimental/functional
-xtensa-esp32-elf/include/c++/${V}/experimental/iterator
-xtensa-esp32-elf/include/c++/${V}/experimental/list
-xtensa-esp32-elf/include/c++/${V}/experimental/map
-xtensa-esp32-elf/include/c++/${V}/experimental/memory
-xtensa-esp32-elf/include/c++/${V}/experimental/memory_resource
-xtensa-esp32-elf/include/c++/${V}/experimental/numeric
-xtensa-esp32-elf/include/c++/${V}/experimental/optional
-xtensa-esp32-elf/include/c++/${V}/experimental/propagate_const
-xtensa-esp32-elf/include/c++/${V}/experimental/random
-xtensa-esp32-elf/include/c++/${V}/experimental/ratio
-xtensa-esp32-elf/include/c++/${V}/experimental/regex
-xtensa-esp32-elf/include/c++/${V}/experimental/set
-xtensa-esp32-elf/include/c++/${V}/experimental/source_location
-xtensa-esp32-elf/include/c++/${V}/experimental/string
-xtensa-esp32-elf/include/c++/${V}/experimental/string_view
-xtensa-esp32-elf/include/c++/${V}/experimental/system_error
-xtensa-esp32-elf/include/c++/${V}/experimental/tuple
-xtensa-esp32-elf/include/c++/${V}/experimental/type_traits
-xtensa-esp32-elf/include/c++/${V}/experimental/unordered_map
-xtensa-esp32-elf/include/c++/${V}/experimental/unordered_set
-xtensa-esp32-elf/include/c++/${V}/experimental/utility
-xtensa-esp32-elf/include/c++/${V}/experimental/vector
-xtensa-esp32-elf/include/c++/${V}/ext/
-xtensa-esp32-elf/include/c++/${V}/ext/algorithm
-xtensa-esp32-elf/include/c++/${V}/ext/aligned_buffer.h
-xtensa-esp32-elf/include/c++/${V}/ext/alloc_traits.h
-xtensa-esp32-elf/include/c++/${V}/ext/array_allocator.h
-xtensa-esp32-elf/include/c++/${V}/ext/atomicity.h
-xtensa-esp32-elf/include/c++/${V}/ext/bitmap_allocator.h
-xtensa-esp32-elf/include/c++/${V}/ext/cast.h
-xtensa-esp32-elf/include/c++/${V}/ext/cmath
-xtensa-esp32-elf/include/c++/${V}/ext/codecvt_specializations.h
-xtensa-esp32-elf/include/c++/${V}/ext/concurrence.h
-xtensa-esp32-elf/include/c++/${V}/ext/debug_allocator.h
-xtensa-esp32-elf/include/c++/${V}/ext/enc_filebuf.h
-xtensa-esp32-elf/include/c++/${V}/ext/extptr_allocator.h
-xtensa-esp32-elf/include/c++/${V}/ext/functional
-xtensa-esp32-elf/include/c++/${V}/ext/hash_map
-xtensa-esp32-elf/include/c++/${V}/ext/hash_set
-xtensa-esp32-elf/include/c++/${V}/ext/iterator
-xtensa-esp32-elf/include/c++/${V}/ext/malloc_allocator.h
-xtensa-esp32-elf/include/c++/${V}/ext/memory
-xtensa-esp32-elf/include/c++/${V}/ext/mt_allocator.h
-xtensa-esp32-elf/include/c++/${V}/ext/new_allocator.h
-xtensa-esp32-elf/include/c++/${V}/ext/numeric
-xtensa-esp32-elf/include/c++/${V}/ext/numeric_traits.h
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/assoc_container.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/traits.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/branch_policy/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/branch_policy/branch_policy.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/branch_policy/null_node_metadata.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/branch_policy/traits.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cond_dealtor.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/container_base_dispatch.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/debug_map_base.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/eq_fn/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_policy/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_policy/lu_counter_metadata.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/traits.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/traits.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/node.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/traits.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/node.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/traits.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/standard_policies.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/tree_policy/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/tree_trace_base.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/sample_trie_access_traits.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/trie_string_access_traits_imp.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/type_utils.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/types_traits.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/unordered_iterator/
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/unordered_iterator/iterator.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/exception.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/hash_policy.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/list_update_policy.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/priority_queue.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/tag_and_trait.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/tree_policy.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/trie_policy.hpp
-xtensa-esp32-elf/include/c++/${V}/ext/pod_char_traits.h
-xtensa-esp32-elf/include/c++/${V}/ext/pointer.h
-xtensa-esp32-elf/include/c++/${V}/ext/pool_allocator.h
-xtensa-esp32-elf/include/c++/${V}/ext/random
-xtensa-esp32-elf/include/c++/${V}/ext/random.tcc
-xtensa-esp32-elf/include/c++/${V}/ext/rb_tree
-xtensa-esp32-elf/include/c++/${V}/ext/rc_string_base.h
-xtensa-esp32-elf/include/c++/${V}/ext/rope
-xtensa-esp32-elf/include/c++/${V}/ext/ropeimpl.h
-xtensa-esp32-elf/include/c++/${V}/ext/slist
-xtensa-esp32-elf/include/c++/${V}/ext/sso_string_base.h
-xtensa-esp32-elf/include/c++/${V}/ext/stdio_filebuf.h
-xtensa-esp32-elf/include/c++/${V}/ext/stdio_sync_filebuf.h
-xtensa-esp32-elf/include/c++/${V}/ext/string_conversions.h
-xtensa-esp32-elf/include/c++/${V}/ext/throw_allocator.h
-xtensa-esp32-elf/include/c++/${V}/ext/type_traits.h
-xtensa-esp32-elf/include/c++/${V}/ext/typelist.h
-xtensa-esp32-elf/include/c++/${V}/ext/vstring.h
-xtensa-esp32-elf/include/c++/${V}/ext/vstring.tcc
-xtensa-esp32-elf/include/c++/${V}/ext/vstring_fwd.h
-xtensa-esp32-elf/include/c++/${V}/ext/vstring_util.h
-xtensa-esp32-elf/include/c++/${V}/fenv.h
-xtensa-esp32-elf/include/c++/${V}/filesystem
-xtensa-esp32-elf/include/c++/${V}/forward_list
-xtensa-esp32-elf/include/c++/${V}/fstream
-xtensa-esp32-elf/include/c++/${V}/functional
-xtensa-esp32-elf/include/c++/${V}/future
-xtensa-esp32-elf/include/c++/${V}/initializer_list
-xtensa-esp32-elf/include/c++/${V}/iomanip
-xtensa-esp32-elf/include/c++/${V}/ios
-xtensa-esp32-elf/include/c++/${V}/iosfwd
-xtensa-esp32-elf/include/c++/${V}/iostream
-xtensa-esp32-elf/include/c++/${V}/istream
-xtensa-esp32-elf/include/c++/${V}/iterator
-xtensa-esp32-elf/include/c++/${V}/limits
-xtensa-esp32-elf/include/c++/${V}/list
-xtensa-esp32-elf/include/c++/${V}/locale
-xtensa-esp32-elf/include/c++/${V}/map
-xtensa-esp32-elf/include/c++/${V}/math.h
-xtensa-esp32-elf/include/c++/${V}/memory
-xtensa-esp32-elf/include/c++/${V}/mutex
-xtensa-esp32-elf/include/c++/${V}/new
-xtensa-esp32-elf/include/c++/${V}/numeric
-xtensa-esp32-elf/include/c++/${V}/optional
-xtensa-esp32-elf/include/c++/${V}/ostream
-xtensa-esp32-elf/include/c++/${V}/parallel/
-xtensa-esp32-elf/include/c++/${V}/parallel/algo.h
-xtensa-esp32-elf/include/c++/${V}/parallel/algobase.h
-xtensa-esp32-elf/include/c++/${V}/parallel/algorithm
-xtensa-esp32-elf/include/c++/${V}/parallel/algorithmfwd.h
-xtensa-esp32-elf/include/c++/${V}/parallel/balanced_quicksort.h
-xtensa-esp32-elf/include/c++/${V}/parallel/base.h
-xtensa-esp32-elf/include/c++/${V}/parallel/basic_iterator.h
-xtensa-esp32-elf/include/c++/${V}/parallel/checkers.h
-xtensa-esp32-elf/include/c++/${V}/parallel/compatibility.h
-xtensa-esp32-elf/include/c++/${V}/parallel/compiletime_settings.h
-xtensa-esp32-elf/include/c++/${V}/parallel/equally_split.h
-xtensa-esp32-elf/include/c++/${V}/parallel/features.h
-xtensa-esp32-elf/include/c++/${V}/parallel/find.h
-xtensa-esp32-elf/include/c++/${V}/parallel/find_selectors.h
-xtensa-esp32-elf/include/c++/${V}/parallel/for_each.h
-xtensa-esp32-elf/include/c++/${V}/parallel/for_each_selectors.h
-xtensa-esp32-elf/include/c++/${V}/parallel/iterator.h
-xtensa-esp32-elf/include/c++/${V}/parallel/list_partition.h
-xtensa-esp32-elf/include/c++/${V}/parallel/losertree.h
-xtensa-esp32-elf/include/c++/${V}/parallel/merge.h
-xtensa-esp32-elf/include/c++/${V}/parallel/multiseq_selection.h
-xtensa-esp32-elf/include/c++/${V}/parallel/multiway_merge.h
-xtensa-esp32-elf/include/c++/${V}/parallel/multiway_mergesort.h
-xtensa-esp32-elf/include/c++/${V}/parallel/numeric
-xtensa-esp32-elf/include/c++/${V}/parallel/numericfwd.h
-xtensa-esp32-elf/include/c++/${V}/parallel/omp_loop.h
-xtensa-esp32-elf/include/c++/${V}/parallel/omp_loop_static.h
-xtensa-esp32-elf/include/c++/${V}/parallel/par_loop.h
-xtensa-esp32-elf/include/c++/${V}/parallel/parallel.h
-xtensa-esp32-elf/include/c++/${V}/parallel/partial_sum.h
-xtensa-esp32-elf/include/c++/${V}/parallel/partition.h
-xtensa-esp32-elf/include/c++/${V}/parallel/queue.h
-xtensa-esp32-elf/include/c++/${V}/parallel/quicksort.h
-xtensa-esp32-elf/include/c++/${V}/parallel/random_number.h
-xtensa-esp32-elf/include/c++/${V}/parallel/random_shuffle.h
-xtensa-esp32-elf/include/c++/${V}/parallel/search.h
-xtensa-esp32-elf/include/c++/${V}/parallel/set_operations.h
-xtensa-esp32-elf/include/c++/${V}/parallel/settings.h
-xtensa-esp32-elf/include/c++/${V}/parallel/sort.h
-xtensa-esp32-elf/include/c++/${V}/parallel/tags.h
-xtensa-esp32-elf/include/c++/${V}/parallel/types.h
-xtensa-esp32-elf/include/c++/${V}/parallel/unique_copy.h
-xtensa-esp32-elf/include/c++/${V}/parallel/workstealing.h
-xtensa-esp32-elf/include/c++/${V}/profile/
-xtensa-esp32-elf/include/c++/${V}/profile/array
-xtensa-esp32-elf/include/c++/${V}/profile/base.h
-xtensa-esp32-elf/include/c++/${V}/profile/bitset
-xtensa-esp32-elf/include/c++/${V}/profile/deque
-xtensa-esp32-elf/include/c++/${V}/profile/forward_list
-xtensa-esp32-elf/include/c++/${V}/profile/impl/
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_algos.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_container_size.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_hash_func.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_hashtable_size.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_list_to_slist.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_list_to_vector.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_map_to_unordered_map.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_node.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_state.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_trace.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_vector_size.h
-xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_vector_to_list.h
-xtensa-esp32-elf/include/c++/${V}/profile/iterator_tracker.h
-xtensa-esp32-elf/include/c++/${V}/profile/list
-xtensa-esp32-elf/include/c++/${V}/profile/map
-xtensa-esp32-elf/include/c++/${V}/profile/map.h
-xtensa-esp32-elf/include/c++/${V}/profile/multimap.h
-xtensa-esp32-elf/include/c++/${V}/profile/multiset.h
-xtensa-esp32-elf/include/c++/${V}/profile/ordered_base.h
-xtensa-esp32-elf/include/c++/${V}/profile/set
-xtensa-esp32-elf/include/c++/${V}/profile/set.h
-xtensa-esp32-elf/include/c++/${V}/profile/unordered_base.h
-xtensa-esp32-elf/include/c++/${V}/profile/unordered_map
-xtensa-esp32-elf/include/c++/${V}/profile/unordered_set
-xtensa-esp32-elf/include/c++/${V}/profile/vector
-xtensa-esp32-elf/include/c++/${V}/queue
-xtensa-esp32-elf/include/c++/${V}/random
-xtensa-esp32-elf/include/c++/${V}/ratio
-xtensa-esp32-elf/include/c++/${V}/regex
-xtensa-esp32-elf/include/c++/${V}/scoped_allocator
-xtensa-esp32-elf/include/c++/${V}/set
-xtensa-esp32-elf/include/c++/${V}/shared_mutex
-xtensa-esp32-elf/include/c++/${V}/sstream
-xtensa-esp32-elf/include/c++/${V}/stack
-xtensa-esp32-elf/include/c++/${V}/stdexcept
-xtensa-esp32-elf/include/c++/${V}/stdlib.h
-xtensa-esp32-elf/include/c++/${V}/streambuf
-xtensa-esp32-elf/include/c++/${V}/string
-xtensa-esp32-elf/include/c++/${V}/string_view
-xtensa-esp32-elf/include/c++/${V}/system_error
-xtensa-esp32-elf/include/c++/${V}/tgmath.h
-xtensa-esp32-elf/include/c++/${V}/thread
-xtensa-esp32-elf/include/c++/${V}/tr1/
-xtensa-esp32-elf/include/c++/${V}/tr1/array
-xtensa-esp32-elf/include/c++/${V}/tr1/bessel_function.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/beta_function.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/ccomplex
-xtensa-esp32-elf/include/c++/${V}/tr1/cctype
-xtensa-esp32-elf/include/c++/${V}/tr1/cfenv
-xtensa-esp32-elf/include/c++/${V}/tr1/cfloat
-xtensa-esp32-elf/include/c++/${V}/tr1/cinttypes
-xtensa-esp32-elf/include/c++/${V}/tr1/climits
-xtensa-esp32-elf/include/c++/${V}/tr1/cmath
-xtensa-esp32-elf/include/c++/${V}/tr1/complex
-xtensa-esp32-elf/include/c++/${V}/tr1/complex.h
-xtensa-esp32-elf/include/c++/${V}/tr1/cstdarg
-xtensa-esp32-elf/include/c++/${V}/tr1/cstdbool
-xtensa-esp32-elf/include/c++/${V}/tr1/cstdint
-xtensa-esp32-elf/include/c++/${V}/tr1/cstdio
-xtensa-esp32-elf/include/c++/${V}/tr1/cstdlib
-xtensa-esp32-elf/include/c++/${V}/tr1/ctgmath
-xtensa-esp32-elf/include/c++/${V}/tr1/ctime
-xtensa-esp32-elf/include/c++/${V}/tr1/ctype.h
-xtensa-esp32-elf/include/c++/${V}/tr1/cwchar
-xtensa-esp32-elf/include/c++/${V}/tr1/cwctype
-xtensa-esp32-elf/include/c++/${V}/tr1/ell_integral.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/exp_integral.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/fenv.h
-xtensa-esp32-elf/include/c++/${V}/tr1/float.h
-xtensa-esp32-elf/include/c++/${V}/tr1/functional
-xtensa-esp32-elf/include/c++/${V}/tr1/functional_hash.h
-xtensa-esp32-elf/include/c++/${V}/tr1/gamma.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/hashtable.h
-xtensa-esp32-elf/include/c++/${V}/tr1/hashtable_policy.h
-xtensa-esp32-elf/include/c++/${V}/tr1/hypergeometric.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/inttypes.h
-xtensa-esp32-elf/include/c++/${V}/tr1/legendre_function.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/limits.h
-xtensa-esp32-elf/include/c++/${V}/tr1/math.h
-xtensa-esp32-elf/include/c++/${V}/tr1/memory
-xtensa-esp32-elf/include/c++/${V}/tr1/modified_bessel_func.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/poly_hermite.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/poly_laguerre.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/random
-xtensa-esp32-elf/include/c++/${V}/tr1/random.h
-xtensa-esp32-elf/include/c++/${V}/tr1/random.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/regex
-xtensa-esp32-elf/include/c++/${V}/tr1/riemann_zeta.tcc
-xtensa-esp32-elf/include/c++/${V}/tr1/shared_ptr.h
-xtensa-esp32-elf/include/c++/${V}/tr1/special_function_util.h
-xtensa-esp32-elf/include/c++/${V}/tr1/stdarg.h
-xtensa-esp32-elf/include/c++/${V}/tr1/stdbool.h
-xtensa-esp32-elf/include/c++/${V}/tr1/stdint.h
-xtensa-esp32-elf/include/c++/${V}/tr1/stdio.h
-xtensa-esp32-elf/include/c++/${V}/tr1/stdlib.h
-xtensa-esp32-elf/include/c++/${V}/tr1/tgmath.h
-xtensa-esp32-elf/include/c++/${V}/tr1/tuple
-xtensa-esp32-elf/include/c++/${V}/tr1/type_traits
-xtensa-esp32-elf/include/c++/${V}/tr1/unordered_map
-xtensa-esp32-elf/include/c++/${V}/tr1/unordered_map.h
-xtensa-esp32-elf/include/c++/${V}/tr1/unordered_set
-xtensa-esp32-elf/include/c++/${V}/tr1/unordered_set.h
-xtensa-esp32-elf/include/c++/${V}/tr1/utility
-xtensa-esp32-elf/include/c++/${V}/tr1/wchar.h
-xtensa-esp32-elf/include/c++/${V}/tr1/wctype.h
-xtensa-esp32-elf/include/c++/${V}/tr2/
-xtensa-esp32-elf/include/c++/${V}/tr2/bool_set
-xtensa-esp32-elf/include/c++/${V}/tr2/bool_set.tcc
-xtensa-esp32-elf/include/c++/${V}/tr2/dynamic_bitset
-xtensa-esp32-elf/include/c++/${V}/tr2/dynamic_bitset.tcc
-xtensa-esp32-elf/include/c++/${V}/tr2/ratio
-xtensa-esp32-elf/include/c++/${V}/tr2/type_traits
-xtensa-esp32-elf/include/c++/${V}/tuple
-xtensa-esp32-elf/include/c++/${V}/type_traits
-xtensa-esp32-elf/include/c++/${V}/typeindex
-xtensa-esp32-elf/include/c++/${V}/typeinfo
-xtensa-esp32-elf/include/c++/${V}/unordered_map
-xtensa-esp32-elf/include/c++/${V}/unordered_set
-xtensa-esp32-elf/include/c++/${V}/utility
-xtensa-esp32-elf/include/c++/${V}/valarray
-xtensa-esp32-elf/include/c++/${V}/variant
-xtensa-esp32-elf/include/c++/${V}/vector
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/atomic_word.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/basic_file.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/c++allocator.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/c++config.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/c++io.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/c++locale.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/cpu_defines.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/ctype_base.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/ctype_inline.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/cxxabi_tweaks.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/error_constants.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/extc++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/gthr-default.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/gthr-posix.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/gthr-single.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/gthr.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/messages_members.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/opt_random.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/os_defines.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/stdc++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/stdtr1c++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/time_members.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/atomic_word.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/basic_file.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/c++allocator.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/c++config.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/c++io.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/c++locale.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/cpu_defines.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/ctype_base.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/ctype_inline.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/cxxabi_tweaks.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/error_constants.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/extc++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/gthr-default.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/gthr-posix.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/gthr-single.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/gthr.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/messages_members.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/opt_random.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/os_defines.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/stdc++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/stdtr1c++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/time_members.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/ext/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/ext/opt_random.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/atomic_word.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/basic_file.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++allocator.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++config.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++io.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++locale.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/cpu_defines.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/ctype_base.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/ctype_inline.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/cxxabi_tweaks.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/error_constants.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/extc++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr-default.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr-posix.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr-single.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/messages_members.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/opt_random.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/os_defines.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/stdc++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/stdtr1c++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/time_members.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/ext/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/ext/opt_random.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/ext/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/ext/opt_random.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/atomic_word.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/basic_file.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/c++allocator.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/c++config.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/c++io.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/c++locale.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/cpu_defines.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/ctype_base.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/ctype_inline.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/cxxabi_tweaks.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/error_constants.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/extc++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/gthr-default.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/gthr-posix.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/gthr-single.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/gthr.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/messages_members.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/opt_random.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/os_defines.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/stdc++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/stdtr1c++.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/time_members.h
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/ext/
-xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/ext/opt_random.h
-@static-lib xtensa-esp32-elf/lib/esp32-psram/libstdc++.a
-@comment xtensa-esp32-elf/lib/esp32-psram/libstdc++.a-gdb.py
-xtensa-esp32-elf/lib/esp32-psram/libstdc++.la
-@static-lib xtensa-esp32-elf/lib/esp32-psram/libsupc++.a
-xtensa-esp32-elf/lib/esp32-psram/libsupc++.la
-@static-lib xtensa-esp32-elf/lib/esp32-psram/no-rtti/libstdc++.a
-@comment xtensa-esp32-elf/lib/esp32-psram/no-rtti/libstdc++.a-gdb.py
-xtensa-esp32-elf/lib/esp32-psram/no-rtti/libstdc++.la
-@static-lib xtensa-esp32-elf/lib/esp32-psram/no-rtti/libsupc++.a
-xtensa-esp32-elf/lib/esp32-psram/no-rtti/libsupc++.la
-@static-lib xtensa-esp32-elf/lib/libstdc++.a
-@comment xtensa-esp32-elf/lib/libstdc++.a-gdb.py
-xtensa-esp32-elf/lib/libstdc++.la
-@static-lib xtensa-esp32-elf/lib/libsupc++.a
-xtensa-esp32-elf/lib/libsupc++.la
-@static-lib xtensa-esp32-elf/lib/no-rtti/libstdc++.a
-@comment xtensa-esp32-elf/lib/no-rtti/libstdc++.a-gdb.py
-xtensa-esp32-elf/lib/no-rtti/libstdc++.la
-@static-lib xtensa-esp32-elf/lib/no-rtti/libsupc++.a
-xtensa-esp32-elf/lib/no-rtti/libsupc++.la
+@comment $OpenBSD: PLIST,v$
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-c++
+xtensa-esp32-elf/bin/xtensa-esp32-elf-cc
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-cpp
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-g++
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc-${V}
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc-ar
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc-nm
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc-ranlib
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-gcov
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-gcov-dump
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-gcov-tool
+xtensa-esp32-elf/include/
+xtensa-esp32-elf/lib/gcc/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/crtbegin.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/crtend.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/crti.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/crtn.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crtbegin.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crtend.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crti.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crtn.o
+@static-lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/libgcc.a
+@static-lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/libgcov.a
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crtbegin.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crtend.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crti.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crtn.o
+@static-lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/libgcc.a
+@static-lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/libgcov.a
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include-fixed/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include-fixed/README
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include-fixed/limits.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include-fixed/syslimits.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/float.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/gcov.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/iso646.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/ssp/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/ssp/ssp.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/ssp/stdio.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/ssp/string.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/ssp/unistd.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/stdalign.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/stdarg.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/stdatomic.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/stdbool.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/stddef.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/stdfix.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/stdint-gcc.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/stdint.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/stdnoreturn.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/tgmath.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/unwind.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/include/varargs.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/install-tools/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/install-tools/fixinc_list
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/install-tools/gsyslimits.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/install-tools/include/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/install-tools/include/README
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/install-tools/include/limits.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/install-tools/macro_list
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/install-tools/mkheaders.conf
+@static-lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/libgcc.a
+@static-lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/libgcov.a
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crtbegin.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crtend.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crti.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crtn.o
+@static-lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/libgcc.a
+@static-lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/libgcov.a
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/gtype.state
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ada/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ada/gcc-interface/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ada/gcc-interface/ada-tree.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/addresses.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/alias.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/all-tree.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/alloc-pool.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ansidecl.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/asan.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/attribs.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/auto-host.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/auto-profile.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/b-header-vars
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/backend.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/basic-block.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/bb-reorder.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/bitmap.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/brig-builtins.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/builtin-attrs.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/builtin-types.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/builtins.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/builtins.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/bversion.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/c-common.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/c-common.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/c-objc.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/c-pragma.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-family/c-pretty-print.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/c-tree.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/calls.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ccmp.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfg-flags.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfg.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfganal.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgbuild.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgcleanup.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgexpand.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfghooks.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgloop.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgloopmanip.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cfgrtl.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cgraph.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/chkp-builtins.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cif-code.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/collect-utils.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/collect2-aix.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/collect2.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/color-macros.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/conditions.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/dbxelf.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/elfos.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/initfini-array.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/newlib-stdint.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/elf.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa-opts.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa-protos.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/configargs.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/context.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/convert.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/coretypes.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/coverage.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/cp-tree.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/cp-tree.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/cxx-pretty-print.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/name-lookup.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/operators.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/type-utils.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cppbuiltin.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cppdefault.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cpplib.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cselib.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/data-streamer.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dbgcnt.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dbgcnt.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dbxout.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dce.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ddg.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/debug.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/defaults.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/df.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dfp.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/diagnostic-color.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/diagnostic-core.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/diagnostic.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/diagnostic.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dojump.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dominance.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/domwalk.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/double-int.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dumpfile.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dwarf2asm.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/dwarf2out.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/edit-context.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/emit-rtl.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/errors.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/et-forest.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/except.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/explow.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/expmed.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/expr.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/fibonacci_heap.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/file-find.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/file-prefix-map.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/filenames.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/fixed-value.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/flag-types.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/flags.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/fold-const-call.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/fold-const.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/function.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcc-plugin.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcc-rich-location.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcc-symtab.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcc.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcov-counter.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcov-io.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcse-common.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gcse.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/generic-match.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gengtype.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/genrtl.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gensupport.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ggc-internal.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ggc.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-builder.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-expr.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-fold.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-iterator.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-low.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-match.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-predict.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-pretty-print.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-ssa-evrp-analyze.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-ssa-warn-restrict.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-ssa.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-streamer.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple-walk.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimple.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimplify-me.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gimplify.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/glimits.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/graph.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/graphds.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/graphite.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gsstruct.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gstab.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gsyms.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gsyslimits.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gtm-builtins.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/gtype-desc.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hard-reg-set.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hash-map-traits.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hash-map.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hash-set.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hash-table.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hash-traits.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hashtab.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/highlev-plugin-common.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hooks.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hosthooks-def.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hosthooks.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hsa-brig-format.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hsa-builtins.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hsa-common.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hw-doloop.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/hwint.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ifcvt.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/inchash.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/incpath.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/input.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-addr.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-codes.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-constants.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-flags.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-modes-inline.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-modes.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/insn-notes.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/int-vector-builder.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/internal-fn.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/internal-fn.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/intl.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-chkp.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-fnsummary.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-icf-gimple.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-icf.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-inline.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-param-manipulation.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-predicate.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-prop.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-ref.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-reference.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ipa-utils.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ira-int.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ira.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/is-a.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/langhooks-def.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/langhooks.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lcm.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/libfuncs.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/libiberty.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/limitx.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/limity.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/line-map.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/loop-unroll.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lower-subreg.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lra-int.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lra.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lto-compress.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lto-section-names.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/lto-streamer.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/machmode.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/machmode.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/md5.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/mem-stats-traits.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/mem-stats.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/memmodel.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/memory-block.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/mode-classes.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/objc/
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/objc/objc-tree.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/obstack.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-builtins.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-expand.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-general.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-grid.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-low.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-offload.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/omp-simd-clone.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/optabs-libfuncs.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/optabs-query.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/optabs-tree.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/optabs.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/optabs.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/options.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/opts-diagnostic.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/opts.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/output.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params-enum.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params-list.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params-options.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/params.list
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/pass-instances.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/pass_manager.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/passes.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/plugin-api.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/plugin-version.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/plugin.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/plugin.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/poly-int-types.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/poly-int.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/predict.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/predict.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/prefix.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/pretty-print.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/print-rtl.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/print-tree.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/profile-count.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/profile.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/read-md.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/read-rtl-function.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/real.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/realmpfr.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/recog.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/reg-notes.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/regcprop.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/regrename.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/regs.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/regset.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/reload.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/resource.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtl-chkp.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtl-error.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtl-iter.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtl.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtl.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtlhash.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtlhooks-def.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/rtx-vector-builder.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/run-rtl-passes.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/safe-ctype.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sanitizer.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sbitmap.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sched-int.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sel-sched-dump.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sel-sched-ir.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sel-sched.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/selftest-diagnostic.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/selftest-rtl.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/selftest.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sese.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/shrink-wrap.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/signop.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sparseset.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/spellcheck-tree.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/spellcheck.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/splay-tree.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sreal.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ssa-iterators.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ssa.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/stab.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/statistics.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/stmt.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/stor-layout.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/streamer-hooks.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/stringpool.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/substring-locations.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/symbol-summary.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/symtab.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/sync-builtins.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/system.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target-def.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target-globals.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target-hooks-macros.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target-insns.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/target.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/targhooks.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/timevar.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/timevar.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tm-preds.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tm.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tm_p.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/toplev.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tracer.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/trans-mem.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-affine.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-cfg.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-cfgcleanup.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-check.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-chkp.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-chrec.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-core.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-data-ref.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-dfa.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-diagnostic.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-dump.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-eh.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-hash-traits.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-hasher.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-if-conv.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-inline.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-into-ssa.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-iterator.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-nested.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-object-size.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-outof-ssa.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-parloops.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-pass.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-phinodes.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-pretty-print.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-scalar-evolution.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-address.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-alias.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-ccp.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-coalesce.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-dce.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-dom.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-live.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-loop-ivopts.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-loop-manip.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-loop-niter.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-loop.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-operands.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-propagate.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-sccvn.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-scopedtables.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-strlen.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-ter.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-threadedge.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa-threadupdate.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssa.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-ssanames.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-stdarg.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-streamer.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-vector-builder.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-vectorizer.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree-vrp.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tree.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/treestruct.def
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tsan.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/tsystem.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/typeclass.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/typed-splay-tree.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/ubsan.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/valtrack.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/value-prof.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/varasm.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vec-perm-indices.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vec.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vector-builder.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/version.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vmsdbg.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vr-values.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/vtable-verify.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/wide-int-bitmask.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/wide-int-print.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/wide-int.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/xcoff.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/xcoffout.h
+@static-lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/libcc1plugin.a
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/libcc1plugin.la
+@lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/libcc1plugin.so.${LIBcc1plugin_VERSION}
+@static-lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/libcp1plugin.a
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/libcp1plugin.la
+@lib xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${V}/plugin/libcp1plugin.so.${LIBcp1plugin_VERSION}
+@static-lib xtensa-esp32-elf/lib/libcc1.a
+xtensa-esp32-elf/lib/libcc1.la
+@lib xtensa-esp32-elf/lib/libcc1.so.${LIBcc1_VERSION}
+xtensa-esp32-elf/libexec/
+xtensa-esp32-elf/libexec/gcc/
+xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/
+xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/
+@bin xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/cc1
+@bin xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/cc1plus
+@bin xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/collect2
+xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/install-tools/
+xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/install-tools/fixinc.sh
+@bin xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/install-tools/fixincl
+xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/install-tools/mkheaders
+xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/install-tools/mkinstalldirs
+@bin xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/lto-wrapper
+xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/plugin/
+@bin xtensa-esp32-elf/libexec/gcc/xtensa-esp32-elf/${V}/plugin/gengtype
+xtensa-esp32-elf/share/gcc-${V}/
+xtensa-esp32-elf/share/gcc-${V}/python/
+xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/
+xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/__init__.py
+${MODPY_COMMENT}xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/${MODPY_PYCACHE}/
+xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/v6/
+xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/v6/__init__.py
+${MODPY_COMMENT}xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/v6/${MODPY_PYCACHE}/
+xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/v6/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/v6/${MODPY_PYCACHE}printers.${MODPY_PYC_MAGIC_TAG}pyc
+xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/v6/${MODPY_PYCACHE}xmethods.${MODPY_PYC_MAGIC_TAG}pyc
+xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/v6/printers.py
+xtensa-esp32-elf/share/gcc-${V}/python/libstdcxx/v6/xmethods.py
+@info xtensa-esp32-elf/share/info/
+@info xtensa-esp32-elf/share/info/cpp.info
+@info xtensa-esp32-elf/share/info/cppinternals.info
+@info xtensa-esp32-elf/share/info/gcc.info
+@info xtensa-esp32-elf/share/info/gccinstall.info
+@info xtensa-esp32-elf/share/info/gccint.info
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-cpp.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-g++.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gcc.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gcov-dump.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gcov-tool.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gcov.1
+xtensa-esp32-elf/share/man/man7/
+@man xtensa-esp32-elf/share/man/man7/fsf-funding.7
+@man xtensa-esp32-elf/share/man/man7/gfdl.7
+@man xtensa-esp32-elf/share/man/man7/gpl.7
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/algorithm
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/any
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/array
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/atomic
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/backward/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/backward/auto_ptr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/backward/backward_warning.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/backward/binders.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/backward/hash_fun.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/backward/hash_map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/backward/hash_set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/backward/hashtable.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/backward/strstream
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/algorithmfwd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/alloc_traits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/allocated_ptr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/atomic_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/atomic_futex.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/atomic_lockfree_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/basic_ios.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/basic_ios.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/basic_string.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/basic_string.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/boost_concept_check.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/c++0x_warning.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/char_traits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/codecvt.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/concept_check.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/cpp_type_traits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/cxxabi_forced.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/cxxabi_init_exception.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/deque.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/enable_special_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/exception.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/exception_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/exception_ptr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/forward_list.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/forward_list.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/fs_dir.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/fs_fwd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/fs_ops.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/fs_path.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/fstream.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/functexcept.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/functional_hash.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/gslice.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/gslice_array.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/hash_bytes.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/hashtable.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/hashtable_policy.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/indirect_array.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/invoke.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/ios_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/istream.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/list.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/locale_classes.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/locale_classes.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/locale_conv.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/locale_facets.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/locale_facets.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/locale_facets_nonio.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/locale_facets_nonio.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/localefwd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/mask_array.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/memoryfwd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/move.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/nested_exception.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/node_handle.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/ostream.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/ostream_insert.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/parse_numbers.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/postypes.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/predefined_ops.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/ptr_traits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/quoted_string.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/random.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/range_access.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/refwrap.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex_automaton.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex_automaton.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex_compiler.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex_compiler.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex_constants.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex_error.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex_executor.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex_executor.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex_scanner.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/regex_scanner.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/shared_ptr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/shared_ptr_atomic.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/shared_ptr_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/slice_array.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/specfun.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/sstream.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/std_abs.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/std_function.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/std_mutex.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_algo.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_algobase.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_bvector.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_construct.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_deque.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_function.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_heap.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_iterator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_iterator_base_funcs.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_iterator_base_types.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_list.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_map.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_multimap.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_multiset.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_numeric.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_pair.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_queue.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_raw_storage_iter.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_relops.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_set.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_stack.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_tempbuf.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_tree.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_uninitialized.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stl_vector.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stream_iterator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/streambuf.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/streambuf_iterator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/string_view.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/stringfwd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/uniform_int_dist.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/unique_ptr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/unordered_map.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/unordered_set.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/uses_allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/valarray_after.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/valarray_array.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/valarray_array.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/valarray_before.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bits/vector.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/bitset
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cassert
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ccomplex
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cctype
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cerrno
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cfenv
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cfloat
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/charconv
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/chrono
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cinttypes
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ciso646
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/climits
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/clocale
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cmath
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/codecvt
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/complex
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/complex.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/condition_variable
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/csetjmp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/csignal
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cstdalign
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cstdarg
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cstdbool
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cstddef
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cstdint
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cstdio
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cstdlib
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cstring
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ctgmath
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ctime
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cuchar
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cwchar
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cwctype
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/cxxabi.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/array
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/assertions.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/bitset
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/debug.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/deque
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/formatter.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/forward_list
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/functions.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/helper_functions.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/list
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/macros.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/map.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/multimap.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/multiset.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_container.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_iterator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_iterator.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_local_iterator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_local_iterator.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_sequence.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_sequence.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_unordered_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_unordered_container.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/safe_unordered_container.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/set.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/stl_iterator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/string
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/unordered_map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/unordered_set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/debug/vector
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/decimal/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/decimal/decimal
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/decimal/decimal.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/deque
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/exception
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/algorithm
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/any
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/array
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/bits/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/bits/erase_if.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/bits/lfts_config.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/bits/shared_ptr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/bits/string_view.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/chrono
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/deque
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/forward_list
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/functional
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/iterator
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/list
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/memory
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/memory_resource
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/numeric
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/optional
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/propagate_const
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/random
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/ratio
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/regex
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/source_location
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/string
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/string_view
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/system_error
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/tuple
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/type_traits
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/unordered_map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/unordered_set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/utility
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/experimental/vector
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/algorithm
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/aligned_buffer.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/alloc_traits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/array_allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/atomicity.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/bitmap_allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/cast.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/cmath
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/codecvt_specializations.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/concurrence.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/debug_allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/enc_filebuf.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/extptr_allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/functional
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/hash_map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/hash_set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/iterator
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/malloc_allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/memory
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/mt_allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/new_allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/numeric
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/numeric_traits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/assoc_container.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/traits.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/branch_policy/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/branch_policy/branch_policy.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/branch_policy/null_node_metadata.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/branch_policy/traits.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/cond_dealtor.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/container_base_dispatch.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/debug_map_base.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/eq_fn/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_policy/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_policy/lu_counter_metadata.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/traits.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/traits.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/node.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/traits.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/node.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/splay_tree_/traits.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/standard_policies.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/tree_policy/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/tree_trace_base.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/sample_trie_access_traits.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/trie_policy/trie_string_access_traits_imp.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/type_utils.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/types_traits.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/unordered_iterator/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/unordered_iterator/iterator.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/exception.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/hash_policy.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/list_update_policy.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/priority_queue.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/tag_and_trait.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/tree_policy.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pb_ds/trie_policy.hpp
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pod_char_traits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pointer.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/pool_allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/random
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/random.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/rb_tree
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/rc_string_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/rope
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/ropeimpl.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/slist
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/sso_string_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/stdio_filebuf.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/stdio_sync_filebuf.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/string_conversions.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/throw_allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/type_traits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/typelist.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/vstring.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/vstring.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/vstring_fwd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ext/vstring_util.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/fenv.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/filesystem
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/forward_list
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/fstream
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/functional
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/future
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/initializer_list
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/iomanip
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ios
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/iosfwd
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/iostream
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/istream
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/iterator
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/limits
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/list
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/locale
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/math.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/memory
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/mutex
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/new
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/numeric
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/optional
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ostream
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/algo.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/algobase.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/algorithm
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/algorithmfwd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/balanced_quicksort.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/basic_iterator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/checkers.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/compatibility.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/compiletime_settings.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/equally_split.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/features.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/find.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/find_selectors.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/for_each.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/for_each_selectors.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/iterator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/list_partition.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/losertree.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/merge.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/multiseq_selection.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/multiway_merge.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/multiway_mergesort.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/numeric
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/numericfwd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/omp_loop.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/omp_loop_static.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/par_loop.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/parallel.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/partial_sum.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/partition.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/queue.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/quicksort.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/random_number.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/random_shuffle.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/search.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/set_operations.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/settings.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/sort.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/tags.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/types.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/unique_copy.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/parallel/workstealing.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/array
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/bitset
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/deque
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/forward_list
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_algos.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_container_size.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_hash_func.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_hashtable_size.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_list_to_slist.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_list_to_vector.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_map_to_unordered_map.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_node.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_state.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_trace.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_vector_size.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/impl/profiler_vector_to_list.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/iterator_tracker.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/list
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/map.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/multimap.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/multiset.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/ordered_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/set.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/unordered_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/unordered_map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/unordered_set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/profile/vector
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/queue
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/random
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/ratio
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/regex
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/scoped_allocator
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/shared_mutex
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/sstream
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/stack
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/stdexcept
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/stdlib.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/streambuf
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/string
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/string_view
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/system_error
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tgmath.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/thread
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/array
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/bessel_function.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/beta_function.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/ccomplex
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cctype
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cfenv
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cfloat
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cinttypes
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/climits
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cmath
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/complex
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/complex.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cstdarg
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cstdbool
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cstdint
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cstdio
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cstdlib
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/ctgmath
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/ctime
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/ctype.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cwchar
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/cwctype
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/ell_integral.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/exp_integral.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/fenv.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/float.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/functional
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/functional_hash.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/gamma.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/hashtable.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/hashtable_policy.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/hypergeometric.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/inttypes.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/legendre_function.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/limits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/math.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/memory
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/modified_bessel_func.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/poly_hermite.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/poly_laguerre.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/random
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/random.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/regex
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/riemann_zeta.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/shared_ptr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/special_function_util.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/stdarg.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/stdbool.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/stdint.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/stdio.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/stdlib.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/tgmath.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/tuple
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/type_traits
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/unordered_map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/unordered_map.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/unordered_set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/unordered_set.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/utility
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/wchar.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr1/wctype.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr2/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr2/bool_set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr2/bool_set.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr2/dynamic_bitset
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr2/dynamic_bitset.tcc
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr2/ratio
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tr2/type_traits
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/tuple
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/type_traits
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/typeindex
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/typeinfo
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/unordered_map
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/unordered_set
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/utility
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/valarray
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/variant
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/vector
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/atomic_word.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/basic_file.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/c++allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/c++config.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/c++io.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/c++locale.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/cpu_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/ctype_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/ctype_inline.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/cxxabi_tweaks.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/error_constants.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/extc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/gthr-default.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/gthr-posix.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/gthr-single.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/gthr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/messages_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/os_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/stdc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/stdtr1c++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/bits/time_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/atomic_word.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/basic_file.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/c++allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/c++config.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/c++io.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/c++locale.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/cpu_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/ctype_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/ctype_inline.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/cxxabi_tweaks.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/error_constants.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/extc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/gthr-default.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/gthr-posix.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/gthr-single.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/gthr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/messages_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/os_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/stdc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/stdtr1c++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/bits/time_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/ext/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/ext/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/atomic_word.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/basic_file.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++config.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++io.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++locale.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/cpu_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/ctype_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/ctype_inline.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/cxxabi_tweaks.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/error_constants.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/extc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr-default.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr-posix.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr-single.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/messages_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/os_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/stdc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/stdtr1c++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/time_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/ext/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/esp32-psram/no-rtti/ext/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/ext/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/ext/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/atomic_word.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/basic_file.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/c++allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/c++config.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/c++io.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/c++locale.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/cpu_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/ctype_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/ctype_inline.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/cxxabi_tweaks.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/error_constants.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/extc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/gthr-default.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/gthr-posix.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/gthr-single.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/gthr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/messages_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/os_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/stdc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/stdtr1c++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/bits/time_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/ext/
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${V}/xtensa-esp32-elf/no-rtti/ext/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/lib/${MODPY_PYCACHE}/
+xtensa-esp32-elf/xtensa-esp32-elf/lib/${MODPY_PYCACHE}libstdc++.a-gdb.${MODPY_PYC_MAGIC_TAG}pyc
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/${MODPY_PYCACHE}/
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/${MODPY_PYCACHE}libstdc++.a-gdb.${MODPY_PYC_MAGIC_TAG}pyc
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libssp.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libssp.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libssp_nonshared.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libssp_nonshared.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libstdc++.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libstdc++.a-gdb.py
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libstdc++.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libsupc++.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libsupc++.la
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/${MODPY_PYCACHE}/
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/${MODPY_PYCACHE}libstdc++.a-gdb.${MODPY_PYC_MAGIC_TAG}pyc
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libssp.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libssp.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libssp_nonshared.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libssp_nonshared.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libstdc++.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libstdc++.a-gdb.py
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libstdc++.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libsupc++.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libsupc++.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/libssp.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/libssp.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/libssp_nonshared.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/libssp_nonshared.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/libstdc++.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/libstdc++.a-gdb.py
+xtensa-esp32-elf/xtensa-esp32-elf/lib/libstdc++.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/libsupc++.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/libsupc++.la
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/${MODPY_PYCACHE}/
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/${MODPY_PYCACHE}libstdc++.a-gdb.${MODPY_PYC_MAGIC_TAG}pyc
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libssp.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libssp.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libssp_nonshared.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libssp_nonshared.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libstdc++.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libstdc++.a-gdb.py
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libstdc++.la
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libsupc++.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libsupc++.la
Index: gcc-bootstrap/Makefile
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc-bootstrap/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- gcc-bootstrap/Makefile 10 Jan 2021 05:20:37 -0000 1.6
+++ gcc-bootstrap/Makefile 1 Nov 2021 16:39:23 -0000
@@ -3,53 +3,40 @@
COMMENT = bootstrap compiler for ${CONFIG} cross-development

V = 8.4.0
-VERSION = 8.4.0.2020.3
+VERSION = ${V}.2021.2
PKGNAME = ${CONFIG}-gcc-bootstrap-${VERSION}

GH_ACCOUNT = espressif
GH_PROJECT = gcc
-GH_TAGNAME = esp-2020r3
+GH_TAGNAME = esp-2021r2

-SUBST_VARS += V
+WANTLIB += ${COMPILER_LIBCXX} c gmp isl m mpc mpfr z

-WANTLIB = ${COMPILER_LIBCXX} c gmp m mpc mpfr
+SUBST_VARS += V

.if ${MACHINE_ARCH} == "powerpc64"
PATCH_LIST = patch-* vecstep-*
.endif

-BUILD_DEPENDS += devel/bison \
- devel/${CONFIG}/binutils
-RUN_DEPENDS = devel/${CONFIG}/binutils
+BUILD_DEPENDS += devel/${CONFIG}/binutils \
+ lang/gawk \
+ textproc/gsed
LIB_DEPENDS = devel/gmp \
devel/mpfr \
- devel/libmpc
-
-YACC = bison
-DEBUG_PACKAGES = ${BUILD_PACKAGES}
-
-CONFIGURE_ARGS += --exec-prefix=${LOCALBASE}/${CONFIG}/bootstrap \
- --with-local-prefix=${LOCALBASE}/${CONFIG} \
- --with-as="${LOCALBASE}/bin/${CONFIG}-as" \
- --with-ld="${LOCALBASE}/bin/${CONFIG}-ld" \
- --with-gmp=${LOCALBASE} \
- --without-headers \
- --with-newlib \
- --disable-threads \
- --disable-shared \
- --disable-__cxa_atexit \
- --disable-libgomp \
- --disable-libmudflap \
- --disable-libmpx \
- --disable-libssp \
- --disable-libquadmath \
- --disable-libquadmath-support \
- --disable-lto \
- --without-long-double-128 \
- --enable-target-optspace \
- --enable-languages=c
+ devel/libmpc \
+ math/isl

-ALL_TARGET = all-gcc all-target-libgcc
-INSTALL_TARGET = install-gcc install-target-libgcc
+CONFIGURE_ARGS += --exec-prefix="${INSTALLDIR}/bootstrap" \
+ --with-as="${INSTALLDIR}/bin/${CONFIG}-as" \
+ --with-ld="${INSTALLDIR}/bin/${CONFIG}-ld" \
+ --with-gmp="${LOCALBASE}" \
+ --with-isl="${LOCALBASE}"
+
+ALL_TARGET = all-gcc
+INSTALL_TARGET = install-gcc
+
+post-install:
+ chown -R ${SHAREOWN}:${SHAREGRP} \
+ ${PREFIX}/${CONFIG}/lib/gcc/${CONFIG}/${VERSION}/

.include <bsd.port.mk>
Index: gcc-bootstrap/distinfo
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc-bootstrap/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- gcc-bootstrap/distinfo 29 Oct 2020 14:10:52 -0000 1.2
+++ gcc-bootstrap/distinfo 1 Nov 2021 16:39:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (gcc-esp-2020r3.tar.gz) = qdZraISIoiXG6O5po3YR9G0M3M+bj5tCYBKmihK4xHs=
-SIZE (gcc-esp-2020r3.tar.gz) = 102866867
+SHA256 (gcc-esp-2021r2.tar.gz) = lJ1lgKB6lUmO2/DDU36oQNgDVk2HT995EnX17MlksJs=
+SIZE (gcc-esp-2021r2.tar.gz) = 102863056
Index: gcc-bootstrap/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc-bootstrap/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- gcc-bootstrap/pkg/PLIST 29 Oct 2020 14:10:52 -0000 1.2
+++ gcc-bootstrap/pkg/PLIST 1 Nov 2021 16:39:23 -0000
@@ -1,20 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/10/29 14:10:52 tracey Exp $
-@comment @info info/cpp.info
-@comment @info info/cppinternals.info
-@comment @info info/gcc.info
-@comment @info info/gccinstall.info
-@comment @info info/gccint.info
-@comment @man man/man1/xtensa-esp32-elf-cpp.1
-@comment @man man/man1/xtensa-esp32-elf-gcc.1
-@comment @man man/man1/xtensa-esp32-elf-gcov-dump.1
-@comment @man man/man1/xtensa-esp32-elf-gcov-tool.1
-@comment @man man/man1/xtensa-esp32-elf-gcov.1
-@comment @man man/man7/fsf-funding.7
-@comment @man man/man7/gfdl.7
-@comment @man man/man7/gpl.7
+@comment $OpenBSD: PLIST,v$
+xtensa-esp32-elf/
xtensa-esp32-elf/bootstrap/
xtensa-esp32-elf/bootstrap/bin/
+@bin xtensa-esp32-elf/bootstrap/bin/xtensa-esp32-elf-c++
@bin xtensa-esp32-elf/bootstrap/bin/xtensa-esp32-elf-cpp
+@bin xtensa-esp32-elf/bootstrap/bin/xtensa-esp32-elf-g++
@bin xtensa-esp32-elf/bootstrap/bin/xtensa-esp32-elf-gcc
@bin xtensa-esp32-elf/bootstrap/bin/xtensa-esp32-elf-gcc-${V}
@bin xtensa-esp32-elf/bootstrap/bin/xtensa-esp32-elf-gcc-ar
@@ -27,31 +17,12 @@ xtensa-esp32-elf/bootstrap/lib/
xtensa-esp32-elf/bootstrap/lib/gcc/
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/crtbegin.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/crtend.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/crti.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/crtn.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crtbegin.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crtend.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crti.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/crtn.o
-@static-lib xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/libgcc.a
-@static-lib xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/libgcov.a
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crtbegin.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crtend.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crti.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/crtn.o
-@static-lib xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/libgcc.a
-@static-lib xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/esp32-psram/no-rtti/libgcov.a
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include-fixed/
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include-fixed/README
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include-fixed/limits.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include-fixed/syslimits.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/float.h
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/gcov.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/iso646.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/stdalign.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/stdarg.h
@@ -63,7 +34,6 @@ xtensa-esp32-elf/bootstrap/lib/gcc/xtens
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/stdint.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/stdnoreturn.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/tgmath.h
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/unwind.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/include/varargs.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/install-tools/
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/install-tools/fixinc_list
@@ -73,15 +43,6 @@ xtensa-esp32-elf/bootstrap/lib/gcc/xtens
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/install-tools/include/limits.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/install-tools/macro_list
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/install-tools/mkheaders.conf
-@static-lib xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/libgcc.a
-@static-lib xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/libgcov.a
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crtbegin.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crtend.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crti.o
-xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/crtn.o
-@static-lib xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/libgcc.a
-@static-lib xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/no-rtti/libgcov.a
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/gtype.state
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/
@@ -153,6 +114,11 @@ xtensa-esp32-elf/bootstrap/lib/gcc/xtens
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/coverage.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/cp-tree.def
+xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/cp-tree.h
+xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/cxx-pretty-print.h
+xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/name-lookup.h
+xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/operators.def
+xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cp/type-utils.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cppbuiltin.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cppdefault.h
xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/cpplib.h
@@ -494,6 +460,7 @@ xtensa-esp32-elf/bootstrap/libexec/gcc/
xtensa-esp32-elf/bootstrap/libexec/gcc/xtensa-esp32-elf/
xtensa-esp32-elf/bootstrap/libexec/gcc/xtensa-esp32-elf/${V}/
@bin xtensa-esp32-elf/bootstrap/libexec/gcc/xtensa-esp32-elf/${V}/cc1
+@bin xtensa-esp32-elf/bootstrap/libexec/gcc/xtensa-esp32-elf/${V}/cc1plus
@bin xtensa-esp32-elf/bootstrap/libexec/gcc/xtensa-esp32-elf/${V}/collect2
xtensa-esp32-elf/bootstrap/libexec/gcc/xtensa-esp32-elf/${V}/install-tools/
xtensa-esp32-elf/bootstrap/libexec/gcc/xtensa-esp32-elf/${V}/install-tools/fixinc.sh
@@ -503,3 +470,23 @@ xtensa-esp32-elf/bootstrap/libexec/gcc/x
@bin xtensa-esp32-elf/bootstrap/libexec/gcc/xtensa-esp32-elf/${V}/lto-wrapper
xtensa-esp32-elf/bootstrap/libexec/gcc/xtensa-esp32-elf/${V}/plugin/
@bin xtensa-esp32-elf/bootstrap/libexec/gcc/xtensa-esp32-elf/${V}/plugin/gengtype
+xtensa-esp32-elf/include/
+xtensa-esp32-elf/share/
+@comment @info xtensa-esp32-elf/share/info/
+@comment @info xtensa-esp32-elf/share/info/cpp.info
+@comment @info xtensa-esp32-elf/share/info/cppinternals.info
+@comment @info xtensa-esp32-elf/share/info/gcc.info
+@comment @info xtensa-esp32-elf/share/info/gccinstall.info
+@comment @info xtensa-esp32-elf/share/info/gccint.info
+@comment @mandir xtensa-esp32-elf/share/man/
+@comment xtensa-esp32-elf/share/man/man1/
+@comment @man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-cpp.1
+@comment @man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-g++.1
+@comment @man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gcc.1
+@comment @man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gcov-dump.1
+@comment @man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gcov-tool.1
+@comment @man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gcov.1
+@comment xtensa-esp32-elf/share/man/man7/
+@comment @man xtensa-esp32-elf/share/man/man7/fsf-funding.7
+@comment @man xtensa-esp32-elf/share/man/man7/gfdl.7
+@comment @man xtensa-esp32-elf/share/man/man7/gpl.7
Index: gdb/Makefile
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- gdb/Makefile 29 Oct 2020 14:10:52 -0000 1.2
+++ gdb/Makefile 1 Nov 2021 16:39:23 -0000
@@ -2,23 +2,19 @@

COMMENT = gdb for ${CONFIG} cross-development

-VERSION = 2.33.1.2020.3
+VERSION = 2.35.1.2021.2
PKGNAME = ${CONFIG}-gdb-${VERSION}

GH_ACCOUNT = espressif
GH_PROJECT = binutils-gdb
-GH_TAGNAME = esp-2020r3-gdb
+GH_TAGNAME = esp-2021r2-gdb

-WANTLIB = c curses expat ${COMPILER_LIBCXX} gmp m mpfr
+WANTLIB += ${COMPILER_LIBCXX} c curses expat m z

BUILD_DEPENDS = devel/libtool \
devel/bison \
devel/xtensa-esp32-elf/binutils
RUN_DEPENDS += devel/xtensa-esp32-elf/binutils
-LIB_DEPENDS = devel/gmp \
- devel/mpfr
-
-YACC = bison -y

CONFIGURE_ARGS += --enable-commonbfdlib=no \
--with-cross-host=yes \
Index: gdb/distinfo
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- gdb/distinfo 29 Oct 2020 14:10:52 -0000 1.2
+++ gdb/distinfo 1 Nov 2021 16:39:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (binutils-gdb-esp-2020r3-gdb.tar.gz) = P+xCsHGa5hwOYhQEQ6owxxKPDIoCL5muwx9by+dBRZ4=
-SIZE (binutils-gdb-esp-2020r3-gdb.tar.gz) = 55159670
+SHA256 (binutils-gdb-esp-2021r2-gdb.tar.gz) = FijYCbd4pYgHkw3rnGwxifr32CheWu9t9jvkFHyhhvg=
+SIZE (binutils-gdb-esp-2021r2-gdb.tar.gz) = 59701067
Index: gdb/patches/patch-bfd_xtensa-modules_c
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/patches/patch-bfd_xtensa-modules_c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-bfd_xtensa-modules_c
--- gdb/patches/patch-bfd_xtensa-modules_c 11 Mar 2020 14:24:58 -0000 1.1.1.1
+++ gdb/patches/patch-bfd_xtensa-modules_c 1 Nov 2021 16:39:23 -0000
@@ -7,7 +7,7 @@ Index: bfd/xtensa-modules.c
+++ bfd/xtensa-modules.c
@@ -1,22 +1,25 @@
/* Xtensa configuration-specific ISA information.
-- Copyright (C) 2003-2018 Free Software Foundation, Inc.
+- Copyright (C) 2003-2019 Free Software Foundation, Inc.

- This file is part of BFD, the Binary File Descriptor library.
+ Copyright (c) 2003-2016 Tensilica Inc.
@@ -133,7 +133,7 @@ Index: bfd/xtensa-modules.c
{ "MISC0", 32, 0 },
{ "MISC1", 32, 0 },
{ "MISC2", 32, 0 },
-@@ -176,187 +178,150 @@ static xtensa_state_internal states[] = {
+@@ -176,3152 +178,2217 @@ static xtensa_state_internal states[] = {
{ "CCOMPARE0", 32, 0 },
{ "CCOMPARE1", 32, 0 },
{ "CCOMPARE2", 32, 0 },
@@ -365,8 +365,8 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_inst_get (const xtensa_insnbuf insn)
+Field_r_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
return tie_t;
}
@@ -375,9 +375,10 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_r_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
}

@@ -385,58 +386,56 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_inst16a_get (const xtensa_insnbuf insn)
+Field_op0_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
-- return tie_t;
--}
--
--static void
+- unsigned tie_t = ((insn[0] >> 4) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+ return tie_t;
+ }
+
+ static void
-Field_t_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
++Field_op0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-}
-
-static unsigned
-Field_t_Slot_inst16b_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
- return tie_t;
-}
-
-static void
-Field_t_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-}
-
-static unsigned
-Field_t_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
- return tie_t;
- }
-
- static void
+- unsigned tie_t = insn[0] & 0xf;
+- return tie_t;
+-}
+-
+-static void
-Field_t_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-+Field_op0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
-@@ -364,486 +329,429 @@ Field_t_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn,
+-{
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
}

static unsigned
-Field_t_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_op2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
return tie_t;
}
@@ -445,9 +444,10 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_op2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
}

@@ -455,8 +455,8 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_op1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
return tie_t;
}
@@ -465,9 +465,10 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_op1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
}

@@ -475,52 +476,50 @@ Index: bfd/xtensa-modules.c
-Field_t_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_t_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-- return tie_t;
--}
--
--static void
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+ return tie_t;
+ }
+
+ static void
-Field_t_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
++Field_t_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-}
-
-static unsigned
-Field_bbi4_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+- unsigned tie_t = (insn[0] >> 12) & 1;
- return tie_t;
-}
-
-static void
-Field_bbi4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
-}
-
-static unsigned
-Field_bbi_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
- return tie_t;
- }
-
- static void
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
+- return tie_t;
+-}
+-
+-static void
-Field_bbi_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-+Field_t_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+-{
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
}

@@ -528,9 +527,9 @@ Index: bfd/xtensa-modules.c
-Field_bbi_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_s_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = (insn[0] >> 26) & 1;
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
return tie_t;
}
@@ -539,11 +538,12 @@ Index: bfd/xtensa-modules.c
-Field_bbi_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_s_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
}

@@ -551,8 +551,8 @@ Index: bfd/xtensa-modules.c
-Field_imm12_Slot_inst_get (const xtensa_insnbuf insn)
+Field_n_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 12) | ((insn[0] << 8) >> 20);
+- unsigned tie_t = (insn[0] >> 12) & 0xfff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
return tie_t;
}
@@ -561,9 +561,9 @@ Index: bfd/xtensa-modules.c
-Field_imm12_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_n_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 20) >> 20;
+- uint32 tie_t = val & 0xfff;
- insn[0] = (insn[0] & ~0xfff000) | (tie_t << 12);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
}
@@ -572,8 +572,8 @@ Index: bfd/xtensa-modules.c
-Field_imm8_Slot_inst_get (const xtensa_insnbuf insn)
+Field_m_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 8) | ((insn[0] << 8) >> 24);
+- unsigned tie_t = (insn[0] >> 16) & 0xff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
return tie_t;
}
@@ -582,9 +582,9 @@ Index: bfd/xtensa-modules.c
-Field_imm8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_m_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 24) >> 24;
+- uint32 tie_t = val & 0xff;
- insn[0] = (insn[0] & ~0xff0000) | (tie_t << 16);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
}
@@ -593,38 +593,39 @@ Index: bfd/xtensa-modules.c
-Field_imm8_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_sr_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 8) | ((insn[0] << 12) >> 24);
-- return tie_t;
--}
--
--static void
+- unsigned tie_t = (insn[0] >> 12) & 0xff;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
-Field_imm8_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 24) >> 24;
++Field_sr_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xff;
- insn[0] = (insn[0] & ~0xff000) | (tie_t << 12);
-}
-
-static unsigned
-Field_imm8_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
-+ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
- return tie_t;
- }
-
- static void
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
+- return tie_t;
+-}
+-
+-static void
-Field_imm8_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_sr_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+-{
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+- tie_t = (val >> 4) & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
- tie_t = (val << 24) >> 28;
++ tie_t = (val << 24) >> 28;
insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
}

@@ -632,8 +633,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst_get (const xtensa_insnbuf insn)
+Field_st_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}
@@ -642,8 +644,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_st_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+ tie_t = (val << 24) >> 28;
insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
@@ -653,8 +656,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst16a_get (const xtensa_insnbuf insn)
+Field_thi3_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
return tie_t;
}
@@ -663,9 +666,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+Field_thi3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
}
@@ -674,8 +677,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst16b_get (const xtensa_insnbuf insn)
+Field_t3_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
return tie_t;
}
@@ -684,9 +687,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+Field_t3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
}
@@ -695,8 +698,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_tlo_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
return tie_t;
}
@@ -705,9 +708,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_tlo_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
}
@@ -716,8 +719,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_w_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 18) >> 30);
return tie_t;
}
@@ -726,9 +729,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_w_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x3000) | (tie_t << 12);
}
@@ -737,8 +740,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_r3_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
return tie_t;
}
@@ -747,9 +750,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_r3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
}
@@ -758,8 +761,8 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_rhi_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
return tie_t;
}
@@ -768,9 +771,9 @@ Index: bfd/xtensa-modules.c
-Field_s_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_rhi_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
}
@@ -779,9 +782,9 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_inst_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_3_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
-- tie_t = (tie_t << 8) | ((insn[0] << 8) >> 24);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
+- tie_t = (tie_t << 8) | ((insn[0] >> 16) & 0xff);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 8) >> 31);
return tie_t;
}
@@ -790,11 +793,11 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 24) >> 24;
+- uint32 tie_t = val & 0xff;
- insn[0] = (insn[0] & ~0xff0000) | (tie_t << 16);
-- tie_t = (val << 20) >> 28;
+- tie_t = (val >> 8) & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x800000) | (tie_t << 23);
}
@@ -803,9 +806,9 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
-- tie_t = (tie_t << 8) | ((insn[0] << 12) >> 24);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
+- tie_t = (tie_t << 8) | ((insn[0] >> 12) & 0xff);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
return tie_t;
}
@@ -814,11 +817,11 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 24) >> 24;
+- uint32 tie_t = val & 0xff;
- insn[0] = (insn[0] & ~0xff000) | (tie_t << 12);
-- tie_t = (val << 20) >> 28;
+- tie_t = (val >> 8) & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
}
@@ -827,8 +830,8 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_3_2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 12) | ((insn[0] << 16) >> 20);
+- unsigned tie_t = (insn[0] >> 4) & 0xfff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 8) >> 30);
return tie_t;
}
@@ -837,9 +840,9 @@ Index: bfd/xtensa-modules.c
-Field_imm12b_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_3_2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 20) >> 20;
+- uint32 tie_t = val & 0xfff;
- insn[0] = (insn[0] & ~0xfff0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc00000) | (tie_t << 22);
}
@@ -848,8 +851,8 @@ Index: bfd/xtensa-modules.c
-Field_imm16_Slot_inst_get (const xtensa_insnbuf insn)
+Field_dfp_fld_r_3_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 16) | ((insn[0] << 8) >> 16);
+- unsigned tie_t = (insn[0] >> 8) & 0xffff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
return tie_t;
}
@@ -858,9 +861,9 @@ Index: bfd/xtensa-modules.c
-Field_imm16_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_r_3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 16) >> 16;
+- uint32 tie_t = val & 0xffff;
- insn[0] = (insn[0] & ~0xffff00) | (tie_t << 8);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
}
@@ -869,8 +872,8 @@ Index: bfd/xtensa-modules.c
-Field_imm16_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 16) | ((insn[0] << 12) >> 16);
+- unsigned tie_t = (insn[0] >> 4) & 0xffff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
return tie_t;
}
@@ -879,9 +882,9 @@ Index: bfd/xtensa-modules.c
-Field_imm16_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 16) >> 16;
+- uint32 tie_t = val & 0xffff;
- insn[0] = (insn[0] & ~0xffff0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
}
@@ -890,8 +893,8 @@ Index: bfd/xtensa-modules.c
-Field_m_Slot_inst_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_3_1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+- unsigned tie_t = (insn[0] >> 6) & 3;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 8) >> 29);
return tie_t;
}
@@ -900,9 +903,9 @@ Index: bfd/xtensa-modules.c
-Field_m_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_3_1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00000) | (tie_t << 21);
}
@@ -911,8 +914,8 @@ Index: bfd/xtensa-modules.c
-Field_m_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_3_1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 28) >> 30);
+- unsigned tie_t = (insn[0] >> 2) & 3;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}
@@ -921,9 +924,9 @@ Index: bfd/xtensa-modules.c
-Field_m_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_3_1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0xc) | (tie_t << 2);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
}
@@ -932,8 +935,8 @@ Index: bfd/xtensa-modules.c
-Field_n_Slot_inst_get (const xtensa_insnbuf insn)
+Field_dfp_fld_r_3_1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+- unsigned tie_t = (insn[0] >> 4) & 3;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
return tie_t;
}
@@ -942,9 +945,9 @@ Index: bfd/xtensa-modules.c
-Field_n_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_r_3_1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
}
@@ -953,8 +956,8 @@ Index: bfd/xtensa-modules.c
-Field_n_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_s3to1_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 30) >> 30);
+- unsigned tie_t = insn[0] & 3;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}
@@ -963,9 +966,9 @@ Index: bfd/xtensa-modules.c
-Field_n_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_s3to1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x3) | (tie_t << 0);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
}
@@ -974,8 +977,8 @@ Index: bfd/xtensa-modules.c
-Field_offset_Slot_inst_get (const xtensa_insnbuf insn)
+Field_op0_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 18) | ((insn[0] << 8) >> 14);
+- unsigned tie_t = (insn[0] >> 6) & 0x3ffff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
return tie_t;
}
@@ -984,9 +987,9 @@ Index: bfd/xtensa-modules.c
-Field_offset_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_op0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 14) >> 14;
+- uint32 tie_t = val & 0x3ffff;
- insn[0] = (insn[0] & ~0xffffc0) | (tie_t << 6);
++ uint32 tie_t;
+ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
}
@@ -995,8 +998,8 @@ Index: bfd/xtensa-modules.c
-Field_offset_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_t_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 18) | ((insn[0] << 14) >> 14);
+- unsigned tie_t = insn[0] & 0x3ffff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}
@@ -1005,9 +1008,9 @@ Index: bfd/xtensa-modules.c
-Field_offset_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_t_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 14) >> 14;
+- uint32 tie_t = val & 0x3ffff;
- insn[0] = (insn[0] & ~0x3ffff) | (tie_t << 0);
++ uint32 tie_t;
+ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
}
@@ -1016,8 +1019,8 @@ Index: bfd/xtensa-modules.c
-Field_op0_Slot_inst_get (const xtensa_insnbuf insn)
+Field_r_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
return tie_t;
}
@@ -1026,9 +1029,10 @@ Index: bfd/xtensa-modules.c
-Field_op0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_r_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
}

@@ -1036,26 +1040,28 @@ Index: bfd/xtensa-modules.c
-Field_op0_Slot_inst16a_get (const xtensa_insnbuf insn)
+Field_op0_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-@@ -851,7 +759,7 @@ Field_op0_Slot_inst16a_get (const xtensa_insnbuf insn)
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+ return tie_t;
}

static void
-Field_op0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+Field_op0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
-@@ -859,211 +767,217 @@ Field_op0_Slot_inst16a_set (xtensa_insnbuf insn, uint3
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
}

static unsigned
-Field_op0_Slot_inst16b_get (const xtensa_insnbuf insn)
+Field_z_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
return tie_t;
}
@@ -1064,9 +1070,9 @@ Index: bfd/xtensa-modules.c
-Field_op0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+Field_z_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
}
@@ -1075,8 +1081,8 @@ Index: bfd/xtensa-modules.c
-Field_op1_Slot_inst_get (const xtensa_insnbuf insn)
+Field_i_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
+- unsigned tie_t = (insn[0] >> 16) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
return tie_t;
}
@@ -1085,9 +1091,9 @@ Index: bfd/xtensa-modules.c
-Field_op1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_i_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
}
@@ -1096,8 +1102,8 @@ Index: bfd/xtensa-modules.c
-Field_op1_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_s_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
return tie_t;
}
@@ -1106,9 +1112,10 @@ Index: bfd/xtensa-modules.c
-Field_op1_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_s_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
}

@@ -1116,8 +1123,8 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_inst_get (const xtensa_insnbuf insn)
+Field_t_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
+- unsigned tie_t = (insn[0] >> 20) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}
@@ -1126,9 +1133,10 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_t_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
}

@@ -1136,8 +1144,8 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_bbi4_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
+- unsigned tie_t = (insn[0] >> 16) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
return tie_t;
}
@@ -1146,9 +1154,9 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_bbi4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
}
@@ -1157,8 +1165,8 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_bbi_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
@@ -1168,9 +1176,10 @@ Index: bfd/xtensa-modules.c
-Field_op2_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_bbi_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
@@ -1180,8 +1189,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst_get (const xtensa_insnbuf insn)
+Field_imm12_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 12) | ((insn[0] << 8) >> 20);
return tie_t;
}
@@ -1190,9 +1199,9 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+Field_imm12_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
++ uint32 tie_t;
+ tie_t = (val << 20) >> 20;
+ insn[0] = (insn[0] & ~0xfff000) | (tie_t << 12);
}
@@ -1201,8 +1210,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst16a_get (const xtensa_insnbuf insn)
+Field_imm8_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 8) | ((insn[0] << 8) >> 24);
return tie_t;
}
@@ -1211,9 +1220,9 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+Field_imm8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
++ uint32 tie_t;
+ tie_t = (val << 24) >> 24;
+ insn[0] = (insn[0] & ~0xff0000) | (tie_t << 16);
}
@@ -1222,8 +1231,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst16b_get (const xtensa_insnbuf insn)
+Field_s_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
return tie_t;
}
@@ -1232,9 +1241,10 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+Field_s_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
}

@@ -1242,8 +1252,9 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+Field_imm12b_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ tie_t = (tie_t << 8) | ((insn[0] << 8) >> 24);
return tie_t;
}
@@ -1252,8 +1263,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+Field_imm12b_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
+ tie_t = (val << 24) >> 24;
+ insn[0] = (insn[0] & ~0xff0000) | (tie_t << 16);
+ tie_t = (val << 20) >> 28;
@@ -1264,8 +1275,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+Field_imm16_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 16) | ((insn[0] << 8) >> 16);
return tie_t;
}
@@ -1274,9 +1285,9 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+Field_imm16_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 16) >> 16;
+ insn[0] = (insn[0] & ~0xffff00) | (tie_t << 8);
}
@@ -1285,8 +1296,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_offset_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 4) & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 18) | ((insn[0] << 8) >> 14);
return tie_t;
}
@@ -1295,9 +1306,9 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_offset_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ uint32 tie_t;
+ tie_t = (val << 14) >> 14;
+ insn[0] = (insn[0] & ~0xffffc0) | (tie_t << 6);
}
@@ -1306,8 +1317,8 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_r_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[0] & 0xf;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
return tie_t;
}
@@ -1316,345 +1327,835 @@ Index: bfd/xtensa-modules.c
-Field_r_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_r_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
}

static unsigned
-@@ -1099,22 +1013,6 @@ Field_sae4_Slot_inst_set (xtensa_insnbuf insn, uint32
+ Field_sa4_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 20) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_sa4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
+ }
+
+ static unsigned
+ Field_sae4_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 16) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_sae4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
}

static unsigned
-Field_sae4_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+- unsigned tie_t = (insn[0] << 12) & 1;
- return tie_t;
-}
-
-static void
-Field_sae4_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
-}
-
-static unsigned
Field_sae_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1134,41 +1032,6 @@ Field_sae_Slot_inst_set (xtensa_insnbuf insn, uint32 v
+- unsigned tie_t = (insn[0] >> 16) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sae_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+- tie_t = (val >> 4) & 1;
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
}

static unsigned
-Field_sae_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
- return tie_t;
-}
-
-static void
-Field_sae_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
-}
-
-static unsigned
-Field_sae_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 15) >> 27);
+- unsigned tie_t = (insn[0] >> 12) & 0x1f;
- return tie_t;
-}
-
-static void
-Field_sae_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
+- uint32 tie_t = val & 0x1f;
- insn[0] = (insn[0] & ~0x1f000) | (tie_t << 12);
-}
-
-static unsigned
Field_sal_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1188,44 +1051,6 @@ Field_sal_Slot_inst_set (xtensa_insnbuf insn, uint32 v
+- unsigned tie_t = (insn[0] >> 20) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
++ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sal_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+- tie_t = (val >> 4) & 1;
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
}

static unsigned
-Field_sal_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = (insn[0] >> 16) & 1;
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
- return tie_t;
-}
-
-static void
-Field_sal_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
-}
-
-static unsigned
-Field_sal_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
- return tie_t;
-}
-
-static void
-Field_sal_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
-}
-
-static unsigned
Field_sargt_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1245,57 +1070,6 @@ Field_sargt_Slot_inst_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 20) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sargt_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+- tie_t = (val >> 4) & 1;
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
}

static unsigned
-Field_sargt_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 16) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
- return tie_t;
-}
-
-static void
-Field_sargt_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
-}
-
-static unsigned
-Field_sargt_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 19) >> 27);
+- unsigned tie_t = (insn[0] >> 8) & 0x1f;
- return tie_t;
-}
-
-static void
-Field_sargt_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
+- uint32 tie_t = val & 0x1f;
- insn[0] = (insn[0] & ~0x1f00) | (tie_t << 8);
-}
-
-static unsigned
-Field_sargt_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 19) >> 27);
+- unsigned tie_t = (insn[0] >> 8) & 0x1f;
- return tie_t;
-}
-
-static void
-Field_sargt_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
+- uint32 tie_t = val & 0x1f;
- insn[0] = (insn[0] & ~0x1f00) | (tie_t << 8);
-}
-
-static unsigned
Field_sas4_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1331,44 +1105,6 @@ Field_sas_Slot_inst_set (xtensa_insnbuf insn, uint32 v
+- unsigned tie_t = (insn[0] >> 4) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_sas4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_sas_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sas_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+- tie_t = (val >> 4) & 1;
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
}

static unsigned
-Field_sas_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 31) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = insn[0] & 1;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
- return tie_t;
-}
-
-static void
-Field_sas_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x1) | (tie_t << 0);
-}
-
-static unsigned
-Field_sr_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
- return tie_t;
-}
-
-static void
-Field_sr_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
-- tie_t = (val << 24) >> 28;
+- tie_t = (val >> 4) & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
-}
-
-static unsigned
Field_sr_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1407,25 +1143,6 @@ Field_sr_Slot_inst16b_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sr_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+- tie_t = (val >> 4) & 0xf;
++ tie_t = (val << 24) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_sr_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_sr_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+- tie_t = (val >> 4) & 0xf;
++ tie_t = (val << 24) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
}

static unsigned
-Field_st_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
-- tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
- return tie_t;
-}
-
-static void
-Field_st_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
-- tie_t = (val << 24) >> 28;
+- tie_t = (val >> 4) & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
-}
-
-static unsigned
Field_st_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1464,38 +1181,6 @@ Field_st_Slot_inst16b_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
++ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_st_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+- tie_t = (val >> 4) & 0xf;
++ tie_t = (val << 24) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
}

static unsigned
--Field_thi3_Slot_inst_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
-- return tie_t;
--}
+ Field_st_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 4) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
++ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_st_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+- tie_t = (val >> 4) & 0xf;
++ tie_t = (val << 24) >> 28;
+ insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+ }
+
+ static unsigned
+-Field_thi3_Slot_inst_get (const xtensa_insnbuf insn)
+-{
+- unsigned tie_t = (insn[0] >> 5) & 7;
+- return tie_t;
+-}
-
-static void
-Field_thi3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
-}
-
-static unsigned
-Field_thi3_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 28) >> 29);
+- unsigned tie_t = (insn[0] >> 1) & 7;
- return tie_t;
-}
-
-static void
-Field_thi3_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe) | (tie_t << 1);
-}
-
-static unsigned
Field_imm4_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1579,22 +1264,6 @@ Field_i_Slot_inst16a_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm4_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm4_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_mn_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 3;
+- tie_t = (tie_t << 2) | ((insn[0] >> 4) & 3);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
++ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_mn_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+- tie_t = (val >> 2) & 3;
++ tie_t = (val << 28) >> 30;
+ insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+ }
+
+ static unsigned
+ Field_i_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 7) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_i_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
}

static unsigned
-Field_i_Slot_inst16b_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+- unsigned tie_t = (insn[0] >> 7) & 1;
- return tie_t;
-}
-
-static void
-Field_i_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-}
-
-static unsigned
Field_imm6lo_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1739,22 +1408,6 @@ Field_z_Slot_inst16a_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6lo_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm6lo_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6lo_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm6hi_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6hi_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm6hi_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6hi_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm7lo_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7lo_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm7lo_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7lo_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+ }
+
+ static unsigned
+ Field_imm7hi_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7hi_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm7hi_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7hi_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_z_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_z_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
}

static unsigned
-Field_z_Slot_inst16b_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+- unsigned tie_t = (insn[0] >> 6) & 1;
- return tie_t;
-}
-
-static void
-Field_z_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
-}
-
-static unsigned
Field_imm6_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1831,38 +1484,6 @@ Field_imm7_Slot_inst16b_set (xtensa_insnbuf insn, uint
+- unsigned tie_t = (insn[0] >> 4) & 3;
+- tie_t = (tie_t << 4) | ((insn[0] >> 12) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+- tie_t = (val >> 4) & 3;
++ tie_t = (val << 26) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm6_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 3;
+- tie_t = (tie_t << 4) | ((insn[0] >> 12) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm6_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+- tie_t = (val >> 4) & 3;
++ tie_t = (val << 26) >> 30;
+ insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm7_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 7;
+- tie_t = (tie_t << 4) | ((insn[0] >> 12) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+- tie_t = (val >> 4) & 7;
++ tie_t = (val << 25) >> 29;
+ insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+ }
+
+ static unsigned
+ Field_imm7_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 4) & 7;
+- tie_t = (tie_t << 4) | ((insn[0] >> 12) & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
++ tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+ return tie_t;
+ }
+
+ static void
+ Field_imm7_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0xf;
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
+ insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+- tie_t = (val >> 4) & 7;
++ tie_t = (val << 25) >> 29;
+ insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
}

static unsigned
-Field_imm7_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 7) | ((insn[0] << 25) >> 25);
+- unsigned tie_t = insn[0] & 0x7f;
- return tie_t;
-}
-
@@ -1662,1470 +2163,1962 @@ Index: bfd/xtensa-modules.c
-Field_imm7_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
-{
- uint32 tie_t;
-- tie_t = (val << 25) >> 25;
+- tie_t = val & 0x7f;
- insn[0] = (insn[0] & ~0x7f) | (tie_t << 0);
-}
-
-static unsigned
-Field_r3_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+- unsigned tie_t = (insn[0] >> 15) & 1;
- return tie_t;
-}
-
-static void
-Field_r3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
-}
-
-static unsigned
Field_rbit2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1879,38 +1500,6 @@ Field_rbit2_Slot_inst_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 14) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 17) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_rbit2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x4000) | (tie_t << 14);
}

static unsigned
-Field_rhi_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+- unsigned tie_t = (insn[0] >> 14) & 3;
- return tie_t;
-}
-
-static void
-Field_rhi_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
-}
-
-static unsigned
-Field_t3_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+- unsigned tie_t = (insn[0] >> 7) & 1;
- return tie_t;
-}
-
-static void
-Field_t3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-}
-
-static unsigned
Field_tbit2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -1927,38 +1516,6 @@ Field_tbit2_Slot_inst_set (xtensa_insnbuf insn, uint32
+- unsigned tie_t = (insn[0] >> 6) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_tbit2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
}

static unsigned
-Field_tlo_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+- unsigned tie_t = (insn[0] >> 4) & 3;
- return tie_t;
-}
-
-static void
-Field_tlo_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
-}
-
-static unsigned
-Field_w_Slot_inst_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 18) >> 30);
+- unsigned tie_t = (insn[0] >> 12) & 3;
- return tie_t;
-}
-
-static void
-Field_w_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x3000) | (tie_t << 12);
-}
-
-static unsigned
Field_y_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-@@ -2455,510 +2012,151 @@ Field_xt_wbr18_imm_Slot_inst_set (xtensa_insnbuf insn,
- }
-
- static unsigned
--Field_xt_wbr18_imm_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_0_Slot_inst_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 18) | ((insn[0] << 6) >> 14);
-+ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+- unsigned tie_t = (insn[0] >> 6) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
return tie_t;
}

static void
--Field_xt_wbr18_imm_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ Field_y_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 14) >> 14;
-- insn[0] = (insn[0] & ~0x3ffff00) | (tie_t << 8);
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
-+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+ insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
}

static unsigned
--Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_0_Slot_inst16a_get (const xtensa_insnbuf insn)
+ Field_x_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
-+ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+- unsigned tie_t = (insn[0] >> 14) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 17) >> 31);
return tie_t;
}

static void
--Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ Field_x_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
-- insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
+ tie_t = (val << 31) >> 31;
-+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+ insn[0] = (insn[0] & ~0x4000) | (tie_t << 14);
}

static unsigned
--Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_0_Slot_inst16b_get (const xtensa_insnbuf insn)
+ Field_t2_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 5) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_t2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
+ }
+
+ static unsigned
+ Field_t2_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 5) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_t2_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
+ }
+
+ static unsigned
+ Field_t2_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 5) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_t2_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
+ }
+
+ static unsigned
+ Field_s2_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 9) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_s2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+ }
+
+ static unsigned
+ Field_s2_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 9) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_s2_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+ }
+
+ static unsigned
+ Field_s2_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 9) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_s2_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+ }
+
+ static unsigned
+ Field_r2_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 13) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_r2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+ }
+
+ static unsigned
+ Field_r2_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 13) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_r2_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+ }
+
+ static unsigned
+ Field_r2_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 13) & 7;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+ return tie_t;
+ }
+
+ static void
+ Field_r2_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+ }
+
+ static unsigned
+ Field_t4_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_t4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+ }
+
+ static unsigned
+ Field_t4_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_t4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+ }
+
+ static unsigned
+ Field_t4_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_t4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+ }
+
+ static unsigned
+ Field_s4_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 10) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_s4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+ }
+
+ static unsigned
+ Field_s4_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 10) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_s4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+ }
+
+ static unsigned
+ Field_s4_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 10) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_s4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+ }
+
+ static unsigned
+ Field_r4_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 14) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_r4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
+ }
+
+ static unsigned
+ Field_r4_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 14) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_r4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
+ }
+
+ static unsigned
+ Field_r4_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 14) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+ return tie_t;
+ }
+
+ static void
+ Field_r4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
+ }
+
+ static unsigned
+ Field_t8_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 7) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_t8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+ }
+
+ static unsigned
+ Field_t8_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 7) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_t8_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+ }
+
+ static unsigned
+ Field_t8_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 7) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_t8_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+ }
+
+ static unsigned
+ Field_s8_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 11) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_s8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+ }
+
+ static unsigned
+ Field_s8_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 11) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_s8_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+ }
+
+ static unsigned
+ Field_s8_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 11) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_s8_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+ }
+
+ static unsigned
+ Field_r8_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 15) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_r8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+ }
+
+ static unsigned
+ Field_r8_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 15) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_r8_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+ }
+
+ static unsigned
+ Field_r8_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 15) & 1;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+ return tie_t;
+ }
+
+ static void
+ Field_r8_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+ }
+
+ static unsigned
+ Field_xt_wbr15_imm_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 9) & 0x7fff;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 15) | ((insn[0] << 8) >> 17);
+ return tie_t;
+ }
+
+ static void
+ Field_xt_wbr15_imm_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0x7fff;
++ uint32 tie_t;
++ tie_t = (val << 17) >> 17;
+ insn[0] = (insn[0] & ~0xfffe00) | (tie_t << 9);
+ }
+
+ static unsigned
+ Field_xt_wbr18_imm_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 6) & 0x3ffff;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 18) | ((insn[0] << 8) >> 14);
+ return tie_t;
+ }
+
+ static void
+ Field_xt_wbr18_imm_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 0x3ffff;
++ uint32 tie_t;
++ tie_t = (val << 14) >> 14;
+ insn[0] = (insn[0] & ~0xffffc0) | (tie_t << 6);
+ }
+
+ static unsigned
+-Field_xt_wbr18_imm_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_0_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+- unsigned tie_t = (insn[0] >> 8) & 0x3ffff;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+-Field_xt_wbr18_imm_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 0x3ffff;
+- insn[0] = (insn[0] & ~0x3ffff00) | (tie_t << 8);
+-}
+-
+-static unsigned
+-Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+-{
+- unsigned tie_t = (insn[0] >> 20) & 0xf;
+- return tie_t;
+-}
+-
+-static void
+-Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+-{
+- uint32 tie_t = val & 0xf;
+- insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
+-}
+-
+-static unsigned
+-Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+-{
+- unsigned tie_t = (insn[0] >> 13) & 7;
+- return tie_t;
+-}
+-
+-static void
+-Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+-{
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
-}
-
-static unsigned
-Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+- unsigned tie_t = (insn[0] >> 13) & 7;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
-}
-
-static unsigned
-Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 12) >> 29);
+- unsigned tie_t = (insn[0] >> 17) & 7;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe0000) | (tie_t << 17);
-}
-
-static unsigned
-Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 12) >> 29);
+- unsigned tie_t = (insn[0] >> 17) & 7;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0xe0000) | (tie_t << 17);
-}
-
-static unsigned
-Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+- unsigned tie_t = (insn[0] >> 16) & 0xf;
+- tie_t = (tie_t << 4) | ((insn[0] >> 8) & 0xf);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
-- tie_t = (val << 24) >> 28;
+- tie_t = (val >> 4) & 0xf;
- insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
-}
-
-static unsigned
-Field_op0_s4_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 12) >> 30);
+- unsigned tie_t = (insn[0] >> 18) & 3;
- return tie_t;
-}
-
-static void
-Field_op0_s4_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0xc0000) | (tie_t << 18);
-}
-
-static unsigned
-Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 0xf;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 14) >> 31);
+- unsigned tie_t = (insn[0] >> 17) & 1;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x20000) | (tie_t << 17);
-+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_2_1_Slot_inst_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 14) >> 30);
-+ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 16) & 3;
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_2_1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
- tie_t = (val << 30) >> 30;
+-{
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x30000) | (tie_t << 16);
-+ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld21xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_2_1_Slot_inst16a_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 14) >> 27);
-+ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 13) & 0x1f;
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld21xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_2_1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
+-{
+- uint32 tie_t = val & 0x1f;
- insn[0] = (insn[0] & ~0x3e000) | (tie_t << 13);
-}
-
-static unsigned
-Field_combined3e2c5767_fld22xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld22xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 26) >> 26;
+- uint32 tie_t = val & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 3) | ((insn[0] >> 4) & 7);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
-- tie_t = (val << 23) >> 26;
+- tie_t = (val >> 3) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 3) | ((insn[0] >> 4) & 7);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
-- tie_t = (val << 23) >> 26;
+- tie_t = (val >> 3) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 2) | ((insn[0] << 25) >> 30);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 2) | ((insn[0] >> 5) & 3);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
-- tie_t = (val << 24) >> 26;
+- tie_t = (val >> 2) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-+ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_2_1_Slot_inst16b_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
-+ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 1) | ((insn[0] >> 6) & 1);
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_2_1_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+-{
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
-- tie_t = (val << 25) >> 26;
+- tie_t = (val >> 1) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 2) | ((insn[0] << 22) >> 30);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 2) | ((insn[0] >> 8) & 3);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
-- tie_t = (val << 24) >> 26;
+- tie_t = (val >> 2) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-+ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_3_Slot_inst16a_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 2) | ((insn[0] << 22) >> 30);
-+ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 2) | ((insn[0] >> 8) & 3);
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_3_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+-{
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
-- tie_t = (val << 24) >> 26;
+- tie_t = (val >> 2) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-}
-
-static unsigned
-Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
-- tie_t = (tie_t << 1) | ((insn[0] << 22) >> 31);
+- unsigned tie_t = (insn[0] >> 12) & 0x3f;
+- tie_t = (tie_t << 1) | ((insn[0] >> 9) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x200) | (tie_t << 9);
-- tie_t = (val << 25) >> 26;
+- tie_t = (val >> 1) & 0x3f;
- insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
-+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_3_Slot_inst16b_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 14) >> 29);
-+ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 15) & 7;
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_3_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
+-{
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0x38000) | (tie_t << 15);
-}
-
-static unsigned
-Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+- unsigned tie_t = (insn[0] >> 7) & 1;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-+ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
- }
-
- static unsigned
+-}
+-
+-static unsigned
-Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-+Field_dfp_fld_r_3_1_Slot_inst16a_get (const xtensa_insnbuf insn)
- {
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-+ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
- return tie_t;
- }
-
- static void
+-{
+- unsigned tie_t = (insn[0] >> 7) & 1;
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
+- return tie_t;
+-}
+-
+-static void
-Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-+Field_dfp_fld_r_3_1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
- {
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+-{
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-}
-
-static unsigned
-Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+- unsigned tie_t = (insn[0] >> 10) & 3;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
+- uint32 tie_t = val & 3;
- insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
-}
-
-static unsigned
-Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 20) >> 27);
-- tie_t = (tie_t << 6) | ((insn[0] << 26) >> 26);
+- unsigned tie_t = (insn[0] >> 7) & 0x1f;
+- tie_t = (tie_t << 6) | (insn[0] & 0x3f);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 26) >> 26;
+- uint32 tie_t = val & 0x3f;
- insn[0] = (insn[0] & ~0x3f) | (tie_t << 0);
-- tie_t = (val << 21) >> 27;
+- tie_t = (val >> 6) & 0x1f;
- insn[0] = (insn[0] & ~0xf80) | (tie_t << 7);
-}
-
-static unsigned
-Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
--}
--
--static unsigned
+- tie_t = (val >> 4) & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+ }
+
+ static unsigned
-Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
-- tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
-- return tie_t;
--}
--
--static void
++Field_dfp_fld_r_0_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 10) & 3;
+- tie_t = (tie_t << 1) | ((insn[0] >> 8) & 1);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+ return tie_t;
+ }
+
+ static void
-Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
++Field_dfp_fld_r_0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
-- tie_t = (val << 29) >> 30;
+- tie_t = (val >> 1) & 3;
- insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
-}
-
-static unsigned
-Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
-- tie_t = (tie_t << 5) | ((insn[0] << 27) >> 27);
+- unsigned tie_t = (insn[0] >> 7) & 1;
+- tie_t = (tie_t << 5) | (insn[0] & 0x1f);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
+- uint32 tie_t = val & 0x1f;
- insn[0] = (insn[0] & ~0x1f) | (tie_t << 0);
-- tie_t = (val << 26) >> 31;
+- tie_t = (val >> 5) & 1;
- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-}
-
-static unsigned
-Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[0] << 17) >> 29);
+- unsigned tie_t = (insn[0] >> 12) & 7;
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
- tie_t = (val << 29) >> 29;
+- uint32 tie_t = val & 7;
- insn[0] = (insn[0] & ~0x7000) | (tie_t << 12);
+-}
+-
+-static unsigned
+-Field_op0_s5_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-{
+- unsigned tie_t = (insn[0] >> 13) & 7;
+- return tie_t;
+-}
+-
+-static void
+-Field_op0_s5_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-{
+- uint32 tie_t = val & 7;
+- insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+-}
+-
+-static unsigned
+-Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-{
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- return tie_t;
+-}
+-
+-static void
+-Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-{
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_0_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 1) | ((insn[0] >> 7) & 1);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
+- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+- tie_t = (val >> 1) & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_2_1_Slot_inst_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 1) | ((insn[0] >> 7) & 1);
+- tie_t = (tie_t << 1) | ((insn[0] >> 4) & 1);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_2_1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
+- insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
+- tie_t = (val >> 1) & 1;
+- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+- tie_t = (val >> 2) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
++ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_2_1_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 1) | ((insn[0] >> 7) & 1);
+- tie_t = (tie_t << 1) | ((insn[0] >> 4) & 1);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_2_1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
+- insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
+- tie_t = (val >> 1) & 1;
+- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+- tie_t = (val >> 2) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
++ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_2_1_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 3) | ((insn[0] >> 8) & 7);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 2) | ((insn[0] << 17) >> 30);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_2_1_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
+- insn[0] = (insn[0] & ~0x700) | (tie_t << 8);
+- tie_t = (val >> 3) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
++ insn[0] = (insn[0] & ~0x6000) | (tie_t << 13);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_3_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 3) | ((insn[0] >> 8) & 7);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_3_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 7;
+- insn[0] = (insn[0] & ~0x700) | (tie_t << 8);
+- tie_t = (val >> 3) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
++ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_3_Slot_inst16b_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 2) | ((insn[0] >> 9) & 3);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_3_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 3;
+- insn[0] = (insn[0] & ~0x600) | (tie_t << 9);
+- tie_t = (val >> 2) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
++ insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+ }
+
+ static unsigned
+-Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
++Field_dfp_fld_r_3_1_Slot_inst16a_get (const xtensa_insnbuf insn)
+ {
+- unsigned tie_t = (insn[0] >> 12) & 1;
+- tie_t = (tie_t << 1) | ((insn[0] >> 10) & 1);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+ return tie_t;
+ }
+
+ static void
+-Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
++Field_dfp_fld_r_3_1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+ {
+- uint32 tie_t = val & 1;
+- insn[0] = (insn[0] & ~0x400) | (tie_t << 10);
+- tie_t = (val >> 1) & 1;
+- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
}

static unsigned
--Field_op0_s5_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_dfp_fld_r_3_1_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
- tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
-@@ -2966,7 +2164,7 @@ Field_op0_s5_Slot_xt_flix64_slot2_get (const xtensa_in
+- unsigned tie_t = (insn[0] >> 5) & 3;
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+ return tie_t;
}

static void
--Field_op0_s5_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_r_3_1_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 29) >> 29;
-@@ -2974,750 +2172,223 @@ Field_op0_s5_Slot_xt_flix64_slot2_set (xtensa_insnbuf
+- uint32 tie_t = val & 3;
+- insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
++ insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
}

static unsigned
--Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_0_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+- unsigned tie_t = (insn[0] >> 11) & 1;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+- uint32 tie_t = val & 1;
+- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
}

static unsigned
--Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_0_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+- unsigned tie_t = (insn[0] >> 8) & 0xf;
+- tie_t = (tie_t << 2) | ((insn[0] >> 5) & 3);
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-- tie_t = (val << 30) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+- uint32 tie_t = val & 0xf;
+- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+- tie_t = (val >> 4) & 3;
+- insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
+- tie_t = (val >> 6) & 0xf;
+- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
}

static unsigned
--Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_0_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
+- unsigned tie_t = (insn[0] >> 11) & 1;
+- tie_t = (tie_t << 1) | ((insn[0] >> 8) & 1);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
-- tie_t = (val << 30) >> 31;
-- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-- tie_t = (val << 29) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
-+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
+- uint32 tie_t = val & 1;
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
+- tie_t = (val >> 1) & 1;
+- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
}

static unsigned
--Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_3_1_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
+- unsigned tie_t = (insn[0] >> 11) & 1;
+- tie_t = (tie_t << 2) | ((insn[0] >> 8) & 3);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}

static void
--Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_3_1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
-- tie_t = (val << 30) >> 31;
-- insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
-- tie_t = (val << 29) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
--}
--
--static unsigned
--Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 3) | ((insn[0] << 21) >> 29);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
- tie_t = (val << 29) >> 29;
-- insn[0] = (insn[0] & ~0x700) | (tie_t << 8);
-- tie_t = (val << 28) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+- uint32 tie_t = val & 3;
+- insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
+- tie_t = (val >> 2) & 1;
+- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
}

static unsigned
--Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_op0_s6_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_dfp_fld_s_3_1_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 3) | ((insn[0] << 21) >> 29);
+- unsigned tie_t = (insn[0] >> 27) & 0x1f;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}

static void
--Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_op0_s6_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_s_3_1_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 29) >> 29;
-- insn[0] = (insn[0] & ~0x700) | (tie_t << 8);
-- tie_t = (val << 28) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+- uint32 tie_t = val & 0x1f;
+- insn[0] = (insn[0] & ~0xf8000000) | (tie_t << 27);
++ uint32 tie_t;
++ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
}

static unsigned
--Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_0_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 2) | ((insn[0] << 21) >> 30);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
-- insn[0] = (insn[0] & ~0x600) | (tie_t << 9);
-- tie_t = (val << 29) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
--}
--
--static unsigned
--Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
-- tie_t = (tie_t << 1) | ((insn[0] << 21) >> 31);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x400) | (tie_t << 10);
-- tie_t = (val << 30) >> 31;
-- insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+- uint32 tie_t = val & 0xf;
+- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+- tie_t = (val >> 4) & 1;
+- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+- tie_t = (val >> 5) & 7;
+- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
}

static unsigned
--Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_1_0_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 2) | ((insn[0] << 25) >> 30);
+- unsigned tie_t = insn[1] & 7;
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 2) | ((insn[0] << 10) >> 30);
return tie_t;
}

static void
--Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_1_0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 30) >> 30;
-- insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
+- uint32 tie_t = val & 7;
+- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 30) >> 30;
+ insn[0] = (insn[0] & ~0x300000) | (tie_t << 20);
}

static unsigned
--Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_dfp_fld_op2_2_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 9) >> 31);
return tie_t;
}

static void
--Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_dfp_fld_op2_2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+- uint32 tie_t = val & 0xf;
+- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+- tie_t = (val >> 4) & 1;
+- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+- tie_t = (val >> 5) & 7;
+- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 31) >> 31;
+ insn[0] = (insn[0] & ~0x400000) | (tie_t << 22);
}

static unsigned
--Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_bitindex_Slot_inst_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
-- tie_t = (tie_t << 2) | ((insn[0] << 25) >> 30);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
-- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 26) >> 30;
-- insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
-- tie_t = (val << 22) >> 28;
-- insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
--}
--
--static unsigned
--Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
- tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
++ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}

static void
--Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_bitindex_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
-- tie_t = (val << 30) >> 31;
-- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
--}
--
--static unsigned
--Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
-- tie_t = (tie_t << 2) | ((insn[0] << 22) >> 30);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 30) >> 30;
-- insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
-- tie_t = (val << 29) >> 31;
-- insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
--}
--
--static unsigned
--Field_op0_s6_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 5) | ((insn[0] << 0) >> 27);
-- return tie_t;
--}
--
--static void
--Field_op0_s6_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 27) >> 27;
-- insn[0] = (insn[0] & ~0xf8000000) | (tie_t << 27);
--}
--
--static unsigned
--Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 24) >> 29;
+- tie_t = (val >> 5) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
++ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
}

static unsigned
--Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_bitindex_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
+- tie_t = (tie_t << 4) | (insn[0] & 0xf);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}

static void
--Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_bitindex_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 29) >> 29;
-- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
--}
--
--static unsigned
--Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
- tie_t = (val << 27) >> 31;
+- tie_t = (val >> 4) & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 24) >> 29;
+- tie_t = (val >> 5) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
++ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
}

static unsigned
--Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_bitindex_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
+ tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
return tie_t;
}

static void
--Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_bitindex_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
- tie_t = (val << 28) >> 28;
-- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-+ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
- tie_t = (val << 27) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 24) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
++ tie_t = (val << 28) >> 28;
++ insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
++ tie_t = (val << 27) >> 31;
+ insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
}

static unsigned
--Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_s3to1_Slot_inst16a_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}

static void
--Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_s3to1_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
-- insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
-- tie_t = (val << 27) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 24) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
++ uint32 tie_t;
+ tie_t = (val << 29) >> 29;
+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
}

static unsigned
--Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+-Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+Field_s3to1_Slot_inst16b_get (const xtensa_insnbuf insn)
{
- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
++ unsigned tie_t = 0;
+ tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
return tie_t;
}

static void
--Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+-Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+Field_s3to1_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
{
- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
-- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-+ tie_t = (val << 29) >> 29;
-+ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
- }
-
--static unsigned
--Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- return tie_t;
--}
--
- static void
--Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
-- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
-- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
--}
--
--static unsigned
--Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
--{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
-- return tie_t;
--}
--
--static void
--Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
--{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 1) | ((insn[0] >> 26) & 1);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 31) >> 31;
+- uint32 tie_t = val & 1;
- insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
-- tie_t = (val << 28) >> 29;
+- tie_t = (val >> 1) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
-}
-
-static unsigned
-Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
-- tie_t = (tie_t << 27) | ((insn[0] << 5) >> 5);
+- unsigned tie_t = insn[1] & 7;
+- tie_t = (tie_t << 27) | (insn[0] & 0x7ffffff);
- return tie_t;
-}
-
-static void
-Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 5) >> 5;
+ uint32 tie_t;
+- tie_t = val & 0x7ffffff;
- insn[0] = (insn[0] & ~0x7ffffff) | (tie_t << 0);
-- tie_t = (val << 2) >> 29;
+- tie_t = (val >> 27) & 7;
- insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
--}
--
++ tie_t = (val << 29) >> 29;
++ insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+ }
+
-static unsigned
-Field_op0_xt_flix64_slot0_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
-{
-- unsigned tie_t = 0;
-- tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
+- unsigned tie_t = (insn[0] >> 20) & 0xf;
- return tie_t;
-}
-
--static void
+ static void
-Field_op0_xt_flix64_slot0_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
-{
-- uint32 tie_t;
-- tie_t = (val << 28) >> 28;
+- uint32 tie_t = val & 0xf;
- insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
-}
-
@@ -3133,7 +4126,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_set (xtensa_insnbuf insn ATTRIBUTE_UNUSED,
uint32 val ATTRIBUTE_UNUSED)
{
-@@ -3796,35 +2467,144 @@ Implicit_Field_brall_get (const xtensa_insnbuf insn AT
+@@ -3400,35 +2467,144 @@ Implicit_Field_brall_get (const xtensa_insnbuf insn AT
return 0;
}

@@ -3290,7 +4283,7 @@ Index: bfd/xtensa-modules.c
/* Constant tables. */

/* constant table ai4c */
-@@ -3890,1697 +2670,3201 @@ static const unsigned CONST_TBL_b4cu_0[] = {
+@@ -3494,1697 +2670,3201 @@ static const unsigned CONST_TBL_b4cu_0[] = {
0
};

@@ -4224,7 +5217,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned soffsetx4_0, offset_0;
- offset_0 = *valp & 0x3ffff;
-- soffsetx4_0 = 0x4 + ((((int) offset_0 << 14) >> 14) << 2);
+- soffsetx4_0 = 0x4 + (((offset_0 ^ 0x20000) - 0x20000) << 2);
- *valp = soffsetx4_0;
+ *valp += 2;
return 0;
@@ -4309,7 +5302,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned simm4_0, mn_0;
- mn_0 = *valp & 0xf;
-- simm4_0 = ((int) mn_0 << 28) >> 28;
+- simm4_0 = (mn_0 ^ 0x8) - 0x8;
- *valp = simm4_0;
+ unsigned simm4_out_0;
+ unsigned simm4_in_0;
@@ -4483,7 +5476,7 @@ Index: bfd/xtensa-modules.c
-{
- unsigned immrx4_0, r_0;
- r_0 = *valp & 0xf;
-- immrx4_0 = (((0xfffffff) << 4) | r_0) << 2;
+- immrx4_0 = (0xfffffff0 | r_0) << 2;
- *valp = immrx4_0;
+ unsigned lsi4x4_out_0;
+ unsigned lsi4x4_in_0;
@@ -4939,7 +5932,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned simm8_0, imm8_0;
- imm8_0 = *valp & 0xff;
-- simm8_0 = ((int) imm8_0 << 24) >> 24;
+- simm8_0 = (imm8_0 ^ 0x80) - 0x80;
- *valp = simm8_0;
+ unsigned simm8_out_0;
+ unsigned simm8_in_0;
@@ -4971,7 +5964,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned simm8x256_0, imm8_0;
- imm8_0 = *valp & 0xff;
-- simm8x256_0 = (((int) imm8_0 << 24) >> 24) << 8;
+- simm8x256_0 = ((imm8_0 ^ 0x80) - 0x80) << 8;
- *valp = simm8x256_0;
+ unsigned simm8x256_out_0;
+ unsigned simm8x256_in_0;
@@ -5003,7 +5996,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned simm12b_0, imm12b_0;
- imm12b_0 = *valp & 0xfff;
-- simm12b_0 = ((int) imm12b_0 << 20) >> 20;
+- simm12b_0 = (imm12b_0 ^ 0x800) - 0x800;
- *valp = simm12b_0;
+ unsigned simm12b_out_0;
+ unsigned simm12b_in_0;
@@ -5099,7 +6092,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned label8_0, imm8_0;
- imm8_0 = *valp & 0xff;
-- label8_0 = 0x4 + (((int) imm8_0 << 24) >> 24);
+- label8_0 = 0x4 + ((imm8_0 ^ 0x80) - 0x80);
- *valp = label8_0;
+ unsigned label8_out_0;
+ unsigned label8_in_0;
@@ -5215,7 +6208,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned label12_0, imm12_0;
- imm12_0 = *valp & 0xfff;
-- label12_0 = 0x4 + (((int) imm12_0 << 20) >> 20);
+- label12_0 = 0x4 + ((imm12_0 ^ 0x800) - 0x800);
- *valp = label12_0;
+ unsigned uimm16x4_out_0;
+ unsigned uimm16x4_in_0;
@@ -5273,7 +6266,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned soffset_0, offset_0;
- offset_0 = *valp & 0x3ffff;
-- soffset_0 = 0x4 + (((int) offset_0 << 14) >> 14);
+- soffset_0 = 0x4 + ((offset_0 ^ 0x20000) - 0x20000);
- *valp = soffset_0;
+ unsigned s_out_0;
+ unsigned s_in_0;
@@ -5320,7 +6313,7 @@ Index: bfd/xtensa-modules.c
-{
- unsigned uimm16x4_0, imm16_0;
- imm16_0 = *valp & 0xffff;
-- uimm16x4_0 = (((0xffff) << 16) | imm16_0) << 2;
+- uimm16x4_0 = (0xffff0000 | imm16_0) << 2;
- *valp = uimm16x4_0;
- return 0;
-}
@@ -5903,7 +6896,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned xt_wbr15_label_0, xt_wbr15_imm_0;
- xt_wbr15_imm_0 = *valp & 0x7fff;
-- xt_wbr15_label_0 = 0x4 + (((int) xt_wbr15_imm_0 << 17) >> 17);
+- xt_wbr15_label_0 = 0x4 + ((xt_wbr15_imm_0 ^ 0x4000) - 0x4000);
- *valp = xt_wbr15_label_0;
+ *valp -= pc;
return 0;
@@ -5943,7 +6936,7 @@ Index: bfd/xtensa-modules.c
{
- unsigned xt_wbr18_label_0, xt_wbr18_imm_0;
- xt_wbr18_imm_0 = *valp & 0x3ffff;
-- xt_wbr18_label_0 = 0x4 + (((int) xt_wbr18_imm_0 << 14) >> 14);
+- xt_wbr18_label_0 = 0x4 + ((xt_wbr18_imm_0 ^ 0x20000) - 0x20000);
- *valp = xt_wbr18_label_0;
+ *valp -= pc;
return 0;
@@ -7403,7 +8396,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_call12_stateArgs[] = {
-@@ -5588,8 +5872,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call12_sta
+@@ -5192,8 +5872,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call12_sta
};

static xtensa_arg_internal Iclass_xt_iclass_call8_args[] = {
@@ -7414,7 +8407,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_call8_stateArgs[] = {
-@@ -5597,8 +5881,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call8_stat
+@@ -5201,8 +5881,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call8_stat
};

static xtensa_arg_internal Iclass_xt_iclass_call4_args[] = {
@@ -7425,7 +8418,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_call4_stateArgs[] = {
-@@ -5606,8 +5890,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call4_stat
+@@ -5210,8 +5890,8 @@ static xtensa_arg_internal Iclass_xt_iclass_call4_stat
};

static xtensa_arg_internal Iclass_xt_iclass_callx12_args[] = {
@@ -7436,7 +8429,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_callx12_stateArgs[] = {
-@@ -5615,8 +5899,8 @@ static xtensa_arg_internal Iclass_xt_iclass_callx12_st
+@@ -5219,8 +5899,8 @@ static xtensa_arg_internal Iclass_xt_iclass_callx12_st
};

static xtensa_arg_internal Iclass_xt_iclass_callx8_args[] = {
@@ -7447,7 +8440,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_callx8_stateArgs[] = {
-@@ -5624,8 +5908,8 @@ static xtensa_arg_internal Iclass_xt_iclass_callx8_sta
+@@ -5228,8 +5908,8 @@ static xtensa_arg_internal Iclass_xt_iclass_callx8_sta
};

static xtensa_arg_internal Iclass_xt_iclass_callx4_args[] = {
@@ -7458,7 +8451,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_callx4_stateArgs[] = {
-@@ -5633,9 +5917,9 @@ static xtensa_arg_internal Iclass_xt_iclass_callx4_sta
+@@ -5237,9 +5917,9 @@ static xtensa_arg_internal Iclass_xt_iclass_callx4_sta
};

static xtensa_arg_internal Iclass_xt_iclass_entry_args[] = {
@@ -7471,7 +8464,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_entry_stateArgs[] = {
-@@ -5647,8 +5931,8 @@ static xtensa_arg_internal Iclass_xt_iclass_entry_stat
+@@ -5251,8 +5931,8 @@ static xtensa_arg_internal Iclass_xt_iclass_entry_stat
};

static xtensa_arg_internal Iclass_xt_iclass_movsp_args[] = {
@@ -7482,7 +8475,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_movsp_stateArgs[] = {
-@@ -5657,162 +5941,138 @@ static xtensa_arg_internal Iclass_xt_iclass_movsp_stat
+@@ -5261,162 +5941,138 @@ static xtensa_arg_internal Iclass_xt_iclass_movsp_stat
};

static xtensa_arg_internal Iclass_xt_iclass_rotw_args[] = {
@@ -7681,7 +8674,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_rur_threadptr_stateArgs[] = {
-@@ -5820,7 +6080,7 @@ static xtensa_arg_internal Iclass_rur_threadptr_stateA
+@@ -5424,7 +6080,7 @@ static xtensa_arg_internal Iclass_rur_threadptr_stateA
};

static xtensa_arg_internal Iclass_wur_threadptr_args[] = {
@@ -7690,7 +8683,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_wur_threadptr_stateArgs[] = {
-@@ -5828,120 +6088,115 @@ static xtensa_arg_internal Iclass_wur_threadptr_stateA
+@@ -5432,120 +6088,115 @@ static xtensa_arg_internal Iclass_wur_threadptr_stateA
};

static xtensa_arg_internal Iclass_xt_iclass_addi_args[] = {
@@ -7863,7 +8856,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_loop_stateArgs[] = {
-@@ -5951,8 +6206,8 @@ static xtensa_arg_internal Iclass_xt_iclass_loop_state
+@@ -5555,8 +6206,8 @@ static xtensa_arg_internal Iclass_xt_iclass_loop_state
};

static xtensa_arg_internal Iclass_xt_iclass_loopz_args[] = {
@@ -7874,7 +8867,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_loopz_stateArgs[] = {
-@@ -5962,45 +6217,51 @@ static xtensa_arg_internal Iclass_xt_iclass_loopz_stat
+@@ -5566,45 +6217,51 @@ static xtensa_arg_internal Iclass_xt_iclass_loopz_stat
};

static xtensa_arg_internal Iclass_xt_iclass_movi_args[] = {
@@ -7944,7 +8937,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_sar_stateArgs[] = {
-@@ -6008,7 +6269,7 @@ static xtensa_arg_internal Iclass_xt_iclass_sar_stateA
+@@ -5612,7 +6269,7 @@ static xtensa_arg_internal Iclass_xt_iclass_sar_stateA
};

static xtensa_arg_internal Iclass_xt_iclass_sari_args[] = {
@@ -7953,7 +8946,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_sari_stateArgs[] = {
-@@ -6016,8 +6277,8 @@ static xtensa_arg_internal Iclass_xt_iclass_sari_state
+@@ -5620,8 +6277,8 @@ static xtensa_arg_internal Iclass_xt_iclass_sari_state
};

static xtensa_arg_internal Iclass_xt_iclass_shifts_args[] = {
@@ -7964,7 +8957,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_shifts_stateArgs[] = {
-@@ -6025,9 +6286,9 @@ static xtensa_arg_internal Iclass_xt_iclass_shifts_sta
+@@ -5629,9 +6286,9 @@ static xtensa_arg_internal Iclass_xt_iclass_shifts_sta
};

static xtensa_arg_internal Iclass_xt_iclass_shiftst_args[] = {
@@ -7977,7 +8970,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_shiftst_stateArgs[] = {
-@@ -6035,8 +6296,8 @@ static xtensa_arg_internal Iclass_xt_iclass_shiftst_st
+@@ -5639,8 +6296,8 @@ static xtensa_arg_internal Iclass_xt_iclass_shiftst_st
};

static xtensa_arg_internal Iclass_xt_iclass_shiftt_args[] = {
@@ -7988,7 +8981,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_shiftt_stateArgs[] = {
-@@ -6044,21 +6305,21 @@ static xtensa_arg_internal Iclass_xt_iclass_shiftt_sta
+@@ -5648,21 +6305,21 @@ static xtensa_arg_internal Iclass_xt_iclass_shiftt_sta
};

static xtensa_arg_internal Iclass_xt_iclass_slli_args[] = {
@@ -8019,7 +9012,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_sync_stateArgs[] = {
-@@ -6066,22 +6327,21 @@ static xtensa_arg_internal Iclass_xt_iclass_sync_state
+@@ -5670,22 +6327,21 @@ static xtensa_arg_internal Iclass_xt_iclass_sync_state
};

static xtensa_arg_internal Iclass_xt_iclass_rsil_args[] = {
@@ -8045,7 +9038,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_lend_stateArgs[] = {
-@@ -6089,7 +6349,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lend_s
+@@ -5693,7 +6349,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lend_s
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lend_args[] = {
@@ -8054,7 +9047,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lend_stateArgs[] = {
-@@ -6097,7 +6357,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lend_s
+@@ -5701,7 +6357,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lend_s
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lend_args[] = {
@@ -8063,7 +9056,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lend_stateArgs[] = {
-@@ -6105,7 +6365,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lend_s
+@@ -5709,7 +6365,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lend_s
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_lcount_args[] = {
@@ -8072,7 +9065,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_lcount_stateArgs[] = {
-@@ -6113,7 +6373,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lcount
+@@ -5717,7 +6373,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lcount
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lcount_args[] = {
@@ -8081,7 +9074,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lcount_stateArgs[] = {
-@@ -6122,7 +6382,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lcount
+@@ -5726,7 +6382,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lcount
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lcount_args[] = {
@@ -8090,7 +9083,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lcount_stateArgs[] = {
-@@ -6131,7 +6391,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lcount
+@@ -5735,7 +6391,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lcount
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_lbeg_args[] = {
@@ -8099,7 +9092,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_lbeg_stateArgs[] = {
-@@ -6139,7 +6399,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lbeg_s
+@@ -5743,7 +6399,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_lbeg_s
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lbeg_args[] = {
@@ -8108,7 +9101,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_lbeg_stateArgs[] = {
-@@ -6147,7 +6407,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lbeg_s
+@@ -5751,7 +6407,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_lbeg_s
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lbeg_args[] = {
@@ -8117,7 +9110,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_lbeg_stateArgs[] = {
-@@ -6155,7 +6415,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lbeg_s
+@@ -5759,7 +6415,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_lbeg_s
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_sar_args[] = {
@@ -8126,7 +9119,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_sar_stateArgs[] = {
-@@ -6163,7 +6423,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_sar_st
+@@ -5767,7 +6423,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_sar_st
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_sar_args[] = {
@@ -8135,7 +9128,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_sar_stateArgs[] = {
-@@ -6172,953 +6432,798 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_sar_st
+@@ -5776,953 +6432,798 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_sar_st
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_sar_args[] = {
@@ -9227,7 +10220,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_aa_stateArgs[] = {
-@@ -7126,8 +7231,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_aa_s
+@@ -6730,8 +7231,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_aa_s
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_ad_args[] = {
@@ -9238,7 +10231,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_ad_stateArgs[] = {
-@@ -7135,8 +7240,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_ad_s
+@@ -6739,8 +7240,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_ad_s
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_da_args[] = {
@@ -9249,7 +10242,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_da_stateArgs[] = {
-@@ -7144,8 +7249,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_da_s
+@@ -6748,8 +7249,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_da_s
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_dd_args[] = {
@@ -9260,7 +10253,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_dd_stateArgs[] = {
-@@ -7153,8 +7258,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_dd_s
+@@ -6757,8 +7258,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16_dd_s
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_aa_args[] = {
@@ -9271,7 +10264,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_aa_stateArgs[] = {
-@@ -7162,8 +7267,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_aa_
+@@ -6766,8 +7267,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_aa_
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_ad_args[] = {
@@ -9282,7 +10275,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_ad_stateArgs[] = {
-@@ -7171,8 +7276,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_ad_
+@@ -6775,8 +7276,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_ad_
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_da_args[] = {
@@ -9293,7 +10286,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_da_stateArgs[] = {
-@@ -7180,8 +7285,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_da_
+@@ -6784,8 +7285,8 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_da_
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_dd_args[] = {
@@ -9304,7 +10297,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16a_dd_stateArgs[] = {
-@@ -7189,10 +7294,10 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_dd_
+@@ -6793,10 +7294,10 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16a_dd_
};

static xtensa_arg_internal Iclass_xt_iclass_mac16al_da_args[] = {
@@ -9319,7 +10312,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16al_da_stateArgs[] = {
-@@ -7200,10 +7305,10 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16al_da
+@@ -6804,10 +7305,10 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16al_da
};

static xtensa_arg_internal Iclass_xt_iclass_mac16al_dd_args[] = {
@@ -9334,7 +10327,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_mac16al_dd_stateArgs[] = {
-@@ -7211,78 +7316,72 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16al_dd
+@@ -6815,78 +7316,72 @@ static xtensa_arg_internal Iclass_xt_iclass_mac16al_dd
};

static xtensa_arg_internal Iclass_xt_iclass_mac16_l_args[] = {
@@ -9440,7 +10433,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_acclo_stateArgs[] = {
-@@ -7290,7 +7389,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_acclo_
+@@ -6894,7 +7389,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_acclo_
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_acclo_args[] = {
@@ -9449,7 +10442,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_acclo_stateArgs[] = {
-@@ -7298,7 +7397,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_acclo_
+@@ -6902,7 +7397,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_acclo_
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_acclo_args[] = {
@@ -9458,7 +10451,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_acclo_stateArgs[] = {
-@@ -7306,7 +7405,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_acclo_
+@@ -6910,7 +7405,7 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_acclo_
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_acchi_args[] = {
@@ -9467,7 +10460,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_acchi_stateArgs[] = {
-@@ -7314,7 +7413,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_acchi_
+@@ -6918,7 +7413,7 @@ static xtensa_arg_internal Iclass_xt_iclass_rsr_acchi_
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_acchi_args[] = {
@@ -9476,7 +10469,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_acchi_stateArgs[] = {
-@@ -7322,7 +7421,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_acchi_
+@@ -6926,7 +7421,7 @@ static xtensa_arg_internal Iclass_xt_iclass_wsr_acchi_
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_acchi_args[] = {
@@ -9485,7 +10478,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_xsr_acchi_stateArgs[] = {
-@@ -7330,16 +7429,15 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_acchi_
+@@ -6934,16 +7429,15 @@ static xtensa_arg_internal Iclass_xt_iclass_xsr_acchi_
};

static xtensa_arg_internal Iclass_xt_iclass_rfi_args[] = {
@@ -9504,7 +10497,7 @@ Index: bfd/xtensa-modules.c
{ { STATE_PSINTLEVEL }, 'o' },
{ { STATE_EPC1 }, 'i' },
{ { STATE_EPC2 }, 'i' },
-@@ -7358,80 +7456,66 @@ static xtensa_arg_internal Iclass_xt_iclass_rfi_stateA
+@@ -6962,80 +7456,66 @@ static xtensa_arg_internal Iclass_xt_iclass_rfi_stateA
};

static xtensa_arg_internal Iclass_xt_iclass_wait_args[] = {
@@ -9594,7 +10587,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_break_stateArgs[] = {
-@@ -7440,7 +7524,7 @@ static xtensa_arg_internal Iclass_xt_iclass_break_stat
+@@ -7044,7 +7524,7 @@ static xtensa_arg_internal Iclass_xt_iclass_break_stat
};

static xtensa_arg_internal Iclass_xt_iclass_break_n_args[] = {
@@ -9603,7 +10596,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_break_n_stateArgs[] = {
-@@ -7449,352 +7533,305 @@ static xtensa_arg_internal Iclass_xt_iclass_break_n_st
+@@ -7053,352 +7533,305 @@ static xtensa_arg_internal Iclass_xt_iclass_break_n_st
};

static xtensa_arg_internal Iclass_xt_iclass_rsr_dbreaka0_args[] = {
@@ -10009,7 +11002,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_xt_iclass_rfdo_stateArgs[] = {
-@@ -7803,7 +7840,6 @@ static xtensa_arg_internal Iclass_xt_iclass_rfdo_state
+@@ -7407,7 +7840,6 @@ static xtensa_arg_internal Iclass_xt_iclass_rfdo_state
{ { STATE_PSWOE }, 'o' },
{ { STATE_PSCALLINC }, 'o' },
{ { STATE_PSOWB }, 'o' },
@@ -10017,7 +11010,7 @@ Index: bfd/xtensa-modules.c
{ { STATE_PSUM }, 'o' },
{ { STATE_PSEXCM }, 'o' },
{ { STATE_PSINTLEVEL }, 'o' },
-@@ -7815,613 +7851,501 @@ static xtensa_arg_internal Iclass_xt_iclass_rfdd_state
+@@ -7419,613 +7851,501 @@ static xtensa_arg_internal Iclass_xt_iclass_rfdd_state
};

static xtensa_arg_internal Iclass_xt_iclass_wsr_mmid_args[] = {
@@ -10861,7 +11854,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_rur_fcr_stateArgs[] = {
-@@ -8437,7 +8361,7 @@ static xtensa_arg_internal Iclass_rur_fcr_stateArgs[]
+@@ -8041,7 +8361,7 @@ static xtensa_arg_internal Iclass_rur_fcr_stateArgs[]
};

static xtensa_arg_internal Iclass_wur_fcr_args[] = {
@@ -10870,7 +11863,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_wur_fcr_stateArgs[] = {
-@@ -8453,7 +8377,7 @@ static xtensa_arg_internal Iclass_wur_fcr_stateArgs[]
+@@ -8057,7 +8377,7 @@ static xtensa_arg_internal Iclass_wur_fcr_stateArgs[]
};

static xtensa_arg_internal Iclass_rur_fsr_args[] = {
@@ -10879,7 +11872,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_rur_fsr_stateArgs[] = {
-@@ -8468,7 +8392,7 @@ static xtensa_arg_internal Iclass_rur_fsr_stateArgs[]
+@@ -8072,7 +8392,7 @@ static xtensa_arg_internal Iclass_rur_fsr_stateArgs[]
};

static xtensa_arg_internal Iclass_wur_fsr_args[] = {
@@ -10888,7 +11881,7 @@ Index: bfd/xtensa-modules.c
};

static xtensa_arg_internal Iclass_wur_fsr_stateArgs[] = {
-@@ -8482,226 +8406,164 @@ static xtensa_arg_internal Iclass_wur_fsr_stateArgs[]
+@@ -8086,226 +8406,164 @@ static xtensa_arg_internal Iclass_wur_fsr_stateArgs[]
{ { STATE_CPENABLE }, 'i' }
};

@@ -11242,7 +12235,7 @@ Index: bfd/xtensa-modules.c
{ 2, Iclass_xt_iclass_call12_args,
1, Iclass_xt_iclass_call12_stateArgs, 0, 0 },
{ 2, Iclass_xt_iclass_call8_args,
-@@ -8719,27 +8581,27 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8323,27 +8581,27 @@ static xtensa_iclass_internal iclasses[] = {
{ 2, Iclass_xt_iclass_movsp_args,
2, Iclass_xt_iclass_movsp_stateArgs, 0, 0 },
{ 1, Iclass_xt_iclass_rotw_args,
@@ -11281,7 +12274,7 @@ Index: bfd/xtensa-modules.c
{ 3, Iclass_xt_iclass_add_n_args,
0, 0, 0, 0 },
{ 3, Iclass_xt_iclass_addi_n_args,
-@@ -8801,7 +8663,7 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8405,7 +8663,7 @@ static xtensa_iclass_internal iclasses[] = {
{ 3, Iclass_xt_iclass_l32i_args,
0, 0, 0, 0 },
{ 2, Iclass_xt_iclass_l32r_args,
@@ -11290,7 +12283,7 @@ Index: bfd/xtensa-modules.c
{ 3, Iclass_xt_iclass_l8i_args,
0, 0, 0, 0 },
{ 2, Iclass_xt_iclass_loop_args,
-@@ -8818,10 +8680,14 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8422,10 +8680,14 @@ static xtensa_iclass_internal iclasses[] = {
0, 0, 0, 0 },
{ 1, Iclass_xt_iclass_return_args,
0, 0, 0, 0 },
@@ -11305,7 +12298,7 @@ Index: bfd/xtensa-modules.c
{ 3, Iclass_xt_iclass_s8i_args,
0, 0, 0, 0 },
{ 1, Iclass_xt_iclass_sar_args,
-@@ -8849,7 +8715,7 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8453,7 +8715,7 @@ static xtensa_iclass_internal iclasses[] = {
{ 0, 0 /* xt_iclass_sync */,
1, Iclass_xt_iclass_sync_stateArgs, 0, 0 },
{ 2, Iclass_xt_iclass_rsil_args,
@@ -11314,7 +12307,7 @@ Index: bfd/xtensa-modules.c
{ 1, Iclass_xt_iclass_rsr_lend_args,
1, Iclass_xt_iclass_rsr_lend_stateArgs, 0, 0 },
{ 1, Iclass_xt_iclass_wsr_lend_args,
-@@ -8874,192 +8740,206 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8478,192 +8740,206 @@ static xtensa_iclass_internal iclasses[] = {
2, Iclass_xt_iclass_wsr_sar_stateArgs, 0, 0 },
{ 1, Iclass_xt_iclass_xsr_sar_args,
1, Iclass_xt_iclass_xsr_sar_stateArgs, 0, 0 },
@@ -11616,7 +12609,7 @@ Index: bfd/xtensa-modules.c
{ 2, Iclass_xt_iclass_mac16_aa_args,
1, Iclass_xt_iclass_mac16_aa_stateArgs, 0, 0 },
{ 2, Iclass_xt_iclass_mac16_ad_args,
-@@ -9082,8 +8962,6 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8686,8 +8962,6 @@ static xtensa_iclass_internal iclasses[] = {
1, Iclass_xt_iclass_mac16al_dd_stateArgs, 0, 0 },
{ 2, Iclass_xt_iclass_mac16_l_args,
0, 0, 0, 0 },
@@ -11625,7 +12618,7 @@ Index: bfd/xtensa-modules.c
{ 2, Iclass_xt_iclass_rsr_m0_args,
0, 0, 0, 0 },
{ 2, Iclass_xt_iclass_wsr_m0_args,
-@@ -9121,97 +8999,101 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8725,97 +8999,101 @@ static xtensa_iclass_internal iclasses[] = {
{ 1, Iclass_xt_iclass_xsr_acchi_args,
1, Iclass_xt_iclass_xsr_acchi_stateArgs, 0, 0 },
{ 1, Iclass_xt_iclass_rfi_args,
@@ -11770,7 +12763,7 @@ Index: bfd/xtensa-modules.c
{ 3, Iclass_xt_iclass_bbool1_args,
0, 0, 0, 0 },
{ 2, Iclass_xt_iclass_bbool4_args,
-@@ -9229,101 +9111,47 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8833,101 +9111,47 @@ static xtensa_iclass_internal iclasses[] = {
{ 2, Iclass_xt_iclass_XSR_BR_args,
0, 0, 0, 0 },
{ 1, Iclass_xt_iclass_rsr_ccount_args,
@@ -11893,7 +12886,7 @@ Index: bfd/xtensa-modules.c
{ 3, Iclass_xt_iclass_clamp_args,
0, 0, 0, 0 },
{ 3, Iclass_xt_iclass_minmax_args,
-@@ -9337,17 +9165,57 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8941,17 +9165,57 @@ static xtensa_iclass_internal iclasses[] = {
{ 3, Iclass_xt_iclass_s32ri_args,
0, 0, 0, 0 },
{ 3, Iclass_xt_iclass_s32c1i_args,
@@ -11953,7 +12946,7 @@ Index: bfd/xtensa-modules.c
{ 1, Iclass_rur_fcr_args,
9, Iclass_rur_fcr_stateArgs, 0, 0 },
{ 1, Iclass_wur_fcr_args,
-@@ -9356,580 +9224,1023 @@ static xtensa_iclass_internal iclasses[] = {
+@@ -8960,580 +9224,1023 @@ static xtensa_iclass_internal iclasses[] = {
8, Iclass_rur_fsr_stateArgs, 0, 0 },
{ 1, Iclass_wur_fsr_args,
8, Iclass_wur_fsr_stateArgs, 0, 0 },
@@ -13196,7 +14189,7 @@ Index: bfd/xtensa-modules.c
Opcode_beqi_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x26;
-@@ -10092,18 +10403,6 @@ Opcode_extui_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -9696,18 +10403,6 @@ Opcode_extui_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -13215,7 +14208,7 @@ Index: bfd/xtensa-modules.c
Opcode_ill_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0;
-@@ -10116,84 +10415,42 @@ Opcode_j_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -9720,84 +10415,42 @@ Opcode_j_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -13300,7 +14293,7 @@ Index: bfd/xtensa-modules.c
Opcode_loop_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x8076;
-@@ -10218,190 +10475,75 @@ Opcode_movi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -9822,190 +10475,75 @@ Opcode_movi_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -13497,7 +14490,7 @@ Index: bfd/xtensa-modules.c
}

static void
-@@ -10411,228 +10553,78 @@ Opcode_s8i_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -10015,228 +10553,78 @@ Opcode_s8i_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -13726,7 +14719,7 @@ Index: bfd/xtensa-modules.c
Opcode_memw_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x20c0;
-@@ -10747,6 +10739,24 @@ Opcode_xsr_sar_Slot_inst_encode (xtensa_insnbuf slotbu
+@@ -10351,6 +10739,24 @@ Opcode_xsr_sar_Slot_inst_encode (xtensa_insnbuf slotbu
}

static void
@@ -13751,7 +14744,7 @@ Index: bfd/xtensa-modules.c
Opcode_rsr_litbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x30500;
-@@ -10765,14 +10775,20 @@ Opcode_xsr_litbase_Slot_inst_encode (xtensa_insnbuf sl
+@@ -10369,14 +10775,20 @@ Opcode_xsr_litbase_Slot_inst_encode (xtensa_insnbuf sl
}

static void
@@ -13774,7 +14767,7 @@ Index: bfd/xtensa-modules.c
slotbuf[0] = 0x3d000;
}

-@@ -11305,6 +11321,36 @@ Opcode_xsr_vecbase_Slot_inst_encode (xtensa_insnbuf sl
+@@ -10909,6 +11321,36 @@ Opcode_xsr_vecbase_Slot_inst_encode (xtensa_insnbuf sl
}

static void
@@ -13811,7 +14804,7 @@ Index: bfd/xtensa-modules.c
Opcode_mul_aa_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x740004;
-@@ -11725,42 +11771,6 @@ Opcode_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -11329,42 +11771,6 @@ Opcode_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -13854,7 +14847,7 @@ Index: bfd/xtensa-modules.c
Opcode_rsr_m0_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x32000;
-@@ -12127,6 +12137,18 @@ Opcode_xsr_ddr_Slot_inst_encode (xtensa_insnbuf slotbu
+@@ -11731,6 +12137,18 @@ Opcode_xsr_ddr_Slot_inst_encode (xtensa_insnbuf slotbu
}

static void
@@ -13873,7 +14866,7 @@ Index: bfd/xtensa-modules.c
Opcode_rfdo_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0xf1e000;
-@@ -12313,228 +12335,6 @@ Opcode_xsr_ccompare2_Slot_inst_encode (xtensa_insnbuf
+@@ -11917,228 +12335,6 @@ Opcode_xsr_ccompare2_Slot_inst_encode (xtensa_insnbuf
}

static void
@@ -14102,7 +15095,7 @@ Index: bfd/xtensa-modules.c
Opcode_idtlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x50c000;
-@@ -12595,24 +12395,6 @@ Opcode_witlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+@@ -12199,24 +12395,6 @@ Opcode_witlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
}

static void
@@ -14127,7 +15120,7 @@ Index: bfd/xtensa-modules.c
Opcode_rsr_cpenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0x3e000;
-@@ -12637,108 +12419,48 @@ Opcode_clamps_Slot_inst_encode (xtensa_insnbuf slotbuf
+@@ -12241,108 +12419,48 @@ Opcode_clamps_Slot_inst_encode (xtensa_insnbuf slotbuf
}

static void
@@ -14236,7 +15229,7 @@ Index: bfd/xtensa-modules.c
Opcode_l32ai_Slot_inst_encode (xtensa_insnbuf slotbuf)
{
slotbuf[0] = 0xb002;
-@@ -12775,6291 +12497,5794 @@ Opcode_xsr_scompare1_Slot_inst_encode (xtensa_insnbuf
+@@ -12379,6291 +12497,5794 @@ Opcode_xsr_scompare1_Slot_inst_encode (xtensa_insnbuf
}

static void
@@ -23855,7 +24848,7 @@ Index: bfd/xtensa-modules.c
return 0;
}

-@@ -19070,7 +18295,6 @@ static void
+@@ -18674,7 +18295,6 @@ static void
Slot_x24_Format_inst_0_get (const xtensa_insnbuf insn,
xtensa_insnbuf slotbuf)
{
@@ -23863,7 +24856,7 @@ Index: bfd/xtensa-modules.c
slotbuf[0] = (insn[0] & 0xffffff);
}

-@@ -19085,7 +18309,6 @@ static void
+@@ -18689,7 +18309,6 @@ static void
Slot_x16a_Format_inst16a_0_get (const xtensa_insnbuf insn,
xtensa_insnbuf slotbuf)
{
@@ -23871,7 +24864,7 @@ Index: bfd/xtensa-modules.c
slotbuf[0] = (insn[0] & 0xffff);
}

-@@ -19100,7 +18323,6 @@ static void
+@@ -18704,7 +18323,6 @@ static void
Slot_x16b_Format_inst16b_0_get (const xtensa_insnbuf insn,
xtensa_insnbuf slotbuf)
{
@@ -23879,7 +24872,7 @@ Index: bfd/xtensa-modules.c
slotbuf[0] = (insn[0] & 0xffff);
}

-@@ -19111,86 +18333,6 @@ Slot_x16b_Format_inst16b_0_set (xtensa_insnbuf insn,
+@@ -18715,86 +18333,6 @@ Slot_x16b_Format_inst16b_0_set (xtensa_insnbuf insn,
insn[0] = (insn[0] & ~0xffff) | (slotbuf[0] & 0xffff);
}

@@ -23966,7 +24959,7 @@ Index: bfd/xtensa-modules.c
static xtensa_get_field_fn
Slot_inst_get_field_fns[] = {
Field_t_Slot_inst_get,
-@@ -19248,74 +18390,22 @@ Slot_inst_get_field_fns[] = {
+@@ -18852,74 +18390,22 @@ Slot_inst_get_field_fns[] = {
Field_r8_Slot_inst_get,
Field_xt_wbr15_imm_Slot_inst_get,
Field_xt_wbr18_imm_Slot_inst_get,
@@ -24057,7 +25050,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_ar0_get,
Implicit_Field_ar4_get,
Implicit_Field_ar8_get,
-@@ -19387,74 +18477,22 @@ Slot_inst_set_field_fns[] = {
+@@ -18991,74 +18477,22 @@ Slot_inst_set_field_fns[] = {
Field_r8_Slot_inst_set,
Field_xt_wbr15_imm_Slot_inst_set,
Field_xt_wbr18_imm_Slot_inst_set,
@@ -24148,7 +25141,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_set,
Implicit_Field_set,
Implicit_Field_set,
-@@ -19528,72 +18566,20 @@ Slot_inst16a_get_field_fns[] = {
+@@ -19132,72 +18566,20 @@ Slot_inst16a_get_field_fns[] = {
0,
0,
0,
@@ -24229,7 +25222,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_ar0_get,
Implicit_Field_ar4_get,
Implicit_Field_ar8_get,
-@@ -19667,72 +18653,20 @@ Slot_inst16a_set_field_fns[] = {
+@@ -19271,72 +18653,20 @@ Slot_inst16a_set_field_fns[] = {
0,
0,
0,
@@ -24310,7 +25303,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_set,
Implicit_Field_set,
Implicit_Field_set,
-@@ -19806,72 +18740,20 @@ Slot_inst16b_get_field_fns[] = {
+@@ -19410,72 +18740,20 @@ Slot_inst16b_get_field_fns[] = {
0,
0,
0,
@@ -24391,7 +25384,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_ar0_get,
Implicit_Field_ar4_get,
Implicit_Field_ar8_get,
-@@ -19945,72 +18827,20 @@ Slot_inst16b_set_field_fns[] = {
+@@ -19549,72 +18827,20 @@ Slot_inst16b_set_field_fns[] = {
0,
0,
0,
@@ -24472,7 +25465,7 @@ Index: bfd/xtensa-modules.c
Implicit_Field_set,
Implicit_Field_set,
Implicit_Field_set,
-@@ -20025,1118 +18855,6 @@ Slot_inst16b_set_field_fns[] = {
+@@ -19629,1118 +18855,6 @@ Slot_inst16b_set_field_fns[] = {
Implicit_Field_set
};

@@ -25591,7 +26584,7 @@ Index: bfd/xtensa-modules.c
static xtensa_slot_internal slots[] = {
{ "Inst", "x24", 0,
Slot_x24_Format_inst_0_get, Slot_x24_Format_inst_0_set,
-@@ -21149,27 +18867,7 @@ static xtensa_slot_internal slots[] = {
+@@ -20753,27 +18867,7 @@ static xtensa_slot_internal slots[] = {
{ "Inst16b", "x16b", 0,
Slot_x16b_Format_inst16b_0_get, Slot_x16b_Format_inst16b_0_set,
Slot_inst16b_get_field_fns, Slot_inst16b_set_field_fns,
@@ -25620,7 +26613,7 @@ Index: bfd/xtensa-modules.c
};


-@@ -21179,73 +18877,46 @@ static void
+@@ -20783,73 +18877,46 @@ static void
Format_x24_encode (xtensa_insnbuf insn)
{
insn[0] = 0;
@@ -25699,7 +26692,7 @@ Index: bfd/xtensa-modules.c
3,
3,
3,
-@@ -21260,15 +18931,255 @@ static int length_table[16] = {
+@@ -20864,15 +18931,255 @@ static int length_table[16] = {
2,
2,
2,
@@ -25959,7 +26952,7 @@ Index: bfd/xtensa-modules.c
}


-@@ -21276,17 +19187,17 @@ length_decoder (const unsigned char *insn)
+@@ -20880,17 +19187,17 @@ length_decoder (const unsigned char *insn)

xtensa_isa_internal xtensa_modules = {
0 /* little-endian */,
Index: gdb/patches/patch-gdb_gdbserver_xtensa-regmap_c
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/patches/patch-gdb_gdbserver_xtensa-regmap_c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-gdb_gdbserver_xtensa-regmap_c
--- gdb/patches/patch-gdb_gdbserver_xtensa-regmap_c 11 Mar 2020 14:24:58 -0000 1.1.1.1
+++ gdb/patches/patch-gdb_gdbserver_xtensa-regmap_c 1 Nov 2021 16:39:23 -0000
@@ -1,5 +1,7 @@
$OpenBSD: patch-gdb_gdbserver_xtensa-regmap_c,v 1.1.1.1 2020/03/11 14:24:58 tracey Exp $

+New file from espressif overlays.
+
Index: gdb/gdbserver/xtensa-regmap.c
--- gdb/gdbserver/xtensa-regmap.c.orig
+++ gdb/gdbserver/xtensa-regmap.c
Index: gdb/patches/patch-gdb_gdbserver_xtensa-xtregs_c
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/patches/patch-gdb_gdbserver_xtensa-xtregs_c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-gdb_gdbserver_xtensa-xtregs_c
--- gdb/patches/patch-gdb_gdbserver_xtensa-xtregs_c 11 Mar 2020 14:24:58 -0000 1.1.1.1
+++ gdb/patches/patch-gdb_gdbserver_xtensa-xtregs_c 1 Nov 2021 16:39:23 -0000
@@ -5,7 +5,7 @@ Index: gdb/gdbserver/xtensa-xtregs.c
+++ gdb/gdbserver/xtensa-xtregs.c
@@ -1,20 +1,25 @@
-/* Table mapping between kernel xtregset and GDB register cache.
-- Copyright (C) 2007-2018 Free Software Foundation, Inc.
+- Copyright (C) 2007-2020 Free Software Foundation, Inc.
+/* Customized table mapping between kernel xtregset and GDB register cache.

- This file is part of GDB.
Index: gdb/patches/patch-gdb_xtensa-config_c
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/patches/patch-gdb_xtensa-config_c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-gdb_xtensa-config_c
--- gdb/patches/patch-gdb_xtensa-config_c 11 Mar 2020 14:24:58 -0000 1.1.1.1
+++ gdb/patches/patch-gdb_xtensa-config_c 1 Nov 2021 16:39:23 -0000
@@ -6,7 +6,7 @@ Index: gdb/xtensa-config.c
@@ -1,64 +1,115 @@
/* Configuration for the Xtensa architecture for GDB, the GNU debugger.

-- Copyright (C) 2003-2018 Free Software Foundation, Inc.
+- Copyright (C) 2003-2020 Free Software Foundation, Inc.
+ Copyright (c) 2003-2016 Tensilica Inc.

- This file is part of GDB.
Index: gdb/patches/patch-gdb_xtensa-xtregs_c
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/patches/patch-gdb_xtensa-xtregs_c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-gdb_xtensa-xtregs_c
--- gdb/patches/patch-gdb_xtensa-xtregs_c 11 Mar 2020 14:24:58 -0000 1.1.1.1
+++ gdb/patches/patch-gdb_xtensa-xtregs_c 1 Nov 2021 16:39:23 -0000
@@ -1,11 +1,13 @@
$OpenBSD: patch-gdb_xtensa-xtregs_c,v 1.1.1.1 2020/03/11 14:24:58 tracey Exp $

+File from espressif overlays.
+
Index: gdb/xtensa-xtregs.c
--- gdb/xtensa-xtregs.c.orig
+++ gdb/xtensa-xtregs.c
@@ -1,39 +1,71 @@
-/* Table mapping between kernel xtregset and GDB register cache.
-- Copyright (C) 2007-2018 Free Software Foundation, Inc.
+- Copyright (C) 2007-2020 Free Software Foundation, Inc.
+/* Customized table mapping between kernel xtregset and GDB register cache.

- This file is part of GDB.
Index: gdb/patches/patch-include_xtensa-config_h
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/patches/patch-include_xtensa-config_h,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-include_xtensa-config_h
--- gdb/patches/patch-include_xtensa-config_h 11 Mar 2020 14:24:58 -0000 1.1.1.1
+++ gdb/patches/patch-include_xtensa-config_h 1 Nov 2021 16:39:23 -0000
@@ -8,7 +8,7 @@ Index: include/xtensa-config.h
+++ include/xtensa-config.h
@@ -1,5 +1,6 @@
/* Xtensa configuration settings.
-- Copyright (C) 2001-2018 Free Software Foundation, Inc.
+- Copyright (C) 2001-2019 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ Free Software Foundation, Inc.
Contributed by Bob Wilson (bob.wilson@acm.org) at Tensilica.
Index: gdb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- gdb/pkg/PLIST 11 Mar 2020 14:24:58 -0000 1.1.1.1
+++ gdb/pkg/PLIST 1 Nov 2021 16:39:23 -0000
@@ -1,42 +1,39 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/03/11 14:24:58 tracey Exp $
-@comment @info info/configure.info
-@comment @info info/standards.info
-@bin bin/xtensa-esp32-elf-gdb
-@comment @info info/as.info
-@comment @info info/binutils.info
-@comment @info info/ld.info
-@comment @info info/gprof.info
-@comment include/gdb/
-@comment include/gdb/jit-reader.h
-@comment @info info/annotate.info
-@comment @info info/bfd.info
-@comment @info info/gdb.info
-@comment @info info/stabs.info
-@comment lib/charset.alias
-@man man/man1/xtensa-esp32-elf-gdb.1
-@man man/man1/xtensa-esp32-elf-gdbserver.1
-@man man/man5/xtensa-esp32-elf-gdbinit.5
-@comment @static-lib xtensa-esp32-elf/lib/libiberty.a
-@comment share/gdb/
-@comment share/gdb/syscalls/
-@comment share/gdb/syscalls/aarch64-linux.xml
-@comment share/gdb/syscalls/amd64-linux.xml
-@comment share/gdb/syscalls/arm-linux.xml
-@comment share/gdb/syscalls/freebsd.xml
-@comment share/gdb/syscalls/gdb-syscalls.dtd
-@comment share/gdb/syscalls/i386-linux.xml
-@comment share/gdb/syscalls/mips-n32-linux.xml
-@comment share/gdb/syscalls/mips-n64-linux.xml
-@comment share/gdb/syscalls/mips-o32-linux.xml
-@comment share/gdb/syscalls/ppc-linux.xml
-@comment share/gdb/syscalls/ppc64-linux.xml
-@comment share/gdb/syscalls/s390-linux.xml
-@comment share/gdb/syscalls/s390x-linux.xml
-@comment share/gdb/syscalls/sparc-linux.xml
-@comment share/gdb/syscalls/sparc64-linux.xml
-@comment share/gdb/system-gdbinit/
-@comment share/gdb/system-gdbinit/elinos.py
-@comment share/gdb/system-gdbinit/wrs-linux.py
-@comment xtensa-esp32-elf/
-@comment xtensa-esp32-elf/lib/
-@static-lib xtensa-esp32-elf/lib/libiberty.a
+@comment $OpenBSD: PLIST,v$
+@bin xtensa-esp32-elf/bin/xtensa-esp32-elf-gdb
+xtensa-esp32-elf/bin/xtensa-esp32-elf-gdb-add-index
+xtensa-esp32-elf/include/
+xtensa-esp32-elf/include/gdb/
+xtensa-esp32-elf/include/gdb/jit-reader.h
+xtensa-esp32-elf/lib/charset.alias
+xtensa-esp32-elf/share/gdb/
+xtensa-esp32-elf/share/gdb/syscalls/
+xtensa-esp32-elf/share/gdb/syscalls/aarch64-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/amd64-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/arm-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/freebsd.xml
+xtensa-esp32-elf/share/gdb/syscalls/gdb-syscalls.dtd
+xtensa-esp32-elf/share/gdb/syscalls/i386-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/mips-n32-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/mips-n64-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/mips-o32-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/ppc-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/ppc64-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/s390-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/s390x-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/sparc-linux.xml
+xtensa-esp32-elf/share/gdb/syscalls/sparc64-linux.xml
+xtensa-esp32-elf/share/gdb/system-gdbinit/
+xtensa-esp32-elf/share/gdb/system-gdbinit/elinos.py
+xtensa-esp32-elf/share/gdb/system-gdbinit/wrs-linux.py
+@info xtensa-esp32-elf/share/info/
+@info xtensa-esp32-elf/share/info/annotate.info
+@comment @info xtensa-esp32-elf/share/info/bfd.info
+@info xtensa-esp32-elf/share/info/gdb.info
+@info xtensa-esp32-elf/share/info/stabs.info
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gdb-add-index.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gdb.1
+@man xtensa-esp32-elf/share/man/man1/xtensa-esp32-elf-gdbserver.1
+xtensa-esp32-elf/share/man/man5/
+@man xtensa-esp32-elf/share/man/man5/xtensa-esp32-elf-gdbinit.5
+xtensa-esp32-elf/xtensa-esp32-elf/lib/
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/libiberty.a
Index: newlib/Makefile
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/newlib/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- newlib/Makefile 29 Oct 2020 14:10:52 -0000 1.3
+++ newlib/Makefile 1 Nov 2021 16:39:23 -0000
@@ -2,21 +2,24 @@

COMMENT = newlib for ${CONFIG} cross-development

-VERSION = 2020.3
+VERSION = 2021.2
PKGNAME = ${CONFIG}-newlib-${VERSION}

GH_ACCOUNT = espressif
GH_PROJECT = newlib-esp32
-GH_TAGNAME = esp-2020r3
+GH_TAGNAME = esp-2021r2

BUILD_DEPENDS = devel/${CONFIG}/binutils \
devel/${CONFIG}/gcc-bootstrap
+RUN_DEPENDS = devel/${CONFIG}/binutils

USE_GROFF = No

-CONFIGURE_ENV = CC_FOR_TARGET="${LOCALBASE}/${CONFIG}/bootstrap/bin/${CONFIG}-gcc"
+CONFIGURE_ENV = CC_FOR_TARGET="${INSTALLDIR}/bootstrap/bin/${CONFIG}-gcc" \
+ AR_FOR_TARGET="${INSTALLDIR}/bin/${CONFIG}-ar" \
+ RANLIB_FOR_TARGET="${INSTALLDIR}/bin/${CONFIG}-ranlib"

-CONFIGURE_ARGS += --with-system-zlib \
+CONFIGURE_ARGS += --enable-multilib \
--enable-newlib-io-float \
--disable-newlib-io-long-double \
--enable-newlib-io-pos-args \
Index: newlib/distinfo
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/newlib/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- newlib/distinfo 29 Oct 2020 14:10:52 -0000 1.2
+++ newlib/distinfo 1 Nov 2021 16:39:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (newlib-esp32-esp-2020r3.tar.gz) = 5kz0WIKsTOm0mdGVeui9VjbcIfNtnwVZj+URmrGbgRw=
-SIZE (newlib-esp32-esp-2020r3.tar.gz) = 21229339
+SHA256 (newlib-esp32-esp-2021r2.tar.gz) = 2uh6DdEM1PEHmAqTzUWJQK4C0+A+/bTTSJufusqfR44=
+SIZE (newlib-esp32-esp-2021r2.tar.gz) = 21919193
Index: newlib/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/xtensa-esp32-elf/newlib/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- newlib/pkg/PLIST 29 Oct 2020 14:10:52 -0000 1.2
+++ newlib/pkg/PLIST 1 Nov 2021 16:39:23 -0000
@@ -1,180 +1,181 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/10/29 14:10:52 tracey Exp $
-xtensa-esp32-elf/
-xtensa-esp32-elf/include/
-xtensa-esp32-elf/include/_ansi.h
-xtensa-esp32-elf/include/_newlib_version.h
-xtensa-esp32-elf/include/_syslist.h
-xtensa-esp32-elf/include/alloca.h
-xtensa-esp32-elf/include/ar.h
-xtensa-esp32-elf/include/argz.h
-xtensa-esp32-elf/include/assert.h
-xtensa-esp32-elf/include/bits/
-xtensa-esp32-elf/include/complex.h
-xtensa-esp32-elf/include/config.h
-xtensa-esp32-elf/include/cpio.h
-xtensa-esp32-elf/include/ctype.h
-xtensa-esp32-elf/include/devctl.h
-xtensa-esp32-elf/include/dirent.h
-xtensa-esp32-elf/include/elf.h
-xtensa-esp32-elf/include/envlock.h
-xtensa-esp32-elf/include/envz.h
-xtensa-esp32-elf/include/errno.h
-xtensa-esp32-elf/include/fastmath.h
-xtensa-esp32-elf/include/fcntl.h
-xtensa-esp32-elf/include/fenv.h
-xtensa-esp32-elf/include/fnmatch.h
-xtensa-esp32-elf/include/getopt.h
-xtensa-esp32-elf/include/glob.h
-xtensa-esp32-elf/include/grp.h
-xtensa-esp32-elf/include/iconv.h
-xtensa-esp32-elf/include/ieeefp.h
-xtensa-esp32-elf/include/inttypes.h
-xtensa-esp32-elf/include/langinfo.h
-xtensa-esp32-elf/include/libgen.h
-xtensa-esp32-elf/include/limits.h
-xtensa-esp32-elf/include/locale.h
-xtensa-esp32-elf/include/machine/
-xtensa-esp32-elf/include/machine/_arc4random.h
-xtensa-esp32-elf/include/machine/_default_types.h
-xtensa-esp32-elf/include/machine/_endian.h
-xtensa-esp32-elf/include/machine/_time.h
-xtensa-esp32-elf/include/machine/_types.h
-xtensa-esp32-elf/include/machine/ansi.h
-xtensa-esp32-elf/include/machine/endian.h
-xtensa-esp32-elf/include/machine/fastmath.h
-xtensa-esp32-elf/include/machine/ieeefp.h
-xtensa-esp32-elf/include/machine/malloc.h
-xtensa-esp32-elf/include/machine/param.h
-xtensa-esp32-elf/include/machine/setjmp-dj.h
-xtensa-esp32-elf/include/machine/setjmp.h
-xtensa-esp32-elf/include/machine/stdlib.h
-xtensa-esp32-elf/include/machine/termios.h
-xtensa-esp32-elf/include/machine/time.h
-xtensa-esp32-elf/include/machine/types.h
-xtensa-esp32-elf/include/malloc.h
-xtensa-esp32-elf/include/math.h
-xtensa-esp32-elf/include/memory.h
-xtensa-esp32-elf/include/newlib.h
-xtensa-esp32-elf/include/paths.h
-xtensa-esp32-elf/include/pthread.h
-xtensa-esp32-elf/include/pwd.h
-xtensa-esp32-elf/include/reent.h
-xtensa-esp32-elf/include/regdef.h
-xtensa-esp32-elf/include/regex.h
-xtensa-esp32-elf/include/rpc/
-xtensa-esp32-elf/include/sched.h
-xtensa-esp32-elf/include/search.h
-xtensa-esp32-elf/include/setjmp.h
-xtensa-esp32-elf/include/signal.h
-xtensa-esp32-elf/include/spawn.h
-xtensa-esp32-elf/include/ssp/
-xtensa-esp32-elf/include/ssp/ssp.h
-xtensa-esp32-elf/include/ssp/stdio.h
-xtensa-esp32-elf/include/ssp/stdlib.h
-xtensa-esp32-elf/include/ssp/string.h
-xtensa-esp32-elf/include/ssp/strings.h
-xtensa-esp32-elf/include/ssp/unistd.h
-xtensa-esp32-elf/include/ssp/wchar.h
-xtensa-esp32-elf/include/stdatomic.h
-xtensa-esp32-elf/include/stdint.h
-xtensa-esp32-elf/include/stdio.h
-xtensa-esp32-elf/include/stdio_ext.h
-xtensa-esp32-elf/include/stdlib.h
-xtensa-esp32-elf/include/string.h
-xtensa-esp32-elf/include/strings.h
-xtensa-esp32-elf/include/sys/
-xtensa-esp32-elf/include/sys/_default_fcntl.h
-xtensa-esp32-elf/include/sys/_intsup.h
-xtensa-esp32-elf/include/sys/_pthreadtypes.h
-xtensa-esp32-elf/include/sys/_sigset.h
-xtensa-esp32-elf/include/sys/_stdint.h
-xtensa-esp32-elf/include/sys/_timespec.h
-xtensa-esp32-elf/include/sys/_timeval.h
-xtensa-esp32-elf/include/sys/_types.h
-xtensa-esp32-elf/include/sys/cdefs.h
-xtensa-esp32-elf/include/sys/config.h
-xtensa-esp32-elf/include/sys/custom_file.h
-xtensa-esp32-elf/include/sys/dir.h
-xtensa-esp32-elf/include/sys/dirent.h
-xtensa-esp32-elf/include/sys/errno.h
-xtensa-esp32-elf/include/sys/fcntl.h
-xtensa-esp32-elf/include/sys/features.h
-xtensa-esp32-elf/include/sys/file.h
-xtensa-esp32-elf/include/sys/iconvnls.h
-xtensa-esp32-elf/include/sys/lock.h
-xtensa-esp32-elf/include/sys/param.h
-xtensa-esp32-elf/include/sys/queue.h
-xtensa-esp32-elf/include/sys/reent.h
-xtensa-esp32-elf/include/sys/resource.h
-xtensa-esp32-elf/include/sys/sched.h
-xtensa-esp32-elf/include/sys/select.h
-xtensa-esp32-elf/include/sys/signal.h
-xtensa-esp32-elf/include/sys/stat.h
-xtensa-esp32-elf/include/sys/stdio.h
-xtensa-esp32-elf/include/sys/string.h
-xtensa-esp32-elf/include/sys/syslimits.h
-xtensa-esp32-elf/include/sys/time.h
-xtensa-esp32-elf/include/sys/timeb.h
-xtensa-esp32-elf/include/sys/times.h
-xtensa-esp32-elf/include/sys/timespec.h
-xtensa-esp32-elf/include/sys/tree.h
-xtensa-esp32-elf/include/sys/types.h
-xtensa-esp32-elf/include/sys/unistd.h
-xtensa-esp32-elf/include/sys/utime.h
-xtensa-esp32-elf/include/sys/wait.h
-xtensa-esp32-elf/include/tar.h
-xtensa-esp32-elf/include/termios.h
-xtensa-esp32-elf/include/tgmath.h
-xtensa-esp32-elf/include/threads.h
-xtensa-esp32-elf/include/time.h
-xtensa-esp32-elf/include/unctrl.h
-xtensa-esp32-elf/include/unistd.h
-xtensa-esp32-elf/include/utime.h
-xtensa-esp32-elf/include/utmp.h
-xtensa-esp32-elf/include/wchar.h
-xtensa-esp32-elf/include/wctype.h
-xtensa-esp32-elf/include/wordexp.h
-xtensa-esp32-elf/include/xlocale.h
-xtensa-esp32-elf/include/xtensa/
-xtensa-esp32-elf/include/xtensa/config/
-xtensa-esp32-elf/include/xtensa/config/core-isa.h
-xtensa-esp32-elf/lib/
-xtensa-esp32-elf/lib/crt0.o
-xtensa-esp32-elf/lib/default.specs
-xtensa-esp32-elf/lib/esp32-psram/
-xtensa-esp32-elf/lib/esp32-psram/crt0.o
-xtensa-esp32-elf/lib/esp32-psram/default.specs
-@static-lib xtensa-esp32-elf/lib/esp32-psram/libc.a
-@static-lib xtensa-esp32-elf/lib/esp32-psram/libg.a
-@static-lib xtensa-esp32-elf/lib/esp32-psram/libgloss.a
-@static-lib xtensa-esp32-elf/lib/esp32-psram/libm.a
-@static-lib xtensa-esp32-elf/lib/esp32-psram/libnosys.a
-xtensa-esp32-elf/lib/esp32-psram/nano.specs
-xtensa-esp32-elf/lib/esp32-psram/no-rtti/
-xtensa-esp32-elf/lib/esp32-psram/no-rtti/crt0.o
-xtensa-esp32-elf/lib/esp32-psram/no-rtti/default.specs
-@static-lib xtensa-esp32-elf/lib/esp32-psram/no-rtti/libc.a
-@static-lib xtensa-esp32-elf/lib/esp32-psram/no-rtti/libg.a
-@static-lib xtensa-esp32-elf/lib/esp32-psram/no-rtti/libgloss.a
-@static-lib xtensa-esp32-elf/lib/esp32-psram/no-rtti/libm.a
-@static-lib xtensa-esp32-elf/lib/esp32-psram/no-rtti/libnosys.a
-xtensa-esp32-elf/lib/esp32-psram/no-rtti/nano.specs
-xtensa-esp32-elf/lib/esp32-psram/no-rtti/nosys.specs
-xtensa-esp32-elf/lib/esp32-psram/nosys.specs
-@static-lib xtensa-esp32-elf/lib/libc.a
-@static-lib xtensa-esp32-elf/lib/libg.a
-@static-lib xtensa-esp32-elf/lib/libgloss.a
-@static-lib xtensa-esp32-elf/lib/libm.a
-@static-lib xtensa-esp32-elf/lib/libnosys.a
-xtensa-esp32-elf/lib/nano.specs
-xtensa-esp32-elf/lib/no-rtti/
-xtensa-esp32-elf/lib/no-rtti/crt0.o
-xtensa-esp32-elf/lib/no-rtti/default.specs
-@static-lib xtensa-esp32-elf/lib/no-rtti/libc.a
-@static-lib xtensa-esp32-elf/lib/no-rtti/libg.a
-@static-lib xtensa-esp32-elf/lib/no-rtti/libgloss.a
-@static-lib xtensa-esp32-elf/lib/no-rtti/libm.a
-@static-lib xtensa-esp32-elf/lib/no-rtti/libnosys.a
-xtensa-esp32-elf/lib/no-rtti/nano.specs
-xtensa-esp32-elf/lib/no-rtti/nosys.specs
-xtensa-esp32-elf/lib/nosys.specs
+@comment $OpenBSD: PLIST,v$
+xtensa-esp32-elf/xtensa-esp32-elf/include/
+xtensa-esp32-elf/xtensa-esp32-elf/include/_ansi.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/_newlib_version.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/_syslist.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/alloca.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ar.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/argz.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/assert.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/bits/
+xtensa-esp32-elf/xtensa-esp32-elf/include/complex.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/config.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/cpio.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ctype.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/devctl.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/dirent.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/elf.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/envlock.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/envz.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/errno.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/fastmath.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/fcntl.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/fenv.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/fnmatch.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/getopt.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/glob.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/grp.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/iconv.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ieeefp.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/inttypes.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/langinfo.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/libgen.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/limits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/locale.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/_arc4random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/_default_types.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/_endian.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/_time.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/_types.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/ansi.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/endian.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/fastmath.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/ieeefp.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/malloc.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/param.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/setjmp-dj.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/setjmp.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/stdlib.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/termios.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/time.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/machine/types.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/malloc.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/math.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/memory.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ndbm.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/newlib.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/paths.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/pthread.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/pwd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/reent.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/regdef.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/regex.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/rpc/
+xtensa-esp32-elf/xtensa-esp32-elf/include/sched.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/search.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/setjmp.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/signal.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/spawn.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ssp/
+xtensa-esp32-elf/xtensa-esp32-elf/include/ssp/ssp.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ssp/stdio.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ssp/stdlib.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ssp/string.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ssp/strings.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ssp/unistd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ssp/wchar.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/stdatomic.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/stdint.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/stdio.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/stdio_ext.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/stdlib.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/string.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/strings.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_default_fcntl.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_intsup.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_locale.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_pthreadtypes.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_sigset.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_stdint.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_timespec.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_timeval.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_types.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/cdefs.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/config.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/custom_file.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/dir.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/dirent.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/errno.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/fcntl.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/features.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/fenv.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/file.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/iconvnls.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/lock.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/param.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/queue.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/reent.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/resource.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/sched.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/select.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/signal.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/stat.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/stdio.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/string.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/syslimits.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/time.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/timeb.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/times.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/timespec.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/tree.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/types.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/unistd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/utime.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/wait.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/tar.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/termios.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/tgmath.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/threads.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/time.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/unctrl.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/unistd.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/utime.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/utmp.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/wchar.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/wctype.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/wordexp.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/xtensa/
+xtensa-esp32-elf/xtensa-esp32-elf/include/xtensa/config/
+xtensa-esp32-elf/xtensa-esp32-elf/include/xtensa/config/core-isa.h
+xtensa-esp32-elf/xtensa-esp32-elf/lib/
+xtensa-esp32-elf/xtensa-esp32-elf/lib/crt0.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/default.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/crt0.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/default.specs
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libc.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libg.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libgloss.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libm.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libnosys.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/nano.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/crt0.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/default.specs
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libc.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libg.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libgloss.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libm.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libnosys.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/nano.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/nosys.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/nosys.specs
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/libc.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/libg.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/libgloss.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/libm.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/libnosys.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/nano.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/crt0.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/default.specs
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libc.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libg.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libgloss.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libm.a
+@static-lib xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libnosys.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/nano.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/nosys.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/nosys.specs